From d7ec6865b4ed07f1c5d37158f5e20d97a27617a7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 14 Sep 2017 04:06:09 -0700
Subject: bring back wiki download

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

(limited to 'view')

diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 2deec76c0..1a750aec4 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -30,7 +30,7 @@
 				<th width="96%">{{$name}}</th>
 				<th width="1%">{{$type}}</th>
 				<th width="1%" class="wikis-index-tool"></th>
-				<!-- th width="1%" class="wikis-index-tool"></th -->
+				<th width="1%" class="wikis-index-tool"></th>
 				{{if $owner}}
 				<th width="1%"></th>
 				{{/if}}
@@ -45,7 +45,7 @@
 					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
 					{{/if}}
 				</td>
-				<!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td -->
+				<td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
 				{{if $owner}}
 				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
 				{{/if}}
-- 
cgit v1.2.3


From cf120b235117017a81b8a9b1a073919fb1b7d50b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 14 Sep 2017 17:14:50 -0700
Subject: wiki: lock mimetype

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

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 7995b7bb1..70a13806d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -1,6 +1,7 @@
 <div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
 	<div class="section-title-wrapper">
 		<div class="pull-right">
+			<span class="wiki-typename">[{{$typename}}]&nbsp;</span>
 			{{if $showPageControls}}
 			<div id="page-tools" class="btn-group" style="display: none;">
 				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 2e7fb8b9e..3d38a0b81 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -21,7 +21,11 @@
 	<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>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 1a750aec4..fe8d7d081 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -10,6 +10,7 @@
 		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 			{{include file="field_input.tpl" field=$wikiName}}
 			{{include file="field_select.tpl" field=$mimeType}}
+			{{include file="field_checkbox.tpl" field=$typelock}}
 			{{include file="field_checkbox.tpl" field=$notify}}
 			<div>
 				<div class="btn-group pull-right">
@@ -31,6 +32,7 @@
 				<th width="1%">{{$type}}</th>
 				<th width="1%" class="wikis-index-tool"></th>
 				<th width="1%" class="wikis-index-tool"></th>
+				<th width="1%" class="wikis-index-tool"></th>
 				{{if $owner}}
 				<th width="1%"></th>
 				{{/if}}
@@ -38,16 +40,17 @@
 			{{foreach $wikis as $wiki}}
 			<tr class="wikis-index-row">
 				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
-				<td>{{$wiki.mimeType}}</td>
+				<td>{{if $wiki.typelock}}{{$wiki.mimeType}}{{else}}{{$unlocked}}{{/if}}</td>
 				<td class="wiki-index-tool dropdown">
 					{{if $wiki.lock}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
+					<button class="btn btn-default btn-sm" onclick="lockview('item',{{$wiki.id}});"><i class="fa fa-lock lockview" data-toggle="dropdown" ></i></button>
 					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
 					{{/if}}
 				</td>
-				<td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
+				<td class="wiki-index-tool"><button class="btn btn-default btn-sm" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"><i class="fa fa-download fakelink" ></i></button></td>
 				{{if $owner}}
-				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
+				<td>&nbsp;</td>
+				<td><button class="btn btn-default btn-sm" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"><i class="fa fa-trash-o drop-icons" ></i></button></td>
 				{{/if}}
 			</tr>
 			{{/foreach}}
-- 
cgit v1.2.3