diff options
| -rw-r--r-- | popuphelp.php | 2 | ||||
| -rw-r--r-- | search_rules.php | 2 | ||||
| -rw-r--r-- | themes/default/template/month_calendar.tpl | 4 | ||||
| -rw-r--r-- | themes/default/template/popuphelp.tpl | 23 | ||||
| -rw-r--r-- | themes/default/template/search_rules.tpl | 22 | ||||
| -rw-r--r-- | themes/default/theme.css | 20 |
6 files changed, 40 insertions, 33 deletions
diff --git a/popuphelp.php b/popuphelp.php index 768154ea7..c148ea472 100644 --- a/popuphelp.php +++ b/popuphelp.php @@ -36,7 +36,7 @@ check_status(ACCESS_GUEST); $page['body_id'] = 'thePopuphelpPage'; $title = l10n('Piwigo Help'); -$page['page_banner'] = '<h1>'.$title.'</h1>'; +$page['page_banner'] = ''; $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1); include(PHPWG_ROOT_PATH.'include/page_header.php'); diff --git a/search_rules.php b/search_rules.php index b7da2d0cc..88a116677 100644 --- a/search_rules.php +++ b/search_rules.php @@ -44,7 +44,7 @@ include_once( PHPWG_ROOT_PATH.'include/functions_search.inc.php' ); $page['body_id'] = 'thePopuphelpPage'; $title = l10n('Piwigo Help'); -$page['page_banner'] = '<h1>'.$title.'</h1>'; +$page['page_banner'] = ''; $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1); include(PHPWG_ROOT_PATH.'include/page_header.php'); diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl index 85415f459..c1603dfd8 100644 --- a/themes/default/template/month_calendar.tpl +++ b/themes/default/template/month_calendar.tpl @@ -74,8 +74,8 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} {else} <td class="calDayCellEmpty">{$day.DAY} {/if} - {else} - <td class="calDayCellBlank"> + {else}{*blank cell first or last row only*} + <td> {/if} </td> {/foreach} {*day in week*} diff --git a/themes/default/template/popuphelp.tpl b/themes/default/template/popuphelp.tpl index cd02555d5..89cba8578 100644 --- a/themes/default/template/popuphelp.tpl +++ b/themes/default/template/popuphelp.tpl @@ -1,12 +1,21 @@ <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} + +<p> + <a href="#" onclick="window.close();">{'Close this window'|@translate}</a> +</p> + </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> diff --git a/themes/default/template/search_rules.tpl b/themes/default/template/search_rules.tpl index 28b2e423f..5105875c0 100644 --- a/themes/default/template/search_rules.tpl +++ b/themes/default/template/search_rules.tpl @@ -1,5 +1,14 @@ <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) } <p>{$INTRODUCTION}</p> @@ -46,12 +55,9 @@ </ul> +<p> + <a href="#" onclick="window.close();">{'Close this window'|@translate}</a> +</p> + </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> diff --git a/themes/default/theme.css b/themes/default/theme.css index 36b1522f2..b8a00e5bd 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -139,11 +139,7 @@ UL.categoryActions { text-indent: 0; list-style: none; text-align: center; -} - -.content DIV.titrePage UL.categoryActions { float: right; - text-align: center; } .content DIV.titrePage { @@ -155,7 +151,7 @@ UL.categoryActions { } .content UL.categoryActions A IMG, UL.categoryActions A { - border: none; + border: 0; margin-bottom: -5px; } @@ -169,6 +165,7 @@ UL.categoryActions { SPAN.calItem, SPAN.calItemEmpty { font-weight: bold; margin: 0 1px; + border: 1px solid gray; } SPAN.calItem A { border:0 } @@ -193,10 +190,11 @@ TABLE.calMonth { margin-bottom: 10px; /*<-IE ignores this */ } -TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank { +TD.calDayCellFull, TD.calDayCellEmpty { vertical-align: top; - font-weight: bold; - font-size: 18px; + font-weight: bold; + font-size: 18px; + border: 1px solid gray; } TD.calDayHead { @@ -850,11 +848,5 @@ LEGEND { font-style: italic; } -/*calendar*/ -SPAN.calItem, SPAN.calItemEmpty, -TD.calDayCellEmpty, TD.calDayCellFull { - border: 1px solid gray; -} - #piwigoAbout {width:600px;margin:0 auto;} #linkToPiwigo {text-align:center;}
\ No newline at end of file |