Changeset 919

Timestamp:

Oct 31, 2005, 2:47:58 PM (18 years ago)

Author:

plg

Message:

• modification: use "filter" class for quickconnect box (with some custom modifications)

• bug fixed: the total number of pictures had disappeared

Location:

trunk

Files:

• category.php (modified) (1 diff)
• doc/ChangeLog (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (2 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (2 diffs)
• template/yoga/category.tpl (modified) (3 diffs)
• template/yoga/default-layout.css (modified) (3 diffs)

trunk/category.php

@@ -154 +154 @@
   'L_COMMENT' => $lang['comments'],
   'L_IDENTIFY' => $lang['identification'],
-  'L_SUBMIT' => $lang['menu_login'],
-  'L_USERNAME' => $lang['login'],
   'L_PASSWORD' => $lang['password'],
   'L_HELLO' => $lang['hello'],
   'L_REGISTER' => $lang['ident_register'],
-  'L_LOGIN' => $lang['menu_login'],
   'L_LOGOUT' => $lang['logout'],
   'L_ADMIN' => $lang['admin'],

trunk/doc/ChangeLog

@@ +1 @@
+2005-10-31 Pierrick LE GALL
+
+        * modification: use "filter" class for quickconnect box (with some
+        custom modifications)
+
+        * bug fixed: the total number of pictures had disappeared
+
 2005-10-30 volcom
         

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -48 +48 @@
 $lang['Close this window'] = 'Close this window';
 $lang['Confirm Password'] = 'Confirm Password';
+$lang['Connection'] = 'Connection';
 $lang['Connection settings'] = 'Connection settings';
 $lang['Contact webmaster'] = 'Contact webmaster';
@@ -180 +181 @@
 $lang['maxwidth'] = 'Maximum width of the pictures';
 $lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
-$lang['menu_login'] = 'login';
 $lang['month'][10] = 'October';
 $lang['month'][11] = 'November';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -47 +47 @@
 $lang['Close this window'] = 'Fermer cette fenêtre';
 $lang['Confirm Password'] = 'Confirmer le mot de passe';
+$lang['Connection'] = 'Connexion';
 $lang['Connection settings'] = 'Paramètres de connexion';
 $lang['Contact webmaster'] = 'Contacter le webmestre';
@@ -183 +184 @@
 $lang['maxwidth'] = 'Largeur maximum des images';
 $lang['maxwidth_error'] = 'La largeur des images doit être supérieure à 50';
-$lang['menu_login'] = 'connexion';
 $lang['month'][10] = 'Octobre';
 $lang['month'][11] = 'Novembre';

trunk/template/yoga/category.tpl

@@ -17 +17 @@
   <dd>
     {MENU_CATEGORIES_CONTENT}
+    <p class="totalImages">{NB_PICTURE} {L_TOTAL}</p>
   </dd>
 </dl>
@@ -53 +54 @@
       <!-- 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 -->
@@ -66 +67 @@
     </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>

trunk/template/yoga/default-layout.css

@@ -159 +159 @@
 }
 
-FORM.properties UL, FORM#quickconnect UL, FORM#update UL {
+FORM.properties UL, FORM#update UL {
   list-style-type: none;
   margin: 0;
@@ -165 +165 @@
 }
 
-FORM.properties LI, FORM#quickconnect UL, FORM#update UL  {
+FORM.properties LI, FORM#update UL  {
   margin-bottom: 0.5em;
   padding: 0;
@@ -179 +179 @@
 }
 
-FORM#quickconnect LABEL {
-  float: left;
-  width: 30%;
-  text-align: right;
-  margin: 0.5em 0 0 0;
-  padding: 0 0.5em 0 0;
-}
-
-FORM#quickconnect INPUT {
-  margin-top: 0.5em;
+FORM#quickconnect { 
+  margin: 0;
+}
+
+FORM#quickconnect FIELDSET {
+  margin: 5px;
+}
+
+FORM#quickconnect P {
+  text-align: center;
+}
+
+FORM#quickconnect P INPUT {
+  display: inline;
 }