From f67d9d59afea32a90ea546163da25e36cc4ad9fb Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 7 Jul 2015 22:29:27 +0200
Subject: rename function get_directory_settings => get_directory_setting and
 move sort options to directory title bar

---
 view/tpl/dir_sort_links.tpl   |  7 -------
 view/tpl/directory_header.tpl | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
index 5cefe2f28..9346a7455 100644
--- a/view/tpl/dir_sort_links.tpl
+++ b/view/tpl/dir_sort_links.tpl
@@ -5,11 +5,4 @@
 {{include file="field_checkbox.tpl" field=$globaldir}}
 {{include file="field_checkbox.tpl" field=$pubforums}}
 
-{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'>
-<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option>
-<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option>
-<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option>
-<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option>
-</select><br />
-
 </div>
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 26739efc3..25a9b8279 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,6 +1,18 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
+		<div class="btn-group pull-right">
+			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="icon-sort"></i>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="directory?f=&order=date">{{$date}}</a></li>
+				<li><a href="directory?f=&order=normal">{{$normal}}</a></li>
+				<li><a href="directory?f=&order=reversedate">{{$reversedate}}</a></li>
+				<li><a href="directory?f=&order=reverse">{{$reverse}}</a></li>
+			</ul>
+		</div>
 		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+		<div class="clear"></div>
 	</div>
 	{{foreach $entries as $entry}}
 		{{include file="direntry.tpl"}}
-- 
cgit v1.2.3