Changeset 1607:d8d8ff4c2474

Timestamp:

08/27/13 21:43:07 (11 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

My preferences. Wording and design.

Files:

• admin/preferences.php (modified) (9 diffs)
• admin/style/default.css (modified) (2 diffs)
• locales/fr/main.po (modified) (4 diffs)

admin/preferences.php

@@ -416 +416 @@
 '<div class="col">'.
 
-'<p><label for="user_lang">'.__('User language:').'</label>'.
+'<p><label for="user_lang">'.__('Language for my interface:').'</label>'.
 form::combo('user_lang',$lang_combo,$user_lang,'l10n').'</p>'.
 
-'<p><label for="user_tz">'.__('User timezone:').'</label>'.
+'<p><label for="user_tz">'.__('My timezone:').'</label>'.
 form::combo('user_tz',dt::getZones(true,true),$user_tz).'</p>'.
 
@@ -430 +430 @@
      echo
      '<fieldset>'.
-     '<legend>'.__('Change your password').'</legend>'.
+     '<legend>'.__('Change my password').'</legend>'.
      
      '<div class="pw-table">'.
@@ -445 +445 @@
      '</fieldset>'.
      
-     '<p>'.__('If you have changed this user email or password you must provide your current password to save these modifications.').'</p>'.
+     '<div class="fieldset">'.
+     '<p class="form-note warn">'.__('If you have changed your email or password you must provide your current password to save these modifications.').'</p>'.
      '<p><label for="cur_pwd">'.__('Your password:').'</label>'.
-     form::password('cur_pwd',20,255).'</p>';
+     form::password('cur_pwd',20,255).'</p>'.
+     '</div>';
 }
 
@@ -465 +467 @@
 '<fieldset><legend>'.__('My options').'</legend>'.
 
-'<p><label for="user_post_format">'.__('Preferred format:').'</label>'.
+'<p><label class="ib" for="user_post_format">'.__('Preferred format:').'</label>'.
 form::combo('user_post_format',$formaters_combo,$user_options['post_format']).'</p>'.
 
-'<p><label for="user_post_status">'.__('Default entry status:').'</label>'.
+'<p><label class="ib" for="user_post_status">'.__('Default entry status:').'</label>'.
 form::combo('user_post_status',$status_combo,$user_post_status).'</p>'.
 
-'<p><label for="user_edit_size">'.__('Entry edit field height:').'</label>'.
+'<p><label class="ib" for="user_edit_size">'.__('Entry edit field height:').'</label>'.
 form::field('user_edit_size',5,4,(integer) $user_options['edit_size']).'</p>'.
 
@@ -488 +490 @@
 if (count($iconsets_combo) > 1) {
      echo 
-          '<p><label for="user_ui_iconset">'.__('Iconset:').'</label>'.
+          '<p><label class="ib" for="user_ui_iconset">'.__('Iconset:').'</label>'.
           form::combo('user_ui_iconset',$iconsets_combo,$user_ui_iconset).'</p>';
 } else {
@@ -551 +553 @@
 echo '<div class="two-cols">';
 echo '<div class="col70">';
-echo '<fieldset id="my-favs"><legend>'.__('My favorites').'</legend>';
+echo '<div id="my-favs" class="fieldset"><h3>'.__('My favorites').'</h3>';
 
 $count = 0;
@@ -595 +597 @@
 }
 
-echo '</fieldset>';
+echo '</div>';
 
 echo '<div id="default-favs"><h3>'.__('Default favorites').'</h3>';
@@ -615 +617 @@
 echo '</div>';
 echo '</div>';
-echo '<div class="col30" id="available-favs">';
+echo '<div class="col30 fieldset" id="available-favs">';
 # Available favorites
-echo '<fieldset><legend>'.__('Available favorites').'</legend>';
+echo '<h3>'.__('Available favorites').'</h3>';
 $count = 0;
 $array = $_fav;
@@ -643 +645 @@
 $core->formNonce().
 '<input type="submit" name="appendaction" value="'.__('Add to my favorites').'" /></p>';
-echo '</fieldset>';
 echo '</div>';
 echo '</div>'; # Two-cols

admin/style/default.css

@@ -781 +781 @@
 }
 /* ------------------------------------------------------------------ preferences */
+#my-favs {
+     border: 2px solid #A8DC26;
+     padding: 1em 2em
+}
 #my-favs ul {
      list-style-type: none;
@@ -837 +841 @@
      padding: .2em;
      border-radius: .5em;
+}
+#user-options label.ib {
+     display: inline-block;
+     width: 14em;
+     padding-right: 1em;
 }
 /* -------------------------------------------------------------------- Themes */

locales/fr/main.po

@@ -82 +82 @@
 msgstr "Changer votre mot de passe"
 
+msgid "Change my password"
+msgstr "Changer mon mot de passe"
+
 msgid "New password:"
 msgstr "Nouveau mot de passe :"
@@ -1803 +1806 @@
 msgstr "Défaut"
 
-msgid "If you want to change your email or password you must provide your current password."
-msgstr "Si vous voulez changer votre adresse email ou votre mot de passe, vous devez indiquer votre mot de passe actuel."
+msgid "If you have changed your email or password you must provide your current password to save these modifications."
+msgstr "Si vous avez modifié votre adresse email ou votre mot de passe, vous devez indiquer votre mot de passe actuel pour enregistrer ces modifications."
 
 msgid "No favorite selected"
@@ -1836 +1839 @@
 msgstr "Langue de l'utilisateur :"
 
+msgid "Language for my interface:"
+msgstr "Langue de mon interface :"
+
 msgid "User timezone:"
 msgstr "Fuseau horaire de l'utilisateur :"
+
+msgid "My timezone:"
+msgstr "Mon fuseau horaire :"
 
 msgid "If you have changed this user email or password you must provide your current password to save these modifications."
@@ -3131 +3140 @@
 
 msgid "Confirm new password:"
-msgstr "Confirmez le nouveau mot de passe :"
+msgstr "Confirmer le nouveau mot de passe :"
 
 msgid "Not selected"