From 271244bb36df0656209472f3d1e9a6c363c0ddab Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 12 Nov 2016 08:06:18 -0500
Subject: Wiki control dropdown menu improvement

---
 view/tpl/wikilist.tpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'view/tpl/wikilist.tpl')

diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 6b37be4c5..8ec7d8245 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -2,19 +2,19 @@
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $wikis as $wiki}}
-        <li class="dropdown" id="wiki-{{$wiki.resource_id}}">              
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                <b>{{$wiki.title}}</b><b class="fa fa-caret-down pull-right"></b>
-            </a>  
-            <ul class="dropdown-menu  pull-right">  
-              <li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View  {{$wiki.title}}">View</a></li>
-							<li><a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download  {{$wiki.title}}">Download</a></li>
+		<div style="padding-bottom: 10px;">
+        <li class="dropdown" id="wiki-{{$wiki.resource_id}}">
+						<a class="btn btn-md fa fa-caret-down dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
+						<a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View  {{$wiki.title}}"><b>{{$wiki.title}}</b></a>
+            <ul class="dropdown-menu pull-left">  
+							<li><a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download  {{$wiki.title}}"><i class="fa fa-download"></i><span style="padding-left: 10px;">Download</span></a></li>
               {{if $showControls}}
               <li class="divider"></li>  
-              <li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}">Delete wiki</a></li>                                
+              <li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"><i class="fa fa-trash-o"></i><span style="padding-left: 10px;">Delete wiki</span></a></li>                                
               {{/if}}
             </ul>  
-        </li>  
+        </li> 
+				</div>
 		{{/foreach}}
 	</ul>
 </div>
-- 
cgit v1.2.3


From da5b9d5c743cfb51dfbea7a79feba463b4331aa5 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 12 Nov 2016 15:24:22 -0500
Subject: Removed wiki list dropdown menus, moving the download and delete
 icons to beside the open wiki link.

---
 view/tpl/wikilist.tpl | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'view/tpl/wikilist.tpl')

diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 8ec7d8245..7cf04d35e 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -1,21 +1,13 @@
 <div id="wiki_list" class="widget">
 	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills nav-stacked">
+	<div>
 		{{foreach $wikis as $wiki}}
-		<div style="padding-bottom: 10px;">
-        <li class="dropdown" id="wiki-{{$wiki.resource_id}}">
-						<a class="btn btn-md fa fa-caret-down dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
+        <div class="form-group" id="wiki-{{$wiki.resource_id}}">
 						<a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View  {{$wiki.title}}"><b>{{$wiki.title}}</b></a>
-            <ul class="dropdown-menu pull-left">  
-							<li><a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download  {{$wiki.title}}"><i class="fa fa-download"></i><span style="padding-left: 10px;">Download</span></a></li>
-              {{if $showControls}}
-              <li class="divider"></li>  
-              <li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"><i class="fa fa-trash-o"></i><span style="padding-left: 10px;">Delete wiki</span></a></li>                                
-              {{/if}}
-            </ul>  
-        </li> 
-				</div>
+						<i class="pull-right generic-icons fakelink fa fa-trash-o" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"></i>
+						<i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download  {{$wiki.title}}"></i>
+        </div> 
 		{{/foreach}}
-	</ul>
+	</div>
 </div>
 
-- 
cgit v1.2.3