merge r7823 from trunk to branch 2.1

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
+2 -2
View File
@@ -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*}
+16 -7
View File
@@ -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>
+14 -8
View File
@@ -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>