Moved new wiki and new page buttons to widgets

view/tpl/wiki.tpl

@@ -15,24 +15,12 @@
   <div class="section-title-wrapper">
 			
     <div class="pull-right">
-				{{if $showNewWikiButton || $showPageControls}}
+				{{if $showPageControls}}
 			<div class="btn-group">
 				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
 					<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
 				</button>
 				<ul class="dropdown-menu">						
-				{{if $showNewWikiButton}}
-				<li class="nav-item">
-						<a class="nav-link" href="#" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper'); return false;" data-form_id="new-wiki-form"><i class="fa fa-book"></i>&nbsp;New Wiki</a>
-					</li>
-					{{/if}}
-					{{if $showNewPageButton}}
-					<li class="nav-item">
-						<a class="nav-link" href="#" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper'); return false;" data-form_id="new-page-form"><i class="fa fa-file-text-o"></i>&nbsp;New Page</a>
-					</li>
-					{{/if}}
-						{{if $showPageControls}}
-					<li class="divider"></li>
 					
 					<li class="nav-item">
 						<a id="rename-page" class="nav-link" href="#"><i class="fa fa-edit"></i>&nbsp;Rename Page</a>
@@ -43,7 +31,7 @@
 					<li class="nav-item">
 						<a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i>&nbsp;Embed Image</a>
 					</li>
-					{{/if}}
+
 				</ul>
 			</div>	
 				
@@ -87,6 +75,17 @@
      <hr>
     </div>
   
+	<div id="edit-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+      <form id="edit-wiki-form" action="wiki/create/page" method="post" >
+        <div class="clear"></div>
+        
+        <div class="btn-group pull-right">
+            <button id="edit-wiki-submit" class="btn btn-success" type="submit" name="submit" >Edit 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>
@@ -178,6 +177,7 @@
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+
 <script>
 		window.wiki_resource_id = '{{$resource_id}}';
 		window.wiki_page_name = '{{$page}}';
@@ -512,4 +512,41 @@ function wiki_download_wiki(resource_id) {
 			'json');
 		};
 
+		function wiki_hide_forms() {
+			$('#new-page-form-wrapper').hide(); 
+			$('#edit-wiki-form-wrapper').hide();
+			$('#new-wiki-form-wrapper').hide();
+		}
+
+		function wiki_show_new_wiki_form() {
+			wiki_hide_forms();
+			openClose('new-wiki-form-wrapper'); 
+			return false;
+		}
+
+		function wiki_show_new_page_form() {
+			wiki_hide_forms();
+			openClose('new-page-form-wrapper'); 
+			return false;
+		}
+
+		function wiki_show_edit_wiki_form() {
+			wiki_hide_forms();
+			openClose('edit-wiki-form-wrapper'); 
+			return false;
+		}
+		
+		
+		$(document).ready(function () {
+				{{if $showNewWikiButton}}
+						$('#new-wiki-button').show();
+				{{else}}
+						$('#new-wiki-button').hide();
+				{{/if}}
+				{{if $showNewPageButton}}
+						$('#new-page-button').show();
+				{{else}}
+						$('#new-page-button').hide();
+				{{/if}}
+		});
 </script>

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>

view/tpl/wikilist.tpl

@@ -1,5 +1,9 @@
 <div id="wiki_list" class="widget">
-	<h3>{{$header}}</h3>
+		
+		<h3>{{$header}}
+				<i id="new-wiki-button" class="pull-right generic-icons fakelink fa fa-plus" title="New wiki" onclick="wiki_show_new_wiki_form();"></i>
+		</h3>
+				
 	<div>
 		{{foreach $wikis as $wiki}}
         <div class="form-group" id="wiki-{{$wiki.resource_id}}">