adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 11:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r7823 from trunk to branch 2.1

Browse Source 
homogenuous popuphelp and search_rules templates with the rest of pages
simplification of CSS rules

git-svn-id: http://piwigo.org/svn/branches/2.1@7824 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-11-19 20:28:21 +00:00
parent a9a150dc5a
commit e176f9be0e
6 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
popuphelp.php
+1 -1
View File
@@ -36,7 +36,7 @@ check_status(ACCESS_GUEST);
$page['body_id'] = 'thePopuphelpPage'; $page['body_id'] = 'thePopuphelpPage';
$title = l10n('Piwigo Help'); $title = l10n('Piwigo Help');
$page['page_banner'] = '<h1>'.$title.'</h1>'; $page['page_banner'] = '';
$page['meta_robots']=array('noindex'=>1, 'nofollow'=>1); $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
include(PHPWG_ROOT_PATH.'include/page_header.php'); include(PHPWG_ROOT_PATH.'include/page_header.php');
search_rules.php
+1 -1
View File
@@ -44,7 +44,7 @@ include_once( PHPWG_ROOT_PATH.'include/functions_search.inc.php' );
$page['body_id'] = 'thePopuphelpPage'; $page['body_id'] = 'thePopuphelpPage';
$title = l10n('Piwigo Help'); $title = l10n('Piwigo Help');
$page['page_banner'] = '<h1>'.$title.'</h1>'; $page['page_banner'] = '';
$page['meta_robots']=array('noindex'=>1, 'nofollow'=>1); $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
include(PHPWG_ROOT_PATH.'include/page_header.php'); include(PHPWG_ROOT_PATH.'include/page_header.php');
themes/default/template/month_calendar.tpl
+2 -2
View File
@@ -74,8 +74,8 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
{else} {else}
<td class="calDayCellEmpty">{$day.DAY} <td class="calDayCellEmpty">{$day.DAY}
{/if} {/if}
{else} {else}{*blank cell first or last row only*}
<td class="calDayCellBlank"> <td>
{/if} {/if}
</td> </td>
{/foreach} {*day in week*} {/foreach} {*day in week*}
themes/default/template/popuphelp.tpl
+16 -7
View File
@@ -1,12 +1,21 @@
<div id="content" class="content"> <div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>
<h2>{$PAGE_TITLE}</h2>
</div>
{$HELP_CONTENT} {$HELP_CONTENT}
<p>
<a href="#" onclick="window.close();">{'Close this window'|@translate}</a>
</p>
</div> <!-- content --> </div> <!-- content -->
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>
themes/default/template/search_rules.tpl
+14 -8
View File
@@ -1,5 +1,14 @@
<div id="content" class="content"> <div id="content" class="content">
<h2>{'Search rules'|@translate}</h2> <div class="titrePage">
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>
<h2>{'Search rules'|@translate}</h2>
</div>
{if isset($INTRODUCTION) } {if isset($INTRODUCTION) }
<p>{$INTRODUCTION}</p> <p>{$INTRODUCTION}</p>
@@ -46,12 +55,9 @@
</ul> </ul>
<p>
<a href="#" onclick="window.close();">{'Close this window'|@translate}</a>
</p>
</div> <!-- content --> </div> <!-- content -->
<ul class="categoryActions">
<li>
<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
</a>
</li>
</ul>
themes/default/theme.css
+6 -14
View File
@@ -139,11 +139,7 @@ UL.categoryActions {
text-indent: 0; text-indent: 0;
list-style: none; list-style: none;
text-align: center; text-align: center;
}
.content DIV.titrePage UL.categoryActions {
float: right; float: right;
text-align: center;
} }
.content DIV.titrePage { .content DIV.titrePage {
@@ -155,7 +151,7 @@ UL.categoryActions {
} }
.content UL.categoryActions A IMG, UL.categoryActions A { .content UL.categoryActions A IMG, UL.categoryActions A {
border: none; border: 0;
margin-bottom: -5px; margin-bottom: -5px;
} }
@@ -169,6 +165,7 @@ UL.categoryActions {
SPAN.calItem, SPAN.calItemEmpty { SPAN.calItem, SPAN.calItemEmpty {
font-weight: bold; font-weight: bold;
margin: 0 1px; margin: 0 1px;
border: 1px solid gray;
} }
SPAN.calItem A { border:0 } SPAN.calItem A { border:0 }
@@ -193,10 +190,11 @@ TABLE.calMonth {
margin-bottom: 10px; /*<-IE ignores this */ margin-bottom: 10px; /*<-IE ignores this */
} }
TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank { TD.calDayCellFull, TD.calDayCellEmpty {
vertical-align: top; vertical-align: top;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
border: 1px solid gray;
} }
TD.calDayHead { TD.calDayHead {
@@ -850,11 +848,5 @@ LEGEND {
font-style: italic; font-style: italic;
} }
/*calendar*/
SPAN.calItem, SPAN.calItemEmpty,
TD.calDayCellEmpty, TD.calDayCellFull {
border: 1px solid gray;
}
#piwigoAbout {width:600px;margin:0 auto;} #piwigoAbout {width:600px;margin:0 auto;}
#linkToPiwigo {text-align:center;} #linkToPiwigo {text-align:center;}