cclear template :

-----------------
- category.tpl : From 1.4 to BSF
- add missing icons in themes, admin/images, (from default template)
- content.css


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

template/cclear/category.tpl

@@ -1,6 +1,19 @@
+<!-- $Id$ -->
 <h1>PhpWebGallery demonstration site</h1>
 
 <div id="menubar">
+<!-- BEGIN links -->
+<dl>
+  <dt>{lang:Links}</dt>
+  <dd>
+    <ul>
+      <!-- BEGIN link -->
+      <li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
+      <!-- END link -->
+    </ul>
+  </dd>
+</dl>
+<!-- END links -->
 <dl>
   <dt><a href="{U_HOME}">{L_CATEGORIES}</a></dt>
   <dd>
@@ -33,47 +46,60 @@
 <dl>
   <dt>{L_IDENTIFY}</dt>
   <dd>
-    <!-- BEGIN login -->
-    <ul>
-      <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
-      <li><a href="{F_IDENTIFY}">{L_LOGIN}</a></li>
-    </ul>
-    <hr>
-    <form method="post" action="{F_IDENTIFY}">
-    <p>
-    <input type="hidden" name="redirect" value="{U_REDIRECT}">
-    <label for="username">{L_USERNAME}:</label>
-    <input type="text" name="username" id="username" size="15" value="">
-    <p>
-    <label for="password">{L_PASSWORD}:</label>
-    <input type="password" name="password" id="password" size="15">
-    <p>
-    <!-- BEGIN remember_me -->
-    <input type="checkbox" name="remember_me" id="remember_me" value="1">
-    <label for="remember_me">{L_REMEMBER_ME}</label>
-    <!-- END remember_me -->
-    <p>
-    <input type="submit" name="login" value="{L_SUBMIT}" class="bouton">
-    </form>
-    <!-- END login -->
-    <!-- BEGIN logout -->
+    <!-- BEGIN hello -->
     <p>{L_HELLO}&nbsp;{USERNAME}&nbsp;!</p>
+    <!-- END hello -->
     <ul>
+      <!-- BEGIN register -->
+      <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
+      <!-- END register -->
+      <!-- BEGIN login -->
+      <li><a href="{F_IDENTIFY}">{L_LOGIN}</a></li>
+      <!-- END login -->
+      <!-- BEGIN logout -->
       <li><a href="{U_LOGOUT}">{L_LOGOUT}</a></li>
+      <!-- END logout -->
+      <!-- BEGIN profile -->
       <li><a href="{U_PROFILE}" title="{L_PROFILE_HINT}">{L_PROFILE}</a></li>
+      <!-- END profile -->
       <!-- BEGIN admin -->
       <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
       <!-- END admin -->
     </ul>
-    <!-- END logout -->
+    <!-- BEGIN quickconnect -->
+    <hr />
+    <form method="post" action="{F_IDENTIFY}" id="quickconnect">
+      <p>
+	<input type="hidden" name="redirect" value="{U_REDIRECT}">
+	<label for="username">{L_USERNAME}:</label>
+	<input type="text" name="username" id="username" size="15" value="">
+      </p>
+      <p>
+	<label for="password">{L_PASSWORD}:</label>
+	<input type="password" name="password" id="password" size="15">
+      </p>
+      <!-- BEGIN remember_me -->
+      <p>
+	<input type="checkbox" name="remember_me" id="remember_me" value="1">
+	<label for="remember_me">{L_REMEMBER_ME}</label>
+      </p>
+      <!-- END remember_me -->
+      <p><input type="submit" name="login" value="{L_SUBMIT}" class="bouton"></p>
+    </form>
+    <!-- END quickconnect -->
   </dd>
 </dl>
 </div> <!-- menubar -->
 
-<div id="categoryContent">
-
-<h2>{TITLE}</h2>
-
+<div id="content">
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <!-- BEGIN caddie -->
+      <li><a href="{U_CADDIE}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" /></a></li>
+      <!-- END caddie -->
+    </ul>
+    <h2>{TITLE}</h2>
+  </div>
 <!-- BEGIN calendar -->
 <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
 <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
@@ -85,8 +111,16 @@
   <!-- BEGIN thumbnail -->
   <li><span><a href="{thumbnails.line.thumbnail.U_IMG_LINK}"><img class="thumbnail" src="{thumbnails.line.thumbnail.IMAGE}"
     alt="{thumbnails.line.thumbnail.IMAGE_ALT}"
-    title="{thumbnails.line.thumbnail.IMAGE_TITLE}"></a><br>
-    <a href="{thumbnails.line.thumbnail.U_IMG_LINK}">{thumbnails.line.thumbnail.IMAGE_NAME}</a>
+    title="{thumbnails.line.thumbnail.IMAGE_TITLE}"></a>
+    <!-- BEGIN element_name -->
+    <br />
+    <span class="thumb_picture">{thumbnails.line.thumbnail.element_name.NAME}</span>
+    <!-- END element_name -->
+    <!-- BEGIN category_name -->
+    <br />
+    <span class="thumb_category">[{thumbnails.line.thumbnail.category_name.NAME}]</span>
+    <!-- END category_name -->
+  </a>
   {thumbnails.line.thumbnail.IMAGE_TS}
   <br>
   <!-- BEGIN nb_comments -->
@@ -110,4 +144,4 @@
 <!-- END comment -->
 <!-- END cat_infos -->
 
-</div> <!-- categoryContent -->
+</div> <!-- content -->

template/cclear/categoryContent.css

@@ -1,57 +0,0 @@
-#categoryContent {
-    margin-left: 14em;
-    margin-right: 1em;
-    margin-bottom: 1em; /* when it's longer than menu bar */
-}
-
-#categoryContent H2 {
-    margin-bottom: 1ex;
-}
-
-#categoryContent H3 {
-    margin-bottom: 1ex;
-}
-
-#categoryContent UL.thumbnails {
-    margin: 0; padding: 0;
-    list-style-type: none;
-    text-align: center; /* eventuellement */
-}
-
-#categoryContent UL.thumbnails LI {
-    display: inline;
-}
-
-#categoryContent UL.thumbnails SPAN {
-    margin: 0 10px 10px 10px;
-    vertical-align: top;
-    width: 128px; /* FIXME */
-    display:table-cell; display:inline-table; display:inline-block;
-}
-#categoryContent UL.thumbnails LI>SPAN { vertical-align: baseline; }
-#categoryContent UL.thumbnails LI IMG.thumbnail { margin-bottom: .4ex; }
-
-#categoryContent UL.thumbnails IMG.thumbnail { border: 1px solid #000000; }
-
-#categoryContent UL.thumbnails SPAN A:first-child { border: none }
-
-
-
-
-#categoryContent .navigationBar, #categoryContent .additional_info {
-    margin: 10px 0;
-    text-align: center;
-}
-
-#categoryContent .pageNumberSelected {
-    font-style: italic;
-}
-
-#categoryContent .additional_info {
-    font-size: 110%;
-}
-
-#categoryContent FORM {
-    text-align: left;
-}
-

template/cclear/content.css

@@ -0,0 +1,72 @@
+/* $Id$ */
+#content {
+    margin-left: 14em;
+    margin-right: 1em;
+    margin-bottom: 1em; /* when it's longer than menu bar */
+}
+
+#content H2 {
+    margin-bottom: 1ex;
+}
+
+#content H3 {
+    margin-bottom: 1ex;
+}
+
+#content UL.thumbnails {
+    margin: 0; padding: 0;
+    list-style-type: none;
+    text-align: center; /* eventuellement */
+}
+
+#content UL.thumbnails LI {
+    display: inline;
+}
+
+#content UL.thumbnails SPAN {
+    margin: 0 10px 10px 10px;
+    vertical-align: top;
+    width: 128px; /* FIXME */
+    display:table-cell; display:inline-table; display:inline-block;
+}
+#content UL.thumbnails LI>SPAN { vertical-align: baseline; }
+#content UL.thumbnails LI IMG.thumbnail { margin-bottom: .4ex; }
+
+#content UL.thumbnails IMG.thumbnail { border: 1px solid #000000; }
+
+#content UL.thumbnails SPAN A:first-child { border: none }
+
+
+
+
+#content .navigationBar, #content .additional_info {
+    margin: 10px 0;
+    text-align: center;
+}
+
+#content .pageNumberSelected {
+    font-style: italic;
+}
+
+#content .additional_info {
+    font-size: 110%;
+}
+
+#content FORM {
+    text-align: left;
+}
+
+/* actions */
+div.titrePage ul.categoryActions {
+  float: right;
+  margin: 0;
+}
+
+ul.categoryActions>li {
+  display: inline;
+}
+
+ul.categoryActions a img, ul.categoryActions a {
+  border: none;
+}
+

template/cclear/default-layout.css

@@ -1,8 +1,10 @@
 
 @import "menubar.css";
-@import "categoryContent.css";
+@import "content.css";
 @import "image.css";
 
+/* $Id$ */
+
 /* * { padding: 0 !important; margin: 0 !important; } */
 
 BODY {