- modification: use "filter" class for quickconnect box (with some custom

  modifications)

- bug fixed: the total number of pictures had disappeared


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

2 files changed, 41 insertions, 29 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index ed3b93fef..1349c92ce 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -16,6 +16,7 @@
   <dt><a href="{U_HOME}">{L_CATEGORIES}</a></dt>
   <dd>
     {MENU_CATEGORIES_CONTENT}
+    <p class="totalImages">{NB_PICTURE} {L_TOTAL}</p>
   </dd>
 </dl>
 <dl>
@@ -52,7 +53,7 @@
       <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
       <!-- END register -->
       <!-- BEGIN login -->
-      <li><a href="{F_IDENTIFY}">{L_LOGIN}</a></li>
+      <li><a href="{F_IDENTIFY}">{lang:Connection}</a></li>
       <!-- END login -->
       <!-- BEGIN logout -->
       <li><a href="{U_LOGOUT}">{L_LOGOUT}</a></li>
@@ -65,28 +66,35 @@
       <!-- END admin -->
     </ul>
     <!-- BEGIN quickconnect -->
-    <hr />
-    <form method="post" action="{F_IDENTIFY}" id="quickconnect">
-      <ul>
-        <li>
-	  <input type="hidden" name="redirect" value="{U_REDIRECT}">
-	  <label for="username">{L_USERNAME}</label>
-	  <input type="text" name="username" id="username" size="15" value="">
-        </li>
-        <li>
-	  <label for="password">{L_PASSWORD}</label>
-	  <input type="password" name="password" id="password" size="15">
-        </li>
+    <form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
+      <fieldset>
+        <legend>{lang:Connection}</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 -->
-        <li>
-	  <label for="remember_me">{L_REMEMBER_ME}</label>
-	  <input type="checkbox" name="remember_me" id="remember_me" value="1">
-        </li>
+        <label>
+          {L_REMEMBER_ME}
+          <input type="checkbox" name="remember_me" value="1">
+        </label>
         <!-- END remember_me -->
-      </ul>
-      <p><input type="submit" name="login" value="{L_SUBMIT}"></p>
+    
+        <p>
+         <input type="submit" name="login" value="{lang:submit}">
+        </p>
+    
+      </fieldset>    
     </form>
     <!-- END quickconnect -->
+
   </dd>
 </dl>
 </div> <!-- menubar -->
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 475409b50..1f501bb0e 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -158,13 +158,13 @@ FORM.filter INPUT[type="submit"] {
   margin-top: 1em;
 }
 
-FORM.properties UL, FORM#quickconnect UL, FORM#update UL {
+FORM.properties UL, FORM#update UL {
   list-style-type: none;
   margin: 0;
   padding: 0;
 }
 
-FORM.properties LI, FORM#quickconnect UL, FORM#update UL  {
+FORM.properties LI, FORM#update UL  {
   margin-bottom: 0.5em;
   padding: 0;
   line-height: 1.8em;
@@ -178,16 +178,20 @@ FORM.properties LABEL {
   padding: 0 0.5em 0 0;
 }
 
-FORM#quickconnect LABEL {
-  float: left;
-  width: 30%;
-  text-align: right;
-  margin: 0.5em 0 0 0;
-  padding: 0 0.5em 0 0;
+FORM#quickconnect { 
+  margin: 0;
+}
+
+FORM#quickconnect FIELDSET {
+  margin: 5px;
+}
+
+FORM#quickconnect P {
+  text-align: center;
 }
 
-FORM#quickconnect INPUT {
-  margin-top: 0.5em;
+FORM#quickconnect P INPUT {
+  display: inline;
 }
 
 FORM.properties LABEL.mandatory {