From f5ad1dfbc521223be5ca97f0b878d9267cffabb3 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Mon, 14 Nov 2016 19:58:43 -0500
Subject: Moved new wiki and new page buttons to widgets

---
 view/tpl/wiki_page_list.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 1c3254465..c5f3ec9a0 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,6 +1,8 @@
 {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
 <div id="wiki_page_list" class="widget" >
-	<h3>{{$header}}</h3>
+	<h3>{{$header}}
+			<i id="new-page-button" class="pull-right generic-icons fakelink fa fa-plus" title="New page" onclick="wiki_show_new_page_form();"></i>
+	</h3>
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $pages as $page}}
 		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
-- 
cgit v1.2.3


From e0a702df764036ae0303a49f08b2ada90ed0a842 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 15 Nov 2016 00:50:31 -0800
Subject: wiki: permissions issues, untranslated strings in templates and some
 minor changes to provide a consistent UI with the rest of the app.

---
 view/tpl/wiki_page_list.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index c5f3ec9a0..c020f2520 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,12 +1,14 @@
 {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
 <div id="wiki_page_list" class="widget" >
-	<h3>{{$header}}
-			<i id="new-page-button" class="pull-right generic-icons fakelink fa fa-plus" title="New page" onclick="wiki_show_new_page_form();"></i>
-	</h3>
+	<h3>{{$header}}</h3>
+
 	<ul class="nav nav-pills nav-stacked">
+		{{if $pages}}
 		{{foreach $pages as $page}}
 		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
 		{{/foreach}}
+		{{/if}}
+		{{if $canadd}}<li><a href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>{{/if}}
 	</ul>
 </div>
 {{if $not_refresh}}</div>{{/if}}
-- 
cgit v1.2.3


From 3cb138ea41bda9c64b6295d53e7d65fbb29d203a Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Fri, 18 Nov 2016 06:04:00 -0500
Subject: move commit message and save button into edit pane. Change page list
 tab label to Pages and move current page name back to section header.

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

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index c020f2520..afb14c6a9 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,6 +1,6 @@
 {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
 <div id="wiki_page_list" class="widget" >
-	<h3>{{$header}}</h3>
+	<!--<h3>{{$header}}</h3>-->
 
 	<ul class="nav nav-pills nav-stacked">
 		{{if $pages}}
-- 
cgit v1.2.3


From d24e867603fd253ea42050057896422beeba59db Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Fri, 18 Nov 2016 21:55:29 -0500
Subject: Move page list back out to the side menu, but with the new page form
 below the new page button like the new wiki form. Disable text editing if
 viewer lacks edit permission, and change the tab label to Source instead of
 Edit in that case.

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

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index afb14c6a9..c0eeecff8 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,6 +1,6 @@
 {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
 <div id="wiki_page_list" class="widget" >
-	<!--<h3>{{$header}}</h3>-->
+	<h3>{{$header}}</h3>
 
 	<ul class="nav nav-pills nav-stacked">
 		{{if $pages}}
@@ -10,5 +10,38 @@
 		{{/if}}
 		{{if $canadd}}<li><a 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}}/create/page" method="post" >
+        <div class="clear"></div>
+        {{include file="field_input.tpl" field=$pageName}}
+        <div class="btn-group pull-right">
+            <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button>
+        </div>
+      </form>
+		<div class="clear"></div>
+      <hr>
+    </div>
+	{{/if}}
 </div>
 {{if $not_refresh}}</div>{{/if}}
+
+<script>
+
+	$('#new-page-submit').click(function (ev) {
+		if (window.wiki_resource_id === '') {
+		window.console.log('You must have a wiki open in order to create pages.');
+		ev.preventDefault();
+		return false;
+		}
+		$.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
+		function (data) {
+			if (data.success) {
+			window.location = data.url;
+			} else {
+			window.console.log('Error creating page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
+</script>
\ No newline at end of file
-- 
cgit v1.2.3


From 0ff24b6f215b9125876489741d8aff2b764a0175 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 23 Nov 2016 13:49:24 +0100
Subject: whitespace and minor fixes

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

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index c0eeecff8..723cd0904 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,38 +1,33 @@
 {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
 <div id="wiki_page_list" class="widget" >
 	<h3>{{$header}}</h3>
-
 	<ul class="nav nav-pills nav-stacked">
 		{{if $pages}}
 		{{foreach $pages as $page}}
 		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
 		{{/foreach}}
 		{{/if}}
-		{{if $canadd}}<li><a href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>{{/if}}
+		{{if $canadd}}
+		<li><a 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}}/create/page" method="post" >
-        <div class="clear"></div>
-        {{include file="field_input.tpl" field=$pageName}}
-        <div class="btn-group pull-right">
-            <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button>
-        </div>
-      </form>
-		<div class="clear"></div>
-      <hr>
-    </div>
+		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
+			{{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}}
 </div>
 {{if $not_refresh}}</div>{{/if}}
 
 <script>
-
 	$('#new-page-submit').click(function (ev) {
 		if (window.wiki_resource_id === '') {
-		window.console.log('You must have a wiki open in order to create pages.');
-		ev.preventDefault();
-		return false;
+			window.console.log('You must have a wiki open in order to create pages.');
+			ev.preventDefault();
+			return false;
 		}
 		$.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
 		function (data) {
@@ -44,4 +39,4 @@
 		}, 'json');
 		ev.preventDefault();
 	});
-</script>
\ No newline at end of file
+</script>
-- 
cgit v1.2.3


From 1ce4eda0b92e13615991ec22d3b789c640991431 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 28 Nov 2016 11:29:10 +0100
Subject: wiki: move delete page functionality to the widget

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

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 723cd0904..bd6d2d759 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -4,7 +4,12 @@
 	<ul class="nav nav-pills nav-stacked">
 		{{if $pages}}
 		{{foreach $pages as $page}}
-		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
+		<li id="{{$page.link_id}}">
+			{{if $page.resource_id && $canadd}}
+			<i class="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>
+			{{/if}}
+			<a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
+		</li>
 		{{/foreach}}
 		{{/if}}
 		{{if $canadd}}
@@ -39,4 +44,31 @@
 		}, 'json');
 		ev.preventDefault();
 	});
+
+	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
+		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
+			return;
+		}
+		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
+		function (data) {
+			if (data.success) {
+				window.console.log('Page deleted successfully.');
+				if(wiki_page_url == window.wiki_page_name) {
+					var url = window.location.href;
+					if(url.substr(-1) == '/')
+						url = url.substr(0, url.length - 2);
+					url = url.split('/');
+					url.pop();
+					window.location = url.join('/');
+				}
+				else {
+					$('#' + wiki_link_id).remove();
+				}
+			} else {
+				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
+				window.console.log('Error deleting page.');
+			}
+		}, 'json');
+		return false;
+	}
 </script>
-- 
cgit v1.2.3


From d8774cda8ed0bec9dbbe8638fd7af5307d569805 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 28 Nov 2016 11:54:36 +0100
Subject: minor cleanup and remove more double encoding

---
 view/tpl/wiki_page_list.tpl | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index bd6d2d759..ef2b41490 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -29,17 +29,12 @@
 
 <script>
 	$('#new-page-submit').click(function (ev) {
-		if (window.wiki_resource_id === '') {
-			window.console.log('You must have a wiki open in order to create pages.');
-			ev.preventDefault();
-			return false;
-		}
 		$.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
-		function (data) {
-			if (data.success) {
-			window.location = data.url;
+		function(data) {
+			if(data.success) {
+				window.location = data.url;
 			} else {
-			window.console.log('Error creating page.');
+				window.console.log('Error creating page.');
 			}
 		}, 'json');
 		ev.preventDefault();
@@ -71,4 +66,10 @@
 		}, 'json');
 		return false;
 	}
+
+	function wiki_show_new_page_form() {
+		$('#new-page-form-wrapper').toggle();
+		$('#id_pageName').focus();
+		return false;
+	}
 </script>
-- 
cgit v1.2.3