From c6aa42773a17d53b4572488967b99666ab97ef97 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 21 May 2016 14:56:42 -0400
Subject: Trying to fix wiki branch starting fresh from dev

---
 view/tpl/wiki.tpl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 view/tpl/wiki.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
new file mode 100644
index 000000000..30a77551e
--- /dev/null
+++ b/view/tpl/wiki.tpl
@@ -0,0 +1,114 @@
+<style type="text/css" media="screen">
+  #ace-editor { 
+    position: relative;        
+    width: 100%;
+    height: 500px;
+  }
+</style>
+<div class="generic-content-wrapper">
+  <div class="section-title-wrapper">
+    <div class="pull-right">
+      <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button>
+      <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button>
+      <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();
+          adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+      <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);
+          adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
+    </div>
+    <h2>Wiki</h2>
+    <div class="clear"></div>
+  </div>
+	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+      <form id="new-wiki-form" action="wiki/create/wiki" method="post" >
+        <div class="clear"></div>
+        {{include file="field_input.tpl" field=$wikiName}}
+        <div class="btn-group pull-right">
+          <div id="acl-container">
+            <div id="profile-jot-submit-right" class="btn-group">
+                <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
+                    <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
+                </button>
+            </div>
+          </div>  
+            <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
+        </div>
+      </form>        <div class="clear"></div>
+      <hr>
+    </div>
+  
+	<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+      <form id="new-page-form" action="wiki/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>
+  
+  <div id="wiki-content-container" class="section-content-wrapper">
+    <ul class="nav nav-tabs" id="wiki-nav-tabs">
+      <li class="active"><a data-toggle="tab" href="#edit-pane">Edit</a></li>
+      <li><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
+      <li class="dropdown">
+        <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a data-toggle="tab" href="#save">Save</a></li>
+          <li><a data-toggle="tab" href="#delete">Delete</a></li>
+        </ul>
+      </li>
+    </ul>
+    <div class="tab-content" id="myTabContent">
+
+      <div id="edit-pane" class="tab-pane fade in active">
+        <div id="ace-editor"></div>
+      </div>      
+      <div id="preview-pane" class="tab-pane fade">
+        <div id="wiki-preview" class="section-content-wrapper">
+
+        </div>
+      </div>
+
+
+    </div>
+  </div>
+</div>
+
+<div>{{$acl}}</div>
+
+<script>
+  $(document).ready(function () {
+    // Show Edit tab first. Otherwise the Ace editor does not load.
+    $("#wiki-nav-tabs li:eq(0) a").tab('show');
+  });
+
+  var editor = ace.edit("ace-editor");
+  editor.setTheme("ace/theme/github");
+  editor.getSession().setMode("ace/mode/markdown");
+  editor.getSession().setValue('{{$content}}');
+
+  $('#wiki-get-preview').click(function (ev) {
+    $.post("wiki/{{$channel}}/preview", {content: editor.getValue()}, function (data) {
+      if (data.success) {
+        $('#wiki-preview').html(data.html);
+      } else {
+        window.console.log('Error previewing page.');
+      }
+    }, 'json');
+    ev.preventDefault();
+  });
+
+  $('#new-wiki-submit').click(function (ev) {
+    var wikiName = $('#id_wikiName').val();
+    $.post("wiki/{{$channel}}/create/wiki", {name: wikiName}, function (data) {
+      if (data.success) {
+        $('#wiki-preview').html(data.html);
+      } else {
+        window.console.log('Error previewing page.');
+      }
+    }, 'json');
+    ev.preventDefault();
+  });
+
+</script>
-- 
cgit v1.2.3


From 5f2baa59f5491f3be964b60fce4bec2ccd840ac1 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 21 May 2016 15:07:27 -0400
Subject: Forgot some templates

---
 view/tpl/wiki_page_list.tpl |  9 +++++++++
 view/tpl/wikilist.tpl       | 12 ++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 view/tpl/wiki_page_list.tpl
 create mode 100644 view/tpl/wikilist.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
new file mode 100644
index 000000000..015ffb930
--- /dev/null
+++ b/view/tpl/wiki_page_list.tpl
@@ -0,0 +1,9 @@
+<div id="wiki_page_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		{{foreach $pages as $page}}
+		<li><a href="">{{$page}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
new file mode 100644
index 000000000..b76bb359c
--- /dev/null
+++ b/view/tpl/wikilist.tpl
@@ -0,0 +1,12 @@
+<div id="wiki_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		{{foreach $read as $r}}
+		<li><a href="">{{$r}}</a></li>
+		{{/foreach}}
+		{{foreach $write as $r}}
+		<li><a href="">{{$r}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+
-- 
cgit v1.2.3


From 049147a9d78b981482297c3daf48c67f31754259 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 21 May 2016 19:02:23 -0400
Subject: Successful new wiki git repo and item table record

---
 view/tpl/wiki.tpl | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 30a77551e..f96270856 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -19,20 +19,19 @@
     <div class="clear"></div>
   </div>
 	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-      <form id="new-wiki-form" action="wiki/create/wiki" method="post" >
+      <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" >
         <div class="clear"></div>
         {{include file="field_input.tpl" field=$wikiName}}
         <div class="btn-group pull-right">
-          <div id="acl-container">
             <div id="profile-jot-submit-right" class="btn-group">
                 <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
-                    <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
+                    <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i>
                 </button>
             </div>
-          </div>  
             <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
         </div>
-      </form>        <div class="clear"></div>
+      </form>        
+      <div class="clear"></div>
       <hr>
     </div>
   
@@ -99,16 +98,4 @@
     ev.preventDefault();
   });
 
-  $('#new-wiki-submit').click(function (ev) {
-    var wikiName = $('#id_wikiName').val();
-    $.post("wiki/{{$channel}}/create/wiki", {name: wikiName}, function (data) {
-      if (data.success) {
-        $('#wiki-preview').html(data.html);
-      } else {
-        window.console.log('Error previewing page.');
-      }
-    }, 'json');
-    ev.preventDefault();
-  });
-
 </script>
-- 
cgit v1.2.3


From a36bef7979aecd72751d319f85b7037991979e35 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 21 May 2016 21:55:09 -0400
Subject: List of wikis populates with links according to observer permissions.

---
 view/tpl/wiki.tpl     | 4 ++--
 view/tpl/wikilist.tpl | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index f96270856..641b3256a 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -15,7 +15,7 @@
       <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);
           adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
     </div>
-    <h2>Wiki</h2>
+    <h2>{{$wikiheader}}</h2>
     <div class="clear"></div>
   </div>
 	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
@@ -46,7 +46,7 @@
       <hr>
     </div>
   
-  <div id="wiki-content-container" class="section-content-wrapper">
+  <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
     <ul class="nav nav-tabs" id="wiki-nav-tabs">
       <li class="active"><a data-toggle="tab" href="#edit-pane">Edit</a></li>
       <li><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index b76bb359c..d5f2d0c04 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -1,11 +1,8 @@
 <div id="wiki_list" class="widget">
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		{{foreach $read as $r}}
-		<li><a href="">{{$r}}</a></li>
-		{{/foreach}}
-		{{foreach $write as $r}}
-		<li><a href="">{{$r}}</a></li>
+		{{foreach $wikis as $wiki}}
+		<li><a href="/wiki/{{$channel}}/{{$wiki.title}}">{{$wiki.title}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>
-- 
cgit v1.2.3


From e00b8a70829213a4333a53a097c2c498d529f5d6 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Tue, 24 May 2016 06:15:42 -0400
Subject: Delete wiki (in progress)

---
 view/tpl/wiki.tpl     | 16 ++++++++++++++--
 view/tpl/wikilist.tpl | 11 ++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 641b3256a..6ee4a7f89 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -30,6 +30,7 @@
             </div>
             <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
         </div>
+        <div>{{$acl}}</div>
       </form>        
       <div class="clear"></div>
       <hr>
@@ -74,8 +75,6 @@
   </div>
 </div>
 
-<div>{{$acl}}</div>
-
 <script>
   $(document).ready(function () {
     // Show Edit tab first. Otherwise the Ace editor does not load.
@@ -98,4 +97,17 @@
     ev.preventDefault();
   });
 
+function wiki_delete_wiki(wikiName, resource_id) {
+  if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiName))) {
+    return;
+  }
+  $.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
+      if (data.success) {
+        window.console.log('Wiki deleted');
+        // Refresh list and redirect page as necessary
+      } else {
+        window.console.log('Error deleting wiki.');
+      }
+    }, 'json');
+}
 </script>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index d5f2d0c04..f3cea489d 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -2,7 +2,16 @@
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $wikis as $wiki}}
-		<li><a href="/wiki/{{$channel}}/{{$wiki.title}}">{{$wiki.title}}</a></li>
+        <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.title}}" title="View  {{$wiki.title}}">View</a></li>
+              <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>                                
+            </ul>  
+        </li>  
 		{{/foreach}}
 	</ul>
 </div>
-- 
cgit v1.2.3


From 97e6b7c4ba1938a46ea18d3ef96eba2d6246dab0 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Fri, 27 May 2016 20:20:33 -0400
Subject: Wiki deletion works

---
 view/tpl/wiki.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 6ee4a7f89..652434c3e 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -105,7 +105,9 @@ function wiki_delete_wiki(wikiName, resource_id) {
       if (data.success) {
         window.console.log('Wiki deleted');
         // Refresh list and redirect page as necessary
+        window.location = 'wiki/{{$channel}}';
       } else {
+        alert('Error deleting wiki!');
         window.console.log('Error deleting wiki.');
       }
     }, 'json');
-- 
cgit v1.2.3


From 4691c3ec01eda972e7b4cae4ec940c8c24d51b5a Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Fri, 27 May 2016 22:19:05 -0400
Subject: Add new page to wiki and redirect to editor page.

---
 view/tpl/wiki.tpl | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 652434c3e..b0824650c 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -76,6 +76,7 @@
 </div>
 
 <script>
+  window.wiki_resource_id = '{{$resource_id}}';
   $(document).ready(function () {
     // Show Edit tab first. Otherwise the Ace editor does not load.
     $("#wiki-nav-tabs li:eq(0) a").tab('show');
@@ -112,4 +113,22 @@ function wiki_delete_wiki(wikiName, resource_id) {
       }
     }, 'json');
 }
+
+
+  $('#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>
-- 
cgit v1.2.3


From f884fa66782544cd6fc44a81b978a905d4755cea Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 28 May 2016 07:17:42 -0400
Subject: Wiki page list is fetched and the page widget is updated

---
 view/tpl/wiki.tpl           | 17 +++++++++++++++++
 view/tpl/wiki_page_list.tpl |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index b0824650c..27887cc1c 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -78,6 +78,7 @@
 <script>
   window.wiki_resource_id = '{{$resource_id}}';
   $(document).ready(function () {
+    wiki_refresh_page_list();
     // Show Edit tab first. Otherwise the Ace editor does not load.
     $("#wiki-nav-tabs li:eq(0) a").tab('show');
   });
@@ -131,4 +132,20 @@ function wiki_delete_wiki(wikiName, resource_id) {
       }, 'json');
     ev.preventDefault();
   });
+  
+  function wiki_refresh_page_list() {
+    if (window.wiki_resource_id === '') {
+      return false;
+    }
+  $.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
+      if (data.success) {
+        $('#wiki_page_list').html(data.pages);
+        $('#wiki_page_list').show();
+      } else {
+        alert('Error fetching page list!');
+        window.console.log('Error fetching page list!');
+      }
+    }, 'json');
+    return false;
+  }
 </script>
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 015ffb930..0ced893c3 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,4 +1,4 @@
-<div id="wiki_page_list" class="widget">
+<div id="wiki_page_list" class="widget" {{if $hide}} style="display: none;" {{/if}}>
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $pages as $page}}
-- 
cgit v1.2.3


From ae94e8a855d31125b96e158c0fb8c0d6f22631d6 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 28 May 2016 07:42:18 -0400
Subject: Wiki page list links work. File content is not yet loaded into the
 editor. Removed some logger calls.

---
 view/tpl/wiki.tpl           | 4 ++--
 view/tpl/wiki_page_list.tpl | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 27887cc1c..a18831aa5 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -139,8 +139,8 @@ function wiki_delete_wiki(wikiName, resource_id) {
     }
   $.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
       if (data.success) {
-        $('#wiki_page_list').html(data.pages);
-        $('#wiki_page_list').show();
+        $('#wiki_page_list_container').html(data.pages);
+        $('#wiki_page_list_container').show();
       } else {
         alert('Error fetching page list!');
         window.console.log('Error fetching page list!');
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 0ced893c3..c941e4a08 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,9 +1,10 @@
-<div id="wiki_page_list" class="widget" {{if $hide}} style="display: none;" {{/if}}>
+{{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">
 		{{foreach $pages as $page}}
-		<li><a href="">{{$page}}</a></li>
+		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page}}">{{$page}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>
-
+{{if $not_refresh}}</div>{{/if}}
-- 
cgit v1.2.3


From 7393dccde816bafca2e3efe534fae56339e2c536 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 28 May 2016 12:33:07 -0400
Subject: Page content is loaded from the file on disk

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

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index a18831aa5..26258e7c2 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -86,7 +86,7 @@
   var editor = ace.edit("ace-editor");
   editor.setTheme("ace/theme/github");
   editor.getSession().setMode("ace/mode/markdown");
-  editor.getSession().setValue('{{$content}}');
+  editor.getSession().setValue({{$content}});
 
   $('#wiki-get-preview').click(function (ev) {
     $.post("wiki/{{$channel}}/preview", {content: editor.getValue()}, function (data) {
-- 
cgit v1.2.3


From 819683a073f85b05807d6c936a2b746296fc8de4 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 28 May 2016 14:11:36 -0400
Subject: Show page content by default. Hide page controls where appropriate.
 Fix sandbox text format.

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

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 26258e7c2..9610eea63 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -49,8 +49,9 @@
   
   <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
     <ul class="nav nav-tabs" id="wiki-nav-tabs">
-      <li class="active"><a data-toggle="tab" href="#edit-pane">Edit</a></li>
-      <li><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
+      <li><a data-toggle="tab" href="#edit-pane">Edit</a></li>
+      <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
+      {{if $showPageControls}}
       <li class="dropdown">
         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -58,15 +59,16 @@
           <li><a data-toggle="tab" href="#delete">Delete</a></li>
         </ul>
       </li>
+      {{/if}}
     </ul>
     <div class="tab-content" id="myTabContent">
 
-      <div id="edit-pane" class="tab-pane fade in active">
+      <div id="edit-pane" class="tab-pane fade">
         <div id="ace-editor"></div>
       </div>      
-      <div id="preview-pane" class="tab-pane fade">
+      <div id="preview-pane" class="tab-pane fade in active">
         <div id="wiki-preview" class="section-content-wrapper">
-
+          {{$renderedContent}}
         </div>
       </div>
 
@@ -80,7 +82,7 @@
   $(document).ready(function () {
     wiki_refresh_page_list();
     // Show Edit tab first. Otherwise the Ace editor does not load.
-    $("#wiki-nav-tabs li:eq(0) a").tab('show');
+    $("#wiki-nav-tabs li:eq(1) a").tab('show');
   });
 
   var editor = ace.edit("ace-editor");
-- 
cgit v1.2.3


From ab54bf514921ae3fe0fafcdf154364815ed6375f Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 28 May 2016 15:11:19 -0400
Subject: Wiki pages can be saved.

---
 view/tpl/wiki.tpl | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 9610eea63..e931cd6e6 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -55,8 +55,8 @@
       <li class="dropdown">
         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
         <ul class="dropdown-menu">
-          <li><a data-toggle="tab" href="#save">Save</a></li>
-          <li><a data-toggle="tab" href="#delete">Delete</a></li>
+          <li><a id="save-page" data-toggle="tab" href="#">Save</a></li>
+          <li><a id="delete-page" data-toggle="tab" href="#">Delete</a></li>
         </ul>
       </li>
       {{/if}}
@@ -79,6 +79,7 @@
 
 <script>
   window.wiki_resource_id = '{{$resource_id}}';
+  window.wiki_page_name = '{{$page}}';
   $(document).ready(function () {
     wiki_refresh_page_list();
     // Show Edit tab first. Otherwise the Ace editor does not load.
@@ -150,4 +151,22 @@ function wiki_delete_wiki(wikiName, resource_id) {
     }, 'json');
     return false;
   }
+  
+    $('#save-page').click(function (ev) {
+    if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+      window.console.log('You must have a wiki page open in order to edit pages.');
+      ev.preventDefault();
+      return false;
+    }
+    $.post("wiki/{{$channel}}/save/page", {content: editor.getValue(), name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+      function (data) {
+        if (data.success) {
+          window.console.log('Page saved successfully.');
+        } else {
+          alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
+          window.console.log('Error saving page.');
+        }
+      }, 'json');
+    ev.preventDefault();
+  });
 </script>
-- 
cgit v1.2.3


From df7772e301be10fd31329f646db98361baa04857 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 29 May 2016 13:33:52 -0400
Subject: Home page create with new wiki. URL redirects here when no page
 given. Fixed bug with author in wiki item table record.

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

(limited to 'view/tpl')

diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index f3cea489d..d1652dcf4 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -7,7 +7,7 @@
                 <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.title}}" title="View  {{$wiki.title}}">View</a></li>
+              <li><a href="/wiki/{{$channel}}/{{$wiki.title}}/Home.md" title="View  {{$wiki.title}}">View</a></li>
               <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>                                
             </ul>  
-- 
cgit v1.2.3


From 3e6af5c87692b5dbefd59d7b2350670d4e1cb3a4 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 29 May 2016 17:06:45 -0400
Subject: Hacked Parsedown and Markdown to add class inline-code to <code>
 blocks for proper inline code rendering. Stopped using Parsedown even though
 Markdown is slower, hence extra delay when previewing pages.

---
 view/tpl/wiki.tpl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index e931cd6e6..a6f274bfb 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -4,6 +4,12 @@
     width: 100%;
     height: 500px;
   }
+  .fade.in {
+    -webkit-transition: opacity 2s 1s ease;
+    -moz-transition: opacity 2s 1s ease;
+    -o-transition: opacity 2s 1s ease;
+    transition: opacity 2s 1s ease;
+  }
 </style>
 <div class="generic-content-wrapper">
   <div class="section-title-wrapper">
-- 
cgit v1.2.3


From 00d32f6b947d10b836cf1a4d59dbff3413517fd5 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 29 May 2016 20:39:19 -0400
Subject: Only show wiki delete control if channel owner

---
 view/tpl/wikilist.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index d1652dcf4..91ac1a7b3 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -8,8 +8,10 @@
             </a>  
             <ul class="dropdown-menu  pull-right">  
               <li><a href="/wiki/{{$channel}}/{{$wiki.title}}/Home.md" title="View  {{$wiki.title}}">View</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>                                
+              {{/if}}
             </ul>  
         </li>  
 		{{/foreach}}
-- 
cgit v1.2.3


From 4b350b909025ba2102d5ad2c5ee32b3c4eecaa48 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 29 May 2016 21:23:56 -0400
Subject: Fixed bug in access control. Hide new wiki/page buttons if not
 channel owner.

---
 view/tpl/wiki.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index a6f274bfb..e6e8c720b 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -14,8 +14,10 @@
 <div class="generic-content-wrapper">
   <div class="section-title-wrapper">
     <div class="pull-right">
+      {{if $showPageControls}}
       <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button>
       <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button>
+      {{/if}}
       <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();
           adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
       <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);
-- 
cgit v1.2.3


From a52cdcb2410fc67823a3dab62b413d70ec57cdec Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Mon, 30 May 2016 14:59:33 -0400
Subject: Replaced wiki item record object field with ActivityStreams
 information. Wiki git repo path is stored in iconfig instead.

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

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index e6e8c720b..91c6e64b2 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -14,7 +14,7 @@
 <div class="generic-content-wrapper">
   <div class="section-title-wrapper">
     <div class="pull-right">
-      {{if $showPageControls}}
+      {{if $showNewWikiButton}}
       <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button>
       <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button>
       {{/if}}
-- 
cgit v1.2.3


From 8d284bab474c7e669ae9a639bdb22f7b28b95cc3 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Mon, 30 May 2016 20:59:54 -0400
Subject: Created page history widget to dynamically fetch and display the git
 commit history for wiki pages.

---
 view/tpl/wiki.tpl              | 29 ++++++++++++++++++++++++++++-
 view/tpl/wiki_page_history.tpl | 11 +++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 view/tpl/wiki_page_history.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 91c6e64b2..d2ce03f5a 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -59,6 +59,7 @@
     <ul class="nav nav-tabs" id="wiki-nav-tabs">
       <li><a data-toggle="tab" href="#edit-pane">Edit</a></li>
       <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
+      <li><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
       {{if $showPageControls}}
       <li class="dropdown">
         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
@@ -69,7 +70,7 @@
       </li>
       {{/if}}
     </ul>
-    <div class="tab-content" id="myTabContent">
+    <div class="tab-content" id="wiki-page-tabs">
 
       <div id="edit-pane" class="tab-pane fade">
         <div id="ace-editor"></div>
@@ -79,6 +80,21 @@
           {{$renderedContent}}
         </div>
       </div>
+      <div id="page-history-pane" class="tab-pane fade">
+        <div id="page-history-list" class="section-content-wrapper">
+          <table class="table-striped table-responsive table-hover" style="width: 100%;">
+          {{foreach $pageHistory as $commit}}
+            <tr><td>
+            <table>
+              <tr><td>Date</td><td>{{$commit.date}}</td></tr>
+              <tr><td>Name</td><td>{{$commit.name}}</td></tr>
+              <tr><td>Message</td><td>{{$commit.title}}</td></tr>
+            </table>
+            </td></tr>
+          {{/foreach}}          
+          </table>
+        </div>
+      </div>     
 
 
     </div>
@@ -110,6 +126,17 @@
     ev.preventDefault();
   });
 
+  $('#wiki-get-history').click(function (ev) {
+    $.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+      if (data.success) {
+        $('#page-history-list').html(data.historyHTML);
+      } else {
+        window.console.log('Error getting page history.');
+      }
+    }, 'json');
+    ev.preventDefault();
+  });
+  
 function wiki_delete_wiki(wikiName, resource_id) {
   if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiName))) {
     return;
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
new file mode 100644
index 000000000..7efc4aa96
--- /dev/null
+++ b/view/tpl/wiki_page_history.tpl
@@ -0,0 +1,11 @@
+<table class="table-striped table-responsive table-hover" style="width: 100%;">
+  {{foreach $pageHistory as $commit}}
+  <tr><td>
+      <table>
+        <tr><td>Date</td><td>{{$commit.date}}</td></tr>
+        <tr><td>Name</td><td>{{$commit.name}}</td></tr>
+        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
+      </table>
+    </td></tr>
+  {{/foreach}}          
+</table>
\ No newline at end of file
-- 
cgit v1.2.3


From b70c6809648bb3c78e5e26f9293727b3a7aa4025 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Thu, 2 Jun 2016 22:27:26 -0400
Subject: Major corrections to access control and page construction.

---
 view/tpl/wiki.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index d2ce03f5a..86c503bb3 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -16,6 +16,8 @@
     <div class="pull-right">
       {{if $showNewWikiButton}}
       <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button>
+      {{/if}}
+      {{if $showNewPageButton}}
       <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button>
       {{/if}}
       <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();
-- 
cgit v1.2.3


From 344c293424716cc53eed2fea9eb3a7512e725516 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 4 Jun 2016 15:12:04 -0400
Subject: Wiki and page filenames are abstracted from their displayed names.
 Special characters do not seem to break things.

---
 view/tpl/wiki.tpl           | 4 ++--
 view/tpl/wiki_page_list.tpl | 2 +-
 view/tpl/wikilist.tpl       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 86c503bb3..384dc796d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -139,8 +139,8 @@
     ev.preventDefault();
   });
   
-function wiki_delete_wiki(wikiName, resource_id) {
-  if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiName))) {
+function wiki_delete_wiki(wikiHtmlName, resource_id) {
+  if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
     return;
   }
   $.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index c941e4a08..1c3254465 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -3,7 +3,7 @@
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $pages as $page}}
-		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page}}">{{$page}}</a></li>
+		<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 91ac1a7b3..be353ca5e 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -7,7 +7,7 @@
                 <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.title}}/Home.md" title="View  {{$wiki.title}}">View</a></li>
+              <li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View  {{$wiki.title}}">View</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>                                
-- 
cgit v1.2.3


From 4bc4fd5b7ebd7c5f25cfc9acfbda5b14a38dedb8 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 4 Jun 2016 18:00:32 -0400
Subject: Page deletion implemented. Hide the delete button and disallow for
 Home page.

---
 view/tpl/wiki.tpl | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 384dc796d..6cdfabdb9 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -5,10 +5,10 @@
     height: 500px;
   }
   .fade.in {
-    -webkit-transition: opacity 2s 1s ease;
-    -moz-transition: opacity 2s 1s ease;
-    -o-transition: opacity 2s 1s ease;
-    transition: opacity 2s 1s ease;
+    -webkit-transition: opacity 0.5s 0.5s ease;
+    -moz-transition: opacity 0.5s 0.5s ease;
+    -o-transition: opacity 0.5s 0.5s ease;
+    transition: opacity 0.5s 0.5s ease;
   }
 </style>
 <div class="generic-content-wrapper">
@@ -106,6 +106,9 @@
 <script>
   window.wiki_resource_id = '{{$resource_id}}';
   window.wiki_page_name = '{{$page}}';
+  if (window.wiki_page_name === 'Home') {
+    $('#delete-page').hide();
+  }
   $(document).ready(function () {
     wiki_refresh_page_list();
     // Show Edit tab first. Otherwise the Ace editor does not load.
@@ -206,4 +209,27 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       }, 'json');
     ev.preventDefault();
   });
+  
+    $('#delete-page').click(function (ev) {
+    if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_name === 'Home') {
+      window.console.log('You must have a wiki page open in order to delete pages.');
+      ev.preventDefault();
+      return false;
+    }
+    $.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+      function (data) {
+        if (data.success) {
+          window.console.log('Page deleted successfully.');
+          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 {
+          alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups 
+          window.console.log('Error deleting page.');
+        }
+      }, 'json');
+    ev.preventDefault();
+  });
 </script>
-- 
cgit v1.2.3


From 0a3fbdd128dd3b80868c93cb93901b501edf576c Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 5 Jun 2016 16:32:03 -0400
Subject: Basic page reversion implemented. The revert button on the history
 view replaces the editor text but does not save the page.

---
 view/tpl/wiki.tpl              | 17 +++++++++++++++++
 view/tpl/wiki_page_history.tpl |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 6cdfabdb9..d9a490bf8 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -232,4 +232,21 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       }, 'json');
     ev.preventDefault();
   });
+  
+  function wiki_revert_page(commitHash) {
+    if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+      window.console.log('You must have a wiki page open in order to revert pages.');
+      return false;
+    }
+    $.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+      function (data) {
+        if (data.success) {
+          window.console.log('Reverted content: ' + data.content);
+          // put contents in editor
+          editor.getSession().setValue(data.content);
+        } else {
+          window.console.log('Error reverting page.');
+        }
+      }, 'json');
+  }
 </script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
index 7efc4aa96..b124d4cb5 100644
--- a/view/tpl/wiki_page_history.tpl
+++ b/view/tpl/wiki_page_history.tpl
@@ -1,8 +1,9 @@
 <table class="table-striped table-responsive table-hover" style="width: 100%;">
   {{foreach $pageHistory as $commit}}
   <tr><td>
-      <table>
-        <tr><td>Date</td><td>{{$commit.date}}</td></tr>
+      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()">
+        <tr><td>Date</td><td>{{$commit.date}}</td><td rowspan="3"">
+            <button id="revert-{{$commit.hash}}" class="btn btn-warning btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr>
         <tr><td>Name</td><td>{{$commit.name}}</td></tr>
         <tr><td>Message</td><td>{{$commit.title}}</td></tr>
       </table>
-- 
cgit v1.2.3


From b8b50bdb5abb5403f3f8a8662b7db0703b39073b Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 5 Jun 2016 20:30:45 -0400
Subject: Custom commit message available. Improved history viewer and feedback
 from revert buttons.

---
 view/tpl/wiki.tpl              | 20 ++++++++++++++++++--
 view/tpl/wiki_page_history.tpl |  8 ++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index d9a490bf8..05ddad05b 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -101,6 +101,11 @@
 
     </div>
   </div>
+  {{if $showCommitMsg}}
+  <div class="section-content-wrapper">
+    {{include file="field_input.tpl" field=$commitMsg}}    
+  </div>
+  {{/if}}
 </div>
 
 <script>
@@ -198,10 +203,16 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       ev.preventDefault();
       return false;
     }
-    $.post("wiki/{{$channel}}/save/page", {content: editor.getValue(), name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+    $.post("wiki/{{$channel}}/save/page", 
+      { content: editor.getValue(), 
+        commitMsg: $('#id_commitMsg').val(),
+        name: window.wiki_page_name, 
+        resource_id: window.wiki_resource_id
+      }, 
       function (data) {
         if (data.success) {
           window.console.log('Page saved successfully.');
+          $('#id_commitMsg').val(''); // Clear the commit message box
         } else {
           alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
           window.console.log('Error saving page.');
@@ -241,7 +252,12 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
     $.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
       function (data) {
         if (data.success) {
-          window.console.log('Reverted content: ' + data.content);
+          $('button[id^=revert-]').removeClass('btn-success');
+          $('button[id^=revert-]').addClass('btn-danger');
+          $('button[id^=revert-]').html('Revert');
+          $('#revert-'+commitHash).removeClass('btn-danger');
+          $('#revert-'+commitHash).addClass('btn-success');
+          $('#revert-'+commitHash).html('Page reverted<br>but not saved');
           // put contents in editor
           editor.getSession().setValue(data.content);
         } else {
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
index b124d4cb5..6ce3ce204 100644
--- a/view/tpl/wiki_page_history.tpl
+++ b/view/tpl/wiki_page_history.tpl
@@ -1,10 +1,10 @@
 <table class="table-striped table-responsive table-hover" style="width: 100%;">
   {{foreach $pageHistory as $commit}}
   <tr><td>
-      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()">
-        <tr><td>Date</td><td>{{$commit.date}}</td><td rowspan="3"">
-            <button id="revert-{{$commit.hash}}" class="btn btn-warning btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr>
-        <tr><td>Name</td><td>{{$commit.name}}</td></tr>
+      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td><td rowspan="3" width="20%" align="right">
+            <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr>
+        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
         <tr><td>Message</td><td>{{$commit.title}}</td></tr>
       </table>
     </td></tr>
-- 
cgit v1.2.3


From 2af8105b460d300ba41928734c960f5f70613952 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 5 Jun 2016 21:14:30 -0400
Subject: Hide page history viewer when viewing sandbox

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

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 05ddad05b..05604778d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -61,7 +61,7 @@
     <ul class="nav nav-tabs" id="wiki-nav-tabs">
       <li><a data-toggle="tab" href="#edit-pane">Edit</a></li>
       <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
-      <li><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
+      <li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
       {{if $showPageControls}}
       <li class="dropdown">
         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
@@ -82,7 +82,7 @@
           {{$renderedContent}}
         </div>
       </div>
-      <div id="page-history-pane" class="tab-pane fade">
+      <div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
         <div id="page-history-list" class="section-content-wrapper">
           <table class="table-striped table-responsive table-hover" style="width: 100%;">
           {{foreach $pageHistory as $commit}}
-- 
cgit v1.2.3


From e86e666c22dd37d715c51c53e4267bd25230f48e Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Tue, 7 Jun 2016 20:58:14 -0400
Subject: Javascript only allows saving a page if the content has changed.

---
 view/tpl/wiki.tpl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 05604778d..1312f8518 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -111,6 +111,8 @@
 <script>
   window.wiki_resource_id = '{{$resource_id}}';
   window.wiki_page_name = '{{$page}}';
+  window.wiki_page_content = {{$content}};
+  
   if (window.wiki_page_name === 'Home') {
     $('#delete-page').hide();
   }
@@ -123,7 +125,7 @@
   var editor = ace.edit("ace-editor");
   editor.setTheme("ace/theme/github");
   editor.getSession().setMode("ace/mode/markdown");
-  editor.getSession().setValue({{$content}});
+  editor.getSession().setValue(window.wiki_page_content);
 
   $('#wiki-get-preview').click(function (ev) {
     $.post("wiki/{{$channel}}/preview", {content: editor.getValue()}, function (data) {
@@ -203,8 +205,14 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       ev.preventDefault();
       return false;
     }
+    var currentContent = editor.getValue();
+    if (window.wiki_page_content === currentContent) {
+      window.console.log('No edits to save.');
+      ev.preventDefault();
+      return false;
+    }
     $.post("wiki/{{$channel}}/save/page", 
-      { content: editor.getValue(), 
+      { content: currentContent, 
         commitMsg: $('#id_commitMsg').val(),
         name: window.wiki_page_name, 
         resource_id: window.wiki_resource_id
@@ -212,6 +220,7 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       function (data) {
         if (data.success) {
           window.console.log('Page saved successfully.');
+          window.wiki_page_content = currentContent;
           $('#id_commitMsg').val(''); // Clear the commit message box
         } else {
           alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
-- 
cgit v1.2.3