calendar improvements: week on weekly list starts on Monday,

ability to show grayed months/weeks/days (without any picture in it),
added icons for created/posted fields
language uniformization

calendar fixes: correct number of pictures in calendar view,
code simplification (I hope so)

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

7 files changed, 71 insertions, 46 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 0942a0f2d..12b2e56f9 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -69,24 +69,24 @@
     <form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
       <fieldset>
         <legend>{lang:Quick connect}</legend>
-    
+
         <label>
           {lang:Username}
           <input type="text" name="username" size="15" value="">
         </label>
-        
+
         <label>
           {L_PASSWORD}
           <input type="password" name="password" size="15">
         </label>
-        
+
         <!-- BEGIN remember_me -->
         <label>
           {L_REMEMBER_ME}
           <input type="checkbox" name="remember_me" value="1">
         </label>
         <!-- END remember_me -->
-    
+
         <p>
          <input type="submit" name="login" value="{lang:submit}">
         </p>
@@ -95,7 +95,7 @@
       <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
     </ul>
 
-      </fieldset>    
+      </fieldset>
     </form>
     <!-- END quickconnect -->
 
@@ -117,11 +117,11 @@
       </select>
       </li>
       <!-- END preferred_image_order -->
-      
+
       <!-- BEGIN caddie -->
       <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a></li>
       <!-- END caddie -->
-      
+
       <!-- BEGIN edit -->
       <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
       <!-- END edit -->
@@ -129,38 +129,42 @@
       <!-- BEGIN search_rules -->
       <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
       <!-- END search_rules -->
-      
-      <!-- BEGIN calendar_view -->
-      <li><a href="{calendar_view.URL}" title="{lang:calendar_hint}"><img src="{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:calendar}"></a></li>
-      <!-- END calendar_view -->
-      <!-- BEGIN normal_view -->
-      <li><a href="{normal_view.URL}" title="{lang:calendar}"><img src="{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:calendar}"></a></li>
-      <!-- END normal_view -->
+
+      <!-- BEGIN mode_normal -->
+      <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
+      <!-- END mode_normal -->
+      <!-- BEGIN mode_posted -->
+      <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}"><img src="{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
+      <!-- END mode_posted -->
+      <!-- BEGIN mode_created -->
+      <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}"><img src="{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
+      <!-- END mode_created -->
     </ul>
-    
+
   <h2>{TITLE}
   <!-- BEGIN calendar -->
-  <br/>{calendar.TITLE}
-  <!-- END calendar --></h2>
+  {calendar.TITLE}
+  <!-- END calendar -->
+  </h2>
   </div> <!-- content -->
-    
+
 <!-- BEGIN calendar -->
 <!-- BEGIN views -->
 <div class="calendarViews">
-<select onchange="document.location = this.options[this.selectedIndex].value;">
+{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><br/>
+</div>
 <!-- END views -->
 
 <!-- BEGIN navbar -->
-<div class="navigationBar">{calendar.navbar.BAR}</div>
+<div class="calendarBar">{calendar.navbar.BAR}</div>
 <!-- END navbar -->
 
 <!-- BEGIN calbar -->
-<div class="calendarBar">{calendar.calbar.BAR}</div>
+<div class="calendarCalBar">{calendar.calbar.BAR}</div>
 <!-- END calbar -->
 <!-- END calendar -->
 
diff --git a/template/yoga/content.css b/template/yoga/content.css
index fa45ab676..a426b64e1 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -159,8 +159,8 @@ UL.categoryActions {
 
 #content DIV.comment BLOCKQUOTE {
   margin-top: 1em;
-  margin-right: 0.5em; 
-  margin-bottom: 150px; 
+  margin-right: 0.5em;
+  margin-bottom: 150px;
   padding: 0.5em;
 }
 
@@ -180,24 +180,37 @@ SPAN.filename:after {
 
 
 #content DIV.calendarViews {
-  float: left;
+  display: block;
+  text-align: left;
+  margin: 5px 0;
 }
 
-SPAN.cal {
+#content DIV.calendarBar {
+  margin: 8px 4px;
+}
+
+SPAN.calItem {
   font-weight: bold;
-  border: 1px solid gray;
   margin: 0 2px;
+  border: 1px solid gray;
 }
 
-SPAN.calSel {
+SPAN.calItemSel {
   font-weight: bold;
-  color: dark-gray;
+  margin: 0 2px;
   border: 1px solid gray;
+  color: dark-gray;
+}
+
+SPAN.calItemEmpty {
+  font-weight: bold;
   margin: 0 2px;
+  border: 1px solid gray;
+  color: lightgray;
 }
 
-#content .calendarBar {
-  margin: 8px 5px;
+#content DIV.calendarCalBar {
+  margin: 10px 10px;
   text-align: left;
 }
 
diff --git a/template/yoga/icon/calendar_created.png b/template/yoga/icon/calendar_created.png
new file mode 100644
index 000000000..63eb69bd4
--- /dev/null
+++ b/template/yoga/icon/calendar_created.png
diff --git a/template/yoga/icon/normal_mode.png b/template/yoga/icon/normal_mode.png
new file mode 100644
index 000000000..07318b568
--- /dev/null
+++ b/template/yoga/icon/normal_mode.png
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index b68d23a13..d49f1d052 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -91,8 +91,8 @@
     <td class="value">{INFO_CREATION_DATE}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Registered on}</td>
-    <td class="value">{INFO_AVAILABILITY_DATE}</td>
+    <td class="label">{lang:Posted on}</td>
+    <td class="value">{INFO_POSTED_DATE}</td>
   </tr>
   <tr>
     <td class="label">{lang:Dimensions}</td>
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index 17573e0c5..ca7e8346b 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -20,7 +20,7 @@
 </div>
 <!-- END errors -->
 <table width="100%" align="center" cellpadding="2">
-  <tr> 
+  <tr>
     <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b>
     <td colspan="2" valign="top">
 	  <input type="text" style="width: 300px" name="search_allwords" size="30" />
@@ -29,13 +29,13 @@
 	  <input type="radio" name="mode" value="OR" /> {L_SEARCH_ANY_TERMS}
 	</td>
   </tr>
-  <tr> 
+  <tr>
     <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b>
     <td colspan="2" valign="middle">
 	  <input type="text" style="width: 300px" name="search_author" size="30" />
 	</td>
   </tr>
-  <tr> 
+  <tr>
     <td colspan="2"><b>{L_SEARCH_DATE} :</b>
     <td colspan="2" valign="middle">
       <table>
@@ -76,10 +76,10 @@
       </table>
     </td>
   </tr>
-  <tr class="admin"> 
+  <tr class="admin">
     <th colspan="4">{L_SEARCH_OPTIONS}</th>
   </tr>
-  <tr> 
+  <tr>
     <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b>
     <td width="25%" nowrap="nowrap">
 	  <select style="width:200px" name="cat[]" multiple="multiple" size="8">
@@ -94,11 +94,11 @@
 	  <input type="radio" name="subcats-included" value="0" />{L_NO}
 	</td>
    </tr>
-   <tr> 
+   <tr>
     <td width="25%" nowrap="nowrap"><b>{L_SEARCH_DATE_TYPE} : </b></td>
     <td width="25%" nowrap="nowrap">
-	  <input type="radio" name="date_type" value="date_creation" checked="checked" />{L_SEARCH_CREATION}<br />
-	  <input type="radio" name="date_type" value="date_available" />{L_SEARCH_AVAILABILITY}
+	  <input type="radio" name="date_type" value="date_creation" checked="checked" />{lang:Creation date}<br />
+	  <input type="radio" name="date_type" value="date_available" />{lang:Post date}
 	</td>
 	<td><b>{L_RESULT_SORT} : </b></td>
     <td nowrap="nowrap">
@@ -106,7 +106,7 @@
 	  <input type="radio" name="sd" value="d" checked="checked" />{L_SORT_DESCENDING}
 	</td>
   </tr>
-<!--  <tr> 
+<!--  <tr>
     <td width="25%" nowrap="nowrap"><b>{L_SEARCH_WITHIN} : </b></td>
     <td width="25%" nowrap="nowrap">
 	  <input type="radio" name="search_fields" value="all" checked="checked" />{L_SEARCH_ALL}<br />
@@ -126,9 +126,9 @@
 	  <input type="radio" name="show_results" value="images" checked="checked" />{L_IMAGES}&nbsp;&nbsp;
 	  <input type="radio" name="show_results" value="comments" /> {L_COMMENTS}
 	</td>
-  </tr>  
+  </tr>
   -->
-<tr> 
+<tr>
 <td align="center" valign="bottom" colspan="4" height="38">
 <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />&nbsp;&nbsp;
 <input type="reset" value="{L_RESET}" class="bouton" />
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 56e7e5eee..6b28e3ce3 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -38,7 +38,7 @@ H2, #menubar DT, .throw  {
   background-color: transparent;
   border: none;
 }
-   
+
 #imageHeaderBar {
   background-image: url(images/tableh2_bg.png);
   background-repeat: repeat-x;
@@ -107,9 +107,17 @@ A.navThumb, A.navThumb:hover {
 }
 #the_page {
   border: 1px solid #e0e0e0;
-  padding-top: 5px;	
+  padding-top: 5px;
   padding-bottom:30px;
   text-align:center;
   display:block;
   background:#3f3f3f;
 }
+
+SPAN.calItemSel {
+  color: #fff48e;
+}
+
+SPAN.calItemEmpty {
+  color: darkgray;
+}