improvement: calendar navigation now uses at maximum one navigation bar

together with a next/previous date links 

improvement: calendar view styles now shown in DIV.titrePage (I still need 
to move padding from H2 to DIV.titrePage ...)

fix: moved all calendar css colors from template to the theme

git-svn-id: http://piwigo.org/svn/trunk@1062 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 44 insertions, 43 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 379004e73..7d75751c2 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -141,26 +141,37 @@
       <!-- END mode_created -->
     </ul>
 
-  <h2>{TITLE}
+  <h2>{TITLE}</h2>
   <!-- BEGIN calendar -->
-  {calendar.TITLE}
+  <!-- BEGIN views -->
+  <div class="calendarViews">{lang:calendar_view}:
+    <select onchange="document.location = this.options[this.selectedIndex].value;">
+    <!-- BEGIN view -->
+      <option value="{calendar.views.view.VALUE}" {calendar.views.view.SELECTED}>{calendar.views.view.CONTENT}</option>
+    <!-- END view -->
+    </select>
+  </div>
+  <!-- END views -->
   <!-- END calendar -->
-  </h2>
+
+  <!-- BEGIN calendar -->
+  <h2>{calendar.TITLE}
+</h2>
+  <!-- END calendar -->
+
   </div> <!-- content -->
 
 <!-- BEGIN calendar -->
-<!-- BEGIN views -->
-<div class="calendarViews">
-{lang:calendar_view}: <select onchange="document.location = this.options[this.selectedIndex].value;">
-<!-- BEGIN view -->
-  <option value="{calendar.views.view.VALUE}" {calendar.views.view.SELECTED}>{calendar.views.view.CONTENT}</option>
-<!-- END view -->
-</select>
-</div>
-<!-- END views -->
-
 <!-- BEGIN navbar -->
-<div class="calendarBar">{calendar.navbar.BAR}</div>
+<div class="calendarBar">
+<!-- BEGIN prev -->
+	<div style="float:left">&laquo; <a href="{calendar.navbar.prev.URL}">{calendar.navbar.prev.LABEL}</a></div>
+<!-- END prev -->
+<!-- BEGIN next -->
+	<div style="float:right"><a href="{calendar.navbar.next.URL}">{calendar.navbar.next.LABEL}</a> &raquo;</div>
+<!-- END next -->
+	{calendar.navbar.BAR}&nbsp;
+</div>
 <!-- END navbar -->
 
 <!-- BEGIN calbar -->
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 6f3c440c4..6decb64f4 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -182,31 +182,18 @@ SPAN.filename:after {
 /* begin chronology/calendar elements*/
 #content DIV.calendarViews {
   display: block;
-  text-align: left;
-  margin: 5px 0;
+  float: right;
+  margin: 2px 2px;
 }
 
-#content DIV.calendarBar {
-  margin: 8px 4px;
-}
+#content DIV.calendarBar { margin: 8px 4px; }
 
-SPAN.calItem {
+SPAN.calItem, SPAN.calItemEmpty {
   font-weight: bold;
-  margin: 0 2px;
-  border: 1px solid gray;
+  margin: 0 1px;
 }
 
-SPAN.calItemSel {
-  font-weight: bold;
-  margin: 0 2px;
-  border: 1px solid gray;
-}
-
-SPAN.calItemEmpty {
-  font-weight: bold;
-  margin: 0 2px;
-  border: 1px solid gray;
-}
+SPAN.calItem A { border:0 }
 
 #content DIV.calendarCalBar {
   margin: 10px 10px;
@@ -219,9 +206,7 @@ SPAN.calCalHead {
   margin: 0 2px;
 }
 
-SPAN.calCal {
-  margin: 0 2px;
-}
+SPAN.calCal { margin: 0 2px; }
 
 /* nice looking month calendar*/
 .calMonth { border: none; border-collapse: collapse; }
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 92216df92..07cdffabb 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -78,15 +78,17 @@ A.navThumb, A.navThumb:hover {
 }
 
 /*calendar elements*/
-SPAN.calItemSel { color: dark-gray; }
-
-SPAN.calItemEmpty { color: lightgray; }
+SPAN.calItemEmpty { color: silver; }
 
+SPAN.calItem, SPAN.calItemEmpty
+{
+  border: 1px solid silver;
+}
 
 /* nice looking month calendar*/
 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid #7E7262;}
 
-TD.calDayCellEmpty { color: lightgray; }
+TD.calDayCellEmpty { color: silver; }
 
 .calBackDate { color: #000; }
 .calForeDate { color: #fff; }
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 746e57bc3..157c7c371 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -115,14 +115,17 @@ A.navThumb, A.navThumb:hover {
 }
 
 /*calendar elements*/
-SPAN.calItemSel { color: #fff48e; }
+SPAN.calItemEmpty { color: silver; }
 
-SPAN.calItemEmpty { color: darkgray; }
+SPAN.calItem, SPAN.calItemEmpty
+{
+  border: 1px solid gray;
+}
 
 /* nice looking month calendar*/
 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
 
-TD.calDayCellEmpty { color: lightgray; }
+TD.calDayCellEmpty { color: silver; }
 
 .calBackDate { color: #000; }
 .calForeDate { color: #fff; }