From ee01e67fa709197bdf3b0e2f990cdf1bf312856b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 7 Jul 2015 09:41:27 +0200
Subject: use default style for default webpage

---
 view/tpl/page_display.tpl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 5328648b9..a4870d623 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,9 +1,14 @@
 <div class="page">
-
-<div class="generic-content-wrapper" id="page-content-wrapper" >
-	{{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}}
-	<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
-	<div class="page-date">{{$date}}</div>
-	<div class="page-body">{{$body}}</div>
-</div>
+	<div class="generic-content-wrapper" id="page-content-wrapper" >
+		<div class="section-title-wrapper">
+			{{if $title}}
+			<h2 class="page-title">{{$title}}</h2>
+			{{/if}}
+		</div>
+		<div class="section-content-wrapper">
+			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+			<div class="page-date">{{$date}}</div>
+			<div class="page-body">{{$body}}</div>
+		</div>
+	</div>
 </div>
-- 
cgit v1.2.3


From 807471d2a5f1b53c616376bcb5f0cdcb361f20ce Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 7 Jul 2015 09:56:30 +0200
Subject: move if clause outside of the div

---
 view/tpl/page_display.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index a4870d623..a320920c7 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,10 +1,10 @@
 <div class="page">
 	<div class="generic-content-wrapper" id="page-content-wrapper" >
+		{{if $title}}
 		<div class="section-title-wrapper">
-			{{if $title}}
 			<h2 class="page-title">{{$title}}</h2>
-			{{/if}}
 		</div>
+		{{/if}}
 		<div class="section-content-wrapper">
 			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
 			<div class="page-date">{{$date}}</div>
-- 
cgit v1.2.3


From adfb4072e80695a253a9a92da2b1ebbdbc7f18bf Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 7 Jul 2015 12:13:15 +0200
Subject: various css fixes

---
 view/tpl/conv_item.tpl   | 3 +--
 view/tpl/conv_list.tpl   | 3 +--
 view/tpl/photo_item.tpl  | 2 +-
 view/tpl/search_item.tpl | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 27632d770..30a007bd6 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -165,8 +165,7 @@
 				</div>
 				<div class="clear"></div>
 			</div>
-			<div class="wall-item-wrapper-end"></div>
-			<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+			<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 		</div>
 		{{if $item.toplevel}}
 		{{foreach $item.children as $child}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index cb2fb8959..5487d5937 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -179,8 +179,7 @@
 				</div>
 				<div class="clear"></div>
 			</div>
-			<div class="wall-item-wrapper-end"></div>
-			<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+			<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 		</div>
 	</div>
 {{if $item.comment_lastcollapsed}}
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 16f9a76c2..2ea7aa9f3 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -21,7 +21,7 @@
 
 		{{$comment}}
 
-	<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+	<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 	</div>
 </div>
 
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index dee33f1b3..256443b84 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -57,7 +57,7 @@
 			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
 		</div>
 		{{/if}}
-		<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+		<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 	</div>
 </div>
 
-- 
cgit v1.2.3


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/tpl')

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


From f6cf992aee86e69d1ea5790c22d4af40c266d79e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 7 Jul 2015 22:48:01 +0200
Subject: fix sorting of channel suggestions

---
 view/tpl/directory_header.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 25a9b8279..79598fc9a 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -5,10 +5,10 @@
 				<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>
+				<li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li>
+				<li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li>
+				<li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li>
+				<li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li>
 			</ul>
 		</div>
 		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
-- 
cgit v1.2.3