aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-11-19 20:28:21 +0000
committerrvelices <rv-github@modusoptimus.com>2010-11-19 20:28:21 +0000
commite176f9be0ed514b02517974cacba58eb024e0e92 (patch)
treeb0394c4bd791ba466c73f2914d039058af88388a /themes
parenta9a150dc5adb0240cc089bd4d3c172bca74d5e71 (diff)
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
Diffstat (limited to 'themes')
-rw-r--r--themes/default/template/month_calendar.tpl4
-rw-r--r--themes/default/template/popuphelp.tpl23
-rw-r--r--themes/default/template/search_rules.tpl22
-rw-r--r--themes/default/theme.css20
4 files changed, 38 insertions, 31 deletions
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