From 0b272264eada1d5cf71e4273d6d3b22337c4e5cc Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 16 Sep 2017 14:00:55 -0400
Subject: Page title is what we need in order to delete pages, not the url

---
 view/tpl/wiki_page_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 3d38a0b81..cfaa50395 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -7,7 +7,7 @@
 		{{foreach $pages as $page}}
 		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
 			{{if $page.resource_id && $candel}}
-			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
+			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.title}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
 			{{/if}}
 			<a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
 		</li>
-- 
cgit v1.2.3


From 6239a27288bacad225606a40a3dc6ac26072d329 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 16 Sep 2017 14:27:40 -0400
Subject: Moved add wiki page form to top of page list to address issue
 https://github.com/redmatrix/hubzilla/issues/719

---
 view/tpl/wiki_page_list.tpl | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'view')

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index cfaa50395..bf5f6697d 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -3,6 +3,23 @@
 {{/if}}
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills flex-column">
+		{{if $canadd}}
+			<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
+		{{/if}}
+		{{if $canadd}}
+		<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
+			<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
+				<input type="hidden" name="resource_id" value="{{$resource_id}}">
+				{{if $typelock}}
+				<input type="hidden" name="mimetype" value="{{$lockedtype}}">
+				{{else}}
+				{{$mimetype}}
+				{{/if}}
+				{{include file="field_input.tpl" field=$pageName}}
+				<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
+			</form>
+		</div>
+		{{/if}}
 		{{if $pages}}
 		{{foreach $pages as $page}}
 		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
@@ -13,24 +30,7 @@
 		</li>
 		{{/foreach}}
 		{{/if}}
-		{{if $canadd}}
-		<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
-		{{/if}}
 	</ul>
-	{{if $canadd}}
-	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
-		<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
-			<input type="hidden" name="resource_id" value="{{$resource_id}}">
-			{{if $typelock}}
-			<input type="hidden" name="mimetype" value="{{$lockedtype}}">
-			{{else}}
-			{{$mimetype}}
-			{{/if}}
-			{{include file="field_input.tpl" field=$pageName}}
-			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
-		</form>
-	</div>
-	{{/if}}
 {{if ! $refresh}}
 </div>
 {{/if}}
-- 
cgit v1.2.3