Rollback on double_select horizontal scroll.

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

2 files changed, 20 insertions, 33 deletions

diff --git a/admin/template/goto/default-layout.css b/admin/template/goto/default-layout.css
index 8b8a08066..4fe82235c 100644
--- a/admin/template/goto/default-layout.css
+++ b/admin/template/goto/default-layout.css
@@ -40,7 +40,10 @@ TABLE#detailedStats {
 }
 
 /* categoryOrdering */
-
+SELECT.categoryList {
+  width: 100%;
+}
+ 
 FORM#categoryOrdering {
   padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
   padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
@@ -84,17 +87,11 @@ TABLE.doubleSelect {
 
 TABLE.doubleSelect TD {
   padding: 0 5px;
-  /* width: 50%; relative width does't work with horizontal scroll */
-  display: table-cell; width:300px; min-width:300px; max-width:300px;
-}
-
-.hscroll {
- overflow-x:scroll; width:100%; min-width:100%; max-width:100%;
- overflow: -moz-scrollbars-horizontal; border-style: solid; border-width: 1px;
+  width: 50%; 
 }
 
 TABLE.doubleSelect SELECT.categoryList {
-  height:250px; border:0;
+  width: 100%; max-width: 100%; overflow-x: auto;
 }
 
 FORM#categoryPermissions LI {
@@ -268,6 +265,11 @@ TEXTAREA.description {
   overflow: auto;
 }
 
+SELECT.categoryList {
+  height: 20em;
+  width: auto; 
+}
+
 DIV.comment BLOCKQUOTE {
   padding: 0.5em;
   overflow: auto;	/* no solution for IE6 */
@@ -491,13 +493,4 @@ TABLE.tagLetterContent {
 }
 .cluetip-default #cluetip-inner {
   padding: 10px;
-}
-
-/* hack  tout sauf IE7 */
-html>/**/body TABLE.doubleSelect SELECT.categoryList {
-  min-width: 100%; 
-}
-/* Only IE7 */
-*+html  .right {
-  left: -320px; position: relative; z-index: 99;
 }
\ No newline at end of file
diff --git a/admin/template/goto/double_select.tpl b/admin/template/goto/double_select.tpl
index 900e322b2..ab01b9b9b 100644
--- a/admin/template/goto/double_select.tpl
+++ b/admin/template/goto/double_select.tpl
@@ -3,24 +3,18 @@
   <tr>
     <td>
       <h3>{$L_CAT_OPTIONS_TRUE}</h3>
-      <div class="hscroll">
-        <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
-          {html_options options=$category_option_true selected=$category_option_true_selected}
-        </select>
-      </div>
+      <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
+        {html_options options=$category_option_true selected=$category_option_true_selected}
+      </select>
       <p><input class="submit" type="submit" value="&raquo;" name="falsify" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
     </td>
 
     <td>
-      <div class="right">
-        <h3>{$L_CAT_OPTIONS_FALSE}</h3>
-        <div class="hscroll">
-          <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
-            {html_options options=$category_option_false selected=$category_option_false_selected}
-          </select>
-        </div>
-        <p><input class="submit" type="submit" value="&laquo;" name="trueify" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
-      </div>
-      </td>
+      <h3>{$L_CAT_OPTIONS_FALSE}</h3>
+      <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
+        {html_options options=$category_option_false selected=$category_option_false_selected}
+      </select>
+      <p><input class="submit" type="submit" value="&laquo;" name="trueify" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
+    </td>
   </tr>
 </table>
\ No newline at end of file