- new way to display picture informations (template variables instead of

  template generic blocks)

- new color for A:hover and its solid border-bottom, dotted border-bottom
  for A (same color as link color)

- background color and border color for form input fields (input, select,
  textarea) to accentuate contrast with page background.

- clear:both on #imageHeaderBar H1 let it be center on page

- in infoTable keys are right aligned and values are left aligned (more
  beautiful, isn't it?)

- add "set as representative" button to cclear template in
  picture.tpl. representative.png picture taken from Gorilla theme.

- invisible horizontal rule on picture.tpl to separate user comments from
  the beginning of the page


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

5 files changed, 80 insertions, 34 deletions

diff --git a/template/cclear/default-colors.css b/template/cclear/default-colors.css
index 3bf837da9..3681a6ee7 100644
--- a/template/cclear/default-colors.css
+++ b/template/cclear/default-colors.css
@@ -25,7 +25,7 @@ A {
 }
 
 A:hover {
-    color: #754300;
+    color: #858460;
 }
 
 
@@ -114,7 +114,8 @@ A.navThumb, A.navThumb:hover {
 }
 input, select, textarea {
 	color:black;
-	background-color:#eee;
+	background-color: lightgrey;
+        border: 1px solid gray;
 }
 .bouton {
 	background-color:#d3d3d3;
diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css
index 18d96bfa4..d8af28a93 100644
--- a/template/cclear/default-layout.css
+++ b/template/cclear/default-layout.css
@@ -35,16 +35,21 @@ H2 {
 
 A {
     text-decoration:none;
-    /*border-bottom: 1px dotted #000000;*/
+    border-bottom: 1px dotted #005e89;
 }
 A:hover {
-    border-bottom-style: solid;
+    border-bottom: 1px solid #858460;
 }
 
 IMG {
     border: none;
 }
 
+HR.separation {
+  visibility: hidden;
+  clear: both;
+}
+
 #copyright {
     clear: both;
     font-size: 83%;
diff --git a/template/cclear/image.css b/template/cclear/image.css
index a4a036be0..4c587f205 100644
--- a/template/cclear/image.css
+++ b/template/cclear/image.css
@@ -7,6 +7,7 @@
 
 #imageHeaderBar H1 {
     margin: 1ex 0; /* override default-layout for less bottom-margin */
+    clear: both;
 }
 
 #imageToolBar {
@@ -73,12 +74,20 @@ de l'image...
 TABLE.infoTable {
     margin: auto;
 }
-TABLE.infoTable TD {
+TABLE.infoTable .value {
     text-align: left;
 }
 
 TABLE.infoTable .label {
     font-weight: bold;
+    text-align: right;
+    padding-right: 0.5em; 
+}
+
+TABLE.infoTable TD.value UL {
+  margin: 0;
+  padding: 0 0 0 1.5em;
+  list-style-type: square;
 }
 
 #comments {
diff --git a/template/cclear/picture.tpl b/template/cclear/picture.tpl
index 2011a2c0a..3f2793fbe 100644
--- a/template/cclear/picture.tpl
+++ b/template/cclear/picture.tpl
@@ -10,44 +10,31 @@
 
 <div id="imageToolBar">
 <div class="randomButtons">
-  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}">
-    <img src="template/cclear/theme/slideshow.png" alt="{L_SLIDESHOW}">
-  </a>
-  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}">
-    <img src="template/cclear/theme/metadata.png" alt="{L_PICTURE_METADATA}">
-  </a>
+  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}"><img src="template/cclear/theme/slideshow.png" alt="{L_SLIDESHOW}"></a>
+  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}"><img src="template/cclear/theme/metadata.png" alt="{L_PICTURE_METADATA}"></a>
+<!-- BEGIN representative -->
+  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="template/cclear/theme/representative.png" alt="{lang:representative}" /></a>
+<!-- END representative -->
 <!-- BEGIN favorite -->
-  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}">
-    <img src="{favorite.FAVORITE_IMG}" alt="{favorite.FAVORITE_ALT}">
-  </a>
+  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" alt="{favorite.FAVORITE_ALT}"></a>
 <!-- END favorite -->
 <!-- BEGIN download -->
-  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}">
-    <img src="template/cclear/theme/save.png" alt="{L_DOWNLOAD}">
-  </a>
+  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}"><img src="template/cclear/theme/save.png" alt="{L_DOWNLOAD}"></a>
 <!-- END download -->
 <!-- BEGIN admin -->
-  <a href="{U_ADMIN}" title="{L_ADMIN}">
-    <img src="template/cclear/theme/preferences.png" alt="{L_ADMIN}">
-  </a>
+  <a href="{U_ADMIN}" title="{L_ADMIN}"><img src="template/cclear/theme/preferences.png" alt="{L_ADMIN}"></a>
 <!-- END admin -->
 </div>
 <div class="navButtons">
 <!-- BEGIN next -->
-  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}">
-    <img src="template/cclear/theme/right.png" alt="next">
-  </a>
+  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}"><img src="template/cclear/theme/right.png" alt="next"></a>
 <!-- END next -->
-  <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}">
-    <img src="template/cclear/theme/up.png" alt="{L_UP_ALT}">
-  </a>
+  <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}"><img src="template/cclear/theme/up.png" alt="{L_UP_ALT}"></a>
 <!-- BEGIN previous -->
-  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}">
-    <img src="template/cclear/theme/left.png" alt="previous">
-  </a>
+  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}"><img src="template/cclear/theme/left.png" alt="previous"></a>
 <!-- END previous -->
 </div>
-</div>
+</div> <!-- imageToolBar -->
 
 <div id="theImage">
 <!-- BEGIN high -->
@@ -80,12 +67,54 @@
 <!-- END next -->
 
 <table class="infoTable" summary="Some info about this picture">
-  <!-- BEGIN info_line -->
   <tr>
-    <td class="label">{info_line.INFO} :</td>
-    <td class="value">{info_line.VALUE}</td>
+    <td class="label">{lang:Author}</td>
+    <td class="value">{INFO_AUTHOR}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Created on}</td>
+    <td class="value">{INFO_CREATION_DATE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Registered on}</td>
+    <td class="value">{INFO_AVAILABILITY_DATE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Dimensions}</td>
+    <td class="value">{INFO_DIMENSIONS}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:File}</td>
+    <td class="value">{INFO_FILE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Filesize}</td>
+    <td class="value">{INFO_FILESIZE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Keywords}</td>
+    <td class="value">{INFO_KEYWORDS}</td>
   </tr>
-  <!-- END info_line -->
+  <tr>
+    <td class="label">{lang:Categories}</td>
+    <td class="value">
+      <ul>
+        <!-- BEGIN category -->
+        <li>{category.LINE}</li>
+        <!-- END category -->
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Visits}</td>
+    <td class="value">{INFO_VISITS}</td>
+  </tr>
+  <!-- BEGIN info_rate -->
+  <tr>
+    <td class="label">{lang:Average rate}</td>
+    <td class="value">{info_rate.CONTENT}</td>
+  </tr>
+  <!-- END info_rate -->
 </table>
 
 <!-- BEGIN metadata -->
@@ -113,6 +142,8 @@
 </p>
 <!-- END rate -->
 
+<hr class="separation">
+
 <!-- BEGIN comments -->
 <div id="comments">
 <h2>[{comments.NB_COMMENT}] {L_COMMENT_TITLE}</h2>
diff --git a/template/cclear/theme/representative.png b/template/cclear/theme/representative.png
index 971997db4..f1141d91b 100644
--- a/template/cclear/theme/representative.png
+++ b/template/cclear/theme/representative.png