Checkboxes reverted on rvelices request.

And several minor corrections

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

6 files changed, 58 insertions, 32 deletions

diff --git a/admin/template/yoga/admin/configuration.tpl b/admin/template/yoga/admin/configuration.tpl
index 3da7f3e4d..8bd9ecaf6 100644
--- a/admin/template/yoga/admin/configuration.tpl
+++ b/admin/template/yoga/admin/configuration.tpl
@@ -6,24 +6,24 @@
 <form method="post" action="{$F_ACTION}" class="properties">
 
 {if isset($main)}
-<fieldset>
+<fieldset id="mainConf">
   <ul>
     <li>
-      <span class="property m38">
+      <span class="property">
         <label for="gallery_title">{'Gallery title'|@translate}</label>
       </span>
       <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{$main.CONF_GALLERY_TITLE}" />
     </li>
 
     <li>
-      <span class="property m38">
+      <span class="property">
         <label for="page_banner">{'Page banner'|@translate}</label>
       </span>
       <textarea class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea>
     </li>
 
     <li>
-      <span class="property m38">
+      <span class="property">
         <label for="gallery_url">{'Gallery URL'|@translate}</label>
       </span>
       <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{$main.CONF_GALLERY_URL}" />
@@ -31,7 +31,7 @@
   </ul>
 </fieldset>
 
-<fieldset>
+<fieldset id="mainConfCheck">
   <ul>
 
     <li>
@@ -80,7 +80,7 @@
 {/if}
 
 {if isset($history)}
-<fieldset>
+<fieldset id="historyConf">
   <ul>
       <li>
         <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if} /></label>
@@ -99,7 +99,7 @@
 
 
 {if isset($comments)}
-<fieldset>
+<fieldset id="commentsConf">
   <ul>
     <li>
       <label>
@@ -142,7 +142,7 @@
 {/if}
 
 {if isset($upload)}
-<fieldset>
+<fieldset id="uploadConf">
   <ul>
     <li>
       <label><span class="property">{'Show upload link every time'|@translate}</span>
@@ -150,7 +150,7 @@
     </li>
     <li>
       <label><span class="property">{'User access level to upload'|@translate}</span>
-      {html_options class="widefield" name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
+      {html_options name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
     </li>
     <li>
       <label>
@@ -172,4 +172,4 @@
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
 {/if}
-</form>
+</form>
\ No newline at end of file
diff --git a/admin/template/yoga/default-colors.css b/admin/template/yoga/default-colors.css
index c73b7e497..277454a11 100644
--- a/admin/template/yoga/default-colors.css
+++ b/admin/template/yoga/default-colors.css
@@ -13,13 +13,6 @@
 
 /* Tables & forms */
 
-/* IE <= 6 is so bad with this that you can't merge with the following rule */
-INPUT[type="text"], INPUT[type="password"], INPUT[type="button"],
-INPUT[type="submit"], INPUT[type="reset"], INPUT[type="file"] {
-  color:black;
-  background-color: #d3d3d3;	/* lightgrey */
-}
-
 INPUT.text, INPUT.password, INPUT.button,
 INPUT.submit, INPUT.reset, INPUT.file,
 SELECT, TEXTAREA {
diff --git a/admin/template/yoga/default-layout.css b/admin/template/yoga/default-layout.css
index 2f5b2151d..9d755d95d 100644
--- a/admin/template/yoga/default-layout.css
+++ b/admin/template/yoga/default-layout.css
@@ -97,13 +97,48 @@ FORM#categoryPermissions LI {
   display:inline;
   white-space: nowrap;
 }
-.property {
-  width: 60%;
+
+FIELDSET#mainConfCheck SPAN.property,
+FIELDSET#historyConf SPAN.property,
+FIELDSET#commentsConf SPAN.property,
+FIELDSET#uploadConf SPAN.property {
+  float: right;
+  text-align: left;
 }
-TEXTAREA.description {
+FIELDSET#mainConfCheck INPUT,
+FIELDSET#historyConf INPUT,
+FIELDSET#commentsConf INPUT,
+FIELDSET#uploadConf INPUT {
+  float: none;
+}
+
+FIELDSET#mainConf SPAN.property {
+  width: 25%;
+}
+FIELDSET#mainConf TEXTAREA.description {
   width: 70%;
 }
 
+FIELDSET#mainConfCheck SPAN.property,
+FIELDSET#historyConf SPAN.property {
+  width: 90%;
+}
+FIELDSET#mainConfCheck INPUT,
+FIELDSET#historyConf INPUT,
+FIELDSET#commentsConf INPUT,
+FIELDSET#uploadConf SELECT,
+FIELDSET#uploadConf INPUT {
+  margin-left: 5%;
+}
+
+FIELDSET#commentsConf SPAN.property {
+  width: 85%;
+}
+
+FIELDSET#uploadConf SPAN.property {
+  width: 73%;
+}
+
 .statBar {
   height: 10px;
   background-color: #66f;
@@ -284,7 +319,7 @@ FORM FIELDSET P {
 
 TEXTAREA.description {
   height: 12em;
-  width: 60%;
+  width: 40em;
   overflow: auto;
 }
 
@@ -392,14 +427,11 @@ FORM.properties LI, FORM#update UL  {
 FORM.properties SPAN.property {
   font-weight: bold;
   float: left;
-  width: 60%;
+  width: 50%;
   text-align: right;
   margin: 0;
   padding: 0 0.5em 0 0;
 }
-.m38 {
-  width: 38% !important;
-}
 
 #theHeader H1 {
   margin-bottom: 0.5em;
@@ -499,4 +531,3 @@ TABLE.tagLetterContent {
   width:100%;
   font-size:80%;
   border-collapse : collapse;
-}
diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css
index e76c2f364..b3f4bec62 100644
--- a/admin/template/yoga/theme/admin/theme.css
+++ b/admin/template/yoga/theme/admin/theme.css
@@ -2,8 +2,9 @@
 /* text color */
 body, h3, dt, h2, .throw, .content,
 input.rateButtonSelected /* <= why IE doesn't inherit this ? */ { color:#ccc; }
-input.text, input.button, input.submit, input.reset, input.file, select, textarea {
-color:#111; }  
+INPUT[type="text"], INPUT[type="password"], INPUT[type="button"],
+INPUT[type="submit"], INPUT[type="reset"], INPUT[type="file"], select, textarea {
+color:#111; background-color: #eee; }  
 input.rateButton, legend, #theAdminPage h3 { color: #777; }
 #theAdminPage h2 { color: #333; }
 
@@ -49,7 +50,8 @@ text-transform:none; font-weight:bold; padding-left:20px; }
  background-image: url(images/fillet.png); background-repeat: repeat-x; }
 .browsePath a { color: #eee; }
 /* borders */ /* TODO */
-INPUT, SELECT, TEXTAREA { border-left: 2px solid #696969; }
+INPUT, SELECT, TEXTAREA { border-left: 2px inset #696969; 
+cursor:text; text-indent:4px; }
 .content UL.thumbnails SPAN.wrap2 {
   border: 1px solid #aaaaaa;	/* thumbnails border color and style */
   border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
diff --git a/admin/template/yoga/thumbnails.css b/admin/template/yoga/thumbnails.css
index 052759381..536034810 100644
--- a/admin/template/yoga/thumbnails.css
+++ b/admin/template/yoga/thumbnails.css
@@ -30,8 +30,8 @@
   left: 2px; top: 2px;
 }
 UL.thumbnails .levelIndicatorB {
-display:block; position:absolute; z-index:100;padding:0px 0 0 14px; color:black; font-weight:bold; fontsize:120%;
+display:block; position:absolute; z-index:100;padding:0px 0 0 14px; color:black; font-weight:bold; font-size:120%;
 }
 UL.thumbnails .levelIndicatorF {
-display:block; position:absolute; z-index:101;padding:1px 0 0 15px; color:white; font-weight:bold; fontsize:120%;
+display:block; position:absolute; z-index:101;padding:1px 0 0 15px; color:white; font-weight:bold; font-size:120%;
 }
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index a38fbe321..1f0bdc72c 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -235,7 +235,7 @@ $lang['enabled_high'] = 'Haute définition actif';
 $lang['file'] = 'fichier';
 $lang['filesize'] = 'poids';
 $lang['first element added on %s'] = 'premier élément ajouté le %s';
-$lang['forbidden'] = 'interdit';
+$lang['forbidden'] = 'Interdit';
 $lang['conf_general'] = 'Générale';
 $lang['global mode'] = 'mode global';
 $lang['group "%s" added'] = 'groupe "%s" ajouté';