diff options
author | plegall <plg@piwigo.org> | 2005-10-31 13:47:58 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2005-10-31 13:47:58 +0000 |
commit | bf596c72795f70d154381d90d89171bab599997f (patch) | |
tree | e7678d21a1a549cc1d46f5dd36ae7763adc568ba | |
parent | 7b9d91a8e680763af8b18052d3acf0431965811e (diff) |
- 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
-rw-r--r-- | category.php | 3 | ||||
-rw-r--r-- | doc/ChangeLog | 7 | ||||
-rw-r--r-- | language/en_UK.iso-8859-1/common.lang.php | 2 | ||||
-rw-r--r-- | language/fr_FR.iso-8859-1/common.lang.php | 2 | ||||
-rw-r--r-- | template/yoga/category.tpl | 46 | ||||
-rw-r--r-- | template/yoga/default-layout.css | 24 |
6 files changed, 50 insertions, 34 deletions
diff --git a/category.php b/category.php index 75e346143..9e8ac16f7 100644 --- a/category.php +++ b/category.php @@ -153,12 +153,9 @@ $template->assign_vars( 'L_UPLOAD' => $lang['upload_picture'], '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'], 'L_ADMIN_HINT' => $lang['hint_admin'], diff --git a/doc/ChangeLog b/doc/ChangeLog index 141c9b31a..b4686224a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +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 * bug 190 fixed: issue in stats.tpl display diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 8e4c0ef91..5e8725407 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -47,6 +47,7 @@ $lang['Categories'] = 'Categories'; $lang['Category'] = 'Category'; $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'; $lang['Create a new account'] = 'Create a new account'; @@ -179,7 +180,6 @@ $lang['maxheight'] = 'Maximum height of the pictures'; $lang['maxheight_error'] = 'Maximum height must be a number superior to 50'; $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'; $lang['month'][12] = 'December'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index aaa13e3ac..3b015df6a 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -46,6 +46,7 @@ $lang['Categories'] = 'Catégories'; $lang['Category'] = 'Catégorie'; $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'; $lang['Create a new account'] = 'Créer un nouveau compte'; @@ -182,7 +183,6 @@ $lang['maxheight'] = 'Hauteur maximum des images'; $lang['maxheight_error'] = 'La hauteur maximum des images doit être supérieure à 50'; $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'; $lang['month'][12] = 'Decembre'; 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 { |