From 76c554227ca10144c8cc144fc064c016921d80cf Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Fri, 20 Sep 2013 12:58:32 +0200
Subject: [PATCH] Move media library directory filter to filters toolbar.

This is the "replacement" for the tree view directory browser which
was removed to get rid of the Yahoo JS dependency.

References #30
---
 templates/2k11/admin/media_pane.tpl | 21 ++++++++++++---------
 templates/2k11/admin/style.css      |  4 ++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index aecd2680..2d6c71ac 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -10,6 +10,18 @@
         <ul class="filters_toolbar clearfix plainList">
             <li><a class="button_link" href="#media_pane_filter" title="Show filters"><span class="icon-filter"></span><span class="visuallyhidden"> Show filters</span></a></li> {* i18n *}
             <li><a class="button_link" href="#media_pane_sort" title="{$CONST.SORT_ORDER}"><span class="icon-sort"></span><span class="visuallyhidden"> {$CONST.SORT_ORDER}</span></a></li>
+            <li id="media_filter_path">
+                <div class="form_select">
+                    <label for="serendipity_only_path" class="visuallyhidden">{$CONST.FILTER_DIRECTORY}</label>
+                    <select id="serendipity_only_path" name="serendipity[only_path]">
+                        <option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
+                    {foreach from=$media.paths item="folder"}
+                        <option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
+                    {/foreach}
+                    </select>
+                    <input name="go" type="submit" value="{$CONST.GO}">
+                </div>
+            </li>
             <li id="media_selector_bar"><fieldset>
                     <input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == ""}checked{/if} value=""></input><label for="serendipity[filter][fileCategory][All]" class="media_selector button_link">All</label><input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "image"}checked{/if} value="image"></input><label for="serendipity[filter][fileCategory][Image]" class="media_selector button_link">{$CONST.IMAGE}</label><input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "video"}checked{/if} value="video"></input><label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
                 </fieldset>
@@ -67,15 +79,6 @@
                     {/if}
                     </div>
                 {/foreach}
-                <div id="media_filter_path" class="form_select">
-                    <label for="serendipity_only_path">{$CONST.FILTER_DIRECTORY}</label>
-                    <select id="serendipity_only_path" name="serendipity[only_path]">
-                        <option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
-                    {foreach from=$media.paths item="folder"}
-                        <option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
-                    {/foreach}
-                    </select>
-                </div>
 
                 <div id="media_filter_file" class="form_field">
                     <label for="serendipity_only_filename">{$CONST.SORT_ORDER_NAME}</label>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 10ca6349..6fa65f2b 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -869,6 +869,10 @@ input[type=checkbox],
     margin-bottom: .75em;
 }
 
+#media_filter_path .form_select {
+    margin: 0 0 0 2em;
+}
+
 #serendipity_category .inputs .form_radio,
 .configuration_group fieldset > fieldset,
 .theme_options .configuration_group > fieldset,