From 6c038db4bb912594f3686c4e4915d0f67ac0834e Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Thu, 27 Feb 2014 19:29:49 +0100
Subject: [PATCH] Better layout for image directory permissions.

---
 templates/2k11/admin/images.inc.tpl            | 16 ++++++++++------
 templates/2k11/admin/serendipity_editor.js.tpl |  2 +-
 templates/2k11/admin/style.css                 |  9 +++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl
index 43561866..28e1db22 100644
--- a/templates/2k11/admin/images.inc.tpl
+++ b/templates/2k11/admin/images.inc.tpl
@@ -85,8 +85,12 @@
             <input id="diredit_new" name="serendipity[newDir]" type="text" value="{$use_dir}">
         </div>
 
-        <div class="clearfix">
-            <div class="form_select">
+        <h3 class="toggle_headline">
+            <button class="show_config_option icon_link" type="button" data-href="#directory_permissions" title="{$CONST.TOGGLE_OPTION}"><span class="icon-plus"></span> {$CONST.PERMISSIONS}</button>
+        </h3>
+
+        <div id="directory_permissions" class="clearfix additional_info">
+            <div class="form_multiselect">
                 <label for="read_authors">{$CONST.PERM_READ}</label>
                 <select id="read_authors" name="serendipity[read_authors][]" multiple size="6">
                     <option value="0"{if $rgroups} selected{/if}>{$CONST.ALL_AUTHORS}</option>
@@ -96,7 +100,7 @@
                 </select>
             </div>
 
-            <div class="form_select">
+            <div class="form_multiselect">
                 <label for="write_authors">{$CONST.PERM_WRITE}</label>
                 <select id="write_authors" name="serendipity[write_authors][]" multiple size="6">
                     <option value="0"{if $wgroups} selected{/if}>{$CONST.ALL_AUTHORS}</option>
@@ -105,10 +109,10 @@
                 {/foreach}
                 </select>
             </div>
-        </div>
 
-        <div class="form_check">
-            <input id="setchild" name="serendipity[update_children]" type="checkbox" value="true"{if !empty($smarty.post.update_children) == 'on'} checked="checked"{/if}><label for="setchild">{$CONST.PERM_SET_CHILD}</label>
+            <div class="form_check">
+                <input id="setchild" name="serendipity[update_children]" type="checkbox" value="true"{if !empty($smarty.post.update_children) == 'on'} checked="checked"{/if}><label for="setchild">{$CONST.PERM_SET_CHILD}</label>
+            </div>
         </div>
 
         <div class="form_buttons">
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index a196863c..ee46c9f2 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -873,7 +873,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
     });
 
     // Collapsible configuration elements
-    if($('body').has('#serendipity_config_options, #serendipity_category').size() > 0) {
+    if($('body').has('#serendipity_config_options, #serendipity_category, #image_directory_edit_form').size() > 0) {
         var optsCollapsed = true;
 
         $('.show_config_option').click(function(e) {
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 0d5b2c17..b72cdad4 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1192,6 +1192,7 @@ summary {
 #serendipity_category .form_field input,
 #serendipity_category .form_select select,
 #serendipity_category .form_multiselect select,
+#directory_permissions .form_multiselect select,
 #uploadform .form_select select,
 #uploadform .form_field input,
 #login .form_field input,
@@ -2638,11 +2639,6 @@ img.mfp-img {
         width: 33%;
     }
 
-    #image_directory_edit_form > div > .form_select {
-        float: left;
-        margin: 0 5% 0 0;
-    }
-
     #template_select article,
     .plugins_installable > li,
     #serendipityScaleForm,
@@ -2653,7 +2649,8 @@ img.mfp-img {
     .serendipity_statistics > section,
     #serendipity_category > div > div,
     #serendipity_category #preview,
-    #serendipity_category > div > fieldset {
+    #serendipity_category > div > fieldset,
+    #directory_permissions .form_multiselect {
         float: left;
         margin: 0 2% 1em 0;
         width: 48%;