Merge branch '3.4RC'3.4

28 files changed, 313 insertions, 128 deletions

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 10b367810..7e99b2c86 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -74,7 +74,7 @@
 	{{include file="field_select.tpl" field=$access_policy}}
 	{{include file="field_input.tpl" field=$location}}
 	{{include file="field_input.tpl" field=$sellpage}}
-	{{include file="field_input.tpl" field=$firstpage}}
+	{{include file="field_input.tpl" field=$first_page}}
 
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
@@ -101,6 +101,7 @@
 	{{include file="field_input.tpl" field=$maxloadavg}}
 	{{include file="field_input.tpl" field=$abandon_days}}
 	{{include file="field_input.tpl" field=$default_expire_days}}
+	{{include file="field_input.tpl" field=$active_expire_days}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index baffe9b06..d702a2437 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -1,43 +1,35 @@
-<h2>{{$title}}</h2>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper">
 
-<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
+		<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+		<div id="import-desc" class="section-content-info-wrapper">{{$desc}}</div>
 
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
+		<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
+		<input type="file" name="filename" id="import-filename" class="import-input" value="" />
+		<div id="import-filename-end" class="import-field-end"></div>
 
-	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
+		<div id="import-choice" class="section-content-info-wrapper">{{$choice}}</div>
 
-	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
-	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
-	<div id="import-old-address-end" class="import-field-end"></div>
+		{{include file="field_input.tpl" field=$old_address}}
+		{{include file="field_input.tpl" field=$email}}
+		{{include file="field_password.tpl" field=$password}}
+		{{include file="field_checkbox.tpl" field=$import_posts}}
 
-	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
-	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
-	<div id="import-old-email-end" class="import-field-end"></div>
+		<div id="import-common-desc" class="section-content-info-wrapper">{{$common}}</div>
 
-	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
-	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
-	<div id="import-old-pass-end" class="import-field-end"></div>
+		{{include file="field_checkbox.tpl" field=$make_primary}}
+		{{include file="field_checkbox.tpl" field=$moving}}
 
-	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
-	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
-	<div id="import-posts-end" class="import-field-end"></div>
+		<div id="import-common-desc" class="section-content-info-wrapper">{{$pleasewait}}</div>
 
-	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
+		<input type="submit" class="btn btn-primary" name="submit" id="import-submit-button" value="{{$submit}}" />
+		<div id="import-submit-end" class="import-field-end"></div>
 
-	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
-	<div id="import-make-primary-end" class="import-field-end"></div>
-
-	<input type="checkbox" name="moving" id="import-moving" value="1" />
-	<label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label>
-	<div id="import-moving-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
-</form>
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index ad3caff88..1f0addc95 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,5 +1,5 @@
 <div id="cloud-drag-area" class="section-content-wrapper-np">
-	{{if $tiles}}
+{{if $tiles}}
 	<table id="cloud-index">
 		<tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}}
 	</table>
@@ -36,7 +36,7 @@
 	</div>
 	{{/foreach}}
 	<div class="clear"></div>
-	{{else}}
+{{else}}
 	<table id="cloud-index">
 		<tr>
 			<th width="1%"></th>
@@ -80,5 +80,5 @@
 
 	{{/foreach}}
 	</table>
-	{{/if}}
+{{/if}}
 </div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 307dc8956..642fb1866 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -6,7 +6,7 @@
 		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
 		{{/if}}
 		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
-		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
+		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-plus-circle"></i>&nbsp;{{$upload}}</button>
 		{{/if}}
 	</div>
 
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 3b51971ec..23594677c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,3 +1,6 @@
+		<script>
+			var auto_save_draft = {{$auto_save_draft}};
+		</script>
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 32973353e..0bf88b818 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -9,7 +9,7 @@
 			</button>
 			<div class="dropdown-menu dropdown-menu-right">
 				{{foreach $tabs as $menu}}
-				<a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a>
+				<a class="dropdown-item {{$menu.sel}}" href="{{$menu.url}}">{{$menu.label}}</a>
 				{{/foreach}}
 			</div>
 		</div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index e9f507f1e..a408a83d2 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -27,9 +27,18 @@
 				{{/if}}
 				{{/if}}
 				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+					<div class="wall-item-info " id="wall-item-info-{{$item.id}}" >
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  data-toggle="dropdown" />
+							{{if $item.thread_author_menu}}
+							<i class="fa fa-caret-down wall-item-photo-caret"></i>
+							<div class="dropdown-menu">
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+
+							</div>
+							{{/if}}
 						</div>
 					</div>
 					{{if $item.lock}}
@@ -40,7 +49,7 @@
 					{{/if}}
 					<div class="wall-item-author">
 						{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>&nbsp;{{/if}}
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link u-url"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 					</div>
 					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
 						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
@@ -58,32 +67,9 @@
 				{{/if}}
 				{{if $item.has_tags}}
 				<div class="p-2 wall-item-tools clearfix">
-
 					<div class="body-tags">
 						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
 					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
 				</div>
 				{{/if}}
 				<div class="p-2 clearfix wall-item-tools">
@@ -179,7 +165,7 @@
 									<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
 									{{/if}}
 									{{if $item.star}}
-									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw{{if $item.star.isstarred}} starred fa-star{{else}} unstarred fa-star-o{{/if}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
 									{{/if}}
 									{{if $item.thread_action_menu}}
 									{{foreach $item.thread_action_menu as $mitem}}
@@ -189,13 +175,8 @@
 									{{if $item.drop.dropping}}
 									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 									{{/if}}
-									{{if $item.thread_author_menu}}
-									<div class="dropdown-divider"></div>
-									{{foreach $item.thread_author_menu as $mitem}}
-									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-									{{/foreach}}
-									{{/if}}
 									{{if $item.edpost && $item.dreport}}
+									<div class="dropdown-divider"></div>
 									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
 									{{/if}}
 								</div>
@@ -204,7 +185,12 @@
 					</div>
 
 					{{if $item.responses || $item.attachments}}
-					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
+					<div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}">
+						{{if $item.star && $item.star.isstarred}}
+						<div class="btn-group" id="star-button-{{$item.id}}">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button>
+						</div>
+						{{/if}}
 						{{if $item.attachments}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 97fd50d01..f94a2f24f 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -29,7 +29,16 @@
 				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
 					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a>
+							{{if $item.thread_author_menu}}
+							<i class="fa fa-caret-down wall-item-photo-caret"></i>
+							<div class="dropdown-menu">
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+
+							</div>
+							{{/if}}
 						</div>
 					</div>
 					{{if $item.lock}}
@@ -39,7 +48,7 @@
 					</div>
 					{{/if}}
 					<div class="wall-item-author">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link u-url"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 					</div>
 					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
 						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
@@ -59,28 +68,6 @@
 					<div class="body-tags">
 						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
 					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
 				</div>
 				{{/if}}
 				<div class="p-2 clearfix wall-item-tools">
@@ -171,7 +158,7 @@
 									<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
 									{{/if}}
 									{{if $item.star}}
-									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw{{if $item.star.isstarred}} starred fa-star{{else}} unstarred fa-star-o{{/if}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
 									{{/if}}
 									{{if $item.thread_action_menu}}
 									{{foreach $item.thread_action_menu as $mitem}}
@@ -181,12 +168,7 @@
 									{{if $item.drop.dropping}}
 									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 									{{/if}}
-									{{if $item.thread_author_menu}}
 									<div class="dropdown-divider"></div>
-									{{foreach $item.thread_author_menu as $mitem}}
-									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-									{{/foreach}}
-									{{/if}}
 									{{if $item.edpost && $item.dreport}}
 									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
 									{{/if}}
@@ -195,7 +177,12 @@
 						</div>
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+					<div class="wall-item-tools-left btn-group"  id="wall-item-tools-left-{{$item.id}}">
+						{{if $item.star && $item.star.isstarred}}
+						<div class="btn-group" id="star-button-{{$item.id}}">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button>
+						</div>
+						{{/if}}
 						{{if $item.attachments}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 829a3a556..5a5bf2286 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -86,10 +86,14 @@
     <h2>{{$title}}</h2>
     </div>
     <div class="section-content-wrapper">
-
+		{{if $info}}
+		<div class="section-content-warning-wrapper">{{$info}}</div>
+		{{/if}}
+		{{if $existing}}
+		<img class="cover-photo-review" style="max-width: 100%;" src="{{$existing.url}}" alt="{{t('Cover Photo')}}" />
+		{{/if}}
 		<form enctype="multipart/form-data" action="cover_photo" method="post">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
 		<div id="profile-photo-upload-wrapper">
 
 			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl
index 57028237a..875c97feb 100644
--- a/view/tpl/generic_addon_settings.tpl
+++ b/view/tpl/generic_addon_settings.tpl
@@ -2,7 +2,11 @@
 	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
 		<h3>
 			<a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content">
+				{{if $addon.1|substr:0:1 === '<'}}
 				{{$addon.1}}
+				{{else}}
+				<i class="fa fa-gear"></i> {{$addon.1}}
+				{{/if}}
 			</a>
 		</h3>
 	</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index c1dab52d5..df67e9b2d 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -560,3 +560,96 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 	}
 });
 </script>
+
+
+<script>
+	var postSaveTimer = null;
+
+	function postSaveChanges(action, type) {
+		if({{$auto_save_draft}}) {
+
+			var doctype = $('#jot-webpage').val();
+			var postid = '-' + doctype + '-' + $('#jot-postid').val();
+
+			if(action != 'clean') {
+				localStorage.setItem("post_title" + postid, $("#jot-title").val());
+				localStorage.setItem("post_body" + postid, $("#profile-jot-text").val());
+				if($("#jot-category").length)
+					localStorage.setItem("post_category + postid", $("#jot-category").val());
+			}
+
+			if(action == 'start') {
+				postSaveTimer = setTimeout(function () {
+					postSaveChanges('start');
+				},10000);
+			}
+
+			if(action == 'stop') {
+				clearTimeout(postSaveTimer);
+				postSaveTimer = null;
+			}
+
+			if(action == 'clean') {
+				clearTimeout(postSaveTimer);
+				postSaveTimer = null;
+				localStorage.removeItem("post_title" + postid);
+				localStorage.removeItem("post_body" + postid);
+				localStorage.removeItem("post_category" + postid);
+			}
+		} 
+
+	}
+
+	$(document).ready(function() {
+
+		var cleaned = false;
+
+		if({{$auto_save_draft}}) {
+			var doctype = $('#jot-webpage').val();
+			var postid = '-' + doctype + '-' + $('#jot-postid').val();
+			var postTitle = localStorage.getItem("post_title" + postid);
+			var postBody = localStorage.getItem("post_body" + postid);
+			var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category" + postid) : '');
+			var openEditor = false;
+
+			if(postTitle) {
+				$('#jot-title').val(postTitle);
+				openEditor = true;
+			}
+			if(postBody) {
+				$('#profile-jot-text').val(postBody);
+				openEditor = true;
+			}
+			if(postCategory) {
+				var categories = postCategory.split(',');
+				categories.forEach(function(cat) {
+					$('#jot-category').tagsinput('add', cat);
+				});
+				openEditor = true;
+			}
+			if(openEditor) {
+				initEditor();
+			}
+		} else {
+			postSaveChanges('clean');
+		}
+
+		$(document).on('submit', '#profile-jot-form', function() {
+			postSaveChanges('clean');
+			cleaned = true;
+		});
+
+		$(document).on('focusout',"#profile-jot-wrapper",function(e){
+			if(! cleaned)
+				postSaveChanges('stop');
+		});
+
+		$(document).on('focusin',"#profile-jot-wrapper",function(e){
+			postSaveTimer = setTimeout(function () {
+				postSaveChanges('start');
+			},10000);
+		});
+
+
+	});
+</script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index bc9339d4c..9aa330c40 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -21,8 +21,8 @@
 		<input type="hidden" name="media_str" id="jot-media" value="" />
 		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="webpage" value="{{$webpage}}" />
+		<input type="hidden" id="jot-postid" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" id="jot-webpage" name="webpage" value="{{$webpage}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 532e10f22..7bc8df8d5 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -164,7 +164,7 @@
 				{{$channel_app}}
 				{{/foreach}}
 				<div class="dropdown-divider"></div>
-				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+				<div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
 					{{$sysapps_toggle}}
 				</div>
 				<div id="sys_apps" style="display:none;">
@@ -190,7 +190,7 @@
 		{{foreach $channel_apps as $channel_app}}
 		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
-		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
 			{{$sysapps_toggle}}
 		</div>
 		<div id="sys-apps-collapsed" style="display:none;">
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index 800f863dd..362b261c5 100755
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
@@ -164,7 +164,7 @@
 				{{$channel_app}}
 				{{/foreach}}
 				<div class="dropdown-divider"></div>
-				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+				<div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
 					{{$sysapps_toggle}}
 				</div>
 				<div id="sys_apps" style="display:none;">
@@ -190,7 +190,7 @@
 		{{foreach $channel_apps as $channel_app}}
 		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
-		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
 			{{$sysapps_toggle}}
 		</div>
 		<div id="sys-apps-collapsed" style="display:none;">
diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
new file mode 100644
index 000000000..ce46b58c0
--- /dev/null
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -0,0 +1,21 @@
+<h1>OAuth 2.0 Test Vehicle</h1>
+
+{{foreach $endpoints as $ept}}
+<div class="oath2test-form-box">
+<form action="{{$baseurl}}/{{$ept.0}}/" method="{{$ept.4}}">
+	<h3>{{$ept.3}}</h3>
+	{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
+	<br>
+	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
+	<span style="display: {{if $ept.5}}inline{{else}}none{{/if}}; font-size: 2em;">&nbsp;<i class="fa fa-check"></i></span>
+</form>
+	</div>
+{{/foreach}}
+<div>
+	<h3>API response</h3>
+	<pre style="display: inline-block; overflow-x: auto; white-space: nowrap; width: 100%;">
+	<code>
+	{{$api_response}}
+	</code>
+	</pre>
+</div>
\ No newline at end of file
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index 2b7afa80e..72701ce52 100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -2,9 +2,15 @@
 
 <div class='oauthapp'>
 	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-</div>
-<h3>{{$authorize}}</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
-</form>
+	<h3>{{$app.name}}</h3>
+	<p class="descriptive-paragraph">{{$authorize}}</p>
+	<form method="POST">
+	<div class="settings-submit-wrapper">
+		<input type="hidden" name="client_id" value="{{$client_id}}" />
+		<input type="hidden" name="redirect_uri" value="{{$redirect_uri}}" />
+		<input type="hidden" name="state" value="{{$state}}" />
+		<button class="btn btn-lg btn-danger" name="authorize" value="deny" type="submit">{{$no}}</button>
+		<button class="btn btn-lg btn-success" name="authorize" value="allow" type="submit">{{$yes}}</button>
+	</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 678e790ac..de59809f4 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -9,7 +9,7 @@
 				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 				{{/if}}
 				{{if $can_post}}
-				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); {{if $album_edit.1}}closeMenu('photo-album-edit-wrapper');{{/if}}"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); {{if $album_edit.1}}closeMenu('photo-album-edit-wrapper');{{/if}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$upload.0}}</button>
 				{{/if}}
 			</div>
 		</div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index a9574aade..d24b362f8 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -2,7 +2,7 @@
 	<div class="section-title-wrapper">
 		<div class="pull-right">
 			{{if $can_post}}
-			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 95183fdf4..c967fa02c 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -4,7 +4,7 @@
 			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
 			</button>
-			<div class="dropdown-menu">
+			<div class="dropdown-menu dropdown-menu-right">
 				<a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i>&nbsp;{{$profpic}}</a>
 				{{if $is_default}}
 				<a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
@@ -15,7 +15,7 @@
 				<a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
-				{{if $profile_clone_link}}
+				{{if $multi_profiles}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
 				{{/if}}
@@ -56,7 +56,11 @@
 					</div>
 					<div id="personal-collapse" class="panel-collapse collapse show" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="personal">
 						<div class="section-content-tools-wrapper">
+							{{if $multi_profiles}}
 							{{include file="field_input.tpl" field=$profile_name}}
+							{{else}}
+							<input type="hidden" name="{{$profile_name.0}}" value="{{$profile_name.2}}">
+							{{/if}}
 
 							{{include file="field_input.tpl" field=$name}}
 
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index e48d05330..819502df5 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -94,7 +94,9 @@
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 		<div id="profile-photo-upload-wrapper">
-
+			{{if $info}}
+			<div class="section-content-warning-wrapper">{{$info}}</div>
+			{{/if}}
 			{{if $importfile}}
 			<input type="hidden" name="importfile" value="{{$importfile}}">
 			{{else}}
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 72e98ae82..e77da23f3 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,4 +1,5 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
+<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
+<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
 {{foreach $tabs as $tab}}
 <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
 {{/foreach}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 130dc6918..d258f1992 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -138,11 +138,14 @@
 								{{include file="field_intcheckbox.tpl" field=$vnotify7}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify8}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify9}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify11}}
+								{{if $vnotify11}}
+									{{include file="field_intcheckbox.tpl" field=$vnotify11}}
+								{{/if}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify12}}
 								{{if $vnotify13}}
 									{{include file="field_intcheckbox.tpl" field=$vnotify13}}
 								{{/if}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify14}}
 								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
 								{{include file="field_input.tpl" field=$evdays}}
 							</div>
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index f8c162e17..998199c8e 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -1,9 +1,31 @@
+<script>
+	$(document).ready(function() {
+		$('#id_techlevel').change(function() { 	
+			var techlvl = $('#id_techlevel').val();
+			window.location.href='{{$baseurl}}/settings/features?f=&techlevel=' + techlvl;
+		});
+	});
+</script>
+ 
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<h2>{{$title}}</h2>
 	</div>
 	<form action="settings/features" method="post" autocomplete="off">
 	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	{{if ! $techlock}}
+		<div class="section-content-tools-wrapper">
+		{{include file="field_select.tpl" field=$techlevel}}
+		</div>
+	{{else}}
+		<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
+	{{/if}}
+
+	{{if $hiddens}}
+		{{foreach $hiddens as $k => $v}}
+			<input type="hidden" name="feature_{{$k}}" value="{{$v}}" />
+		{{/foreach}}
+	{{/if}}
 	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
 		{{foreach $features as $g => $f}}
 		<div class="panel">
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index 76fe7cd8d..4dbe58d82 100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,5 +1,5 @@
 <div id="settings-nick-wrapper" class="section-content-info-wrapper">
-<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
+<div id="settings-nickname-desc">{{$desc}} <strong>{{$nickname}}</strong></div>
 {{if $davpath}}
 <br>
 <div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
diff --git a/view/tpl/settings_oauth2.tpl b/view/tpl/settings_oauth2.tpl
new file mode 100755
index 000000000..882d34ea9
--- /dev/null
+++ b/view/tpl/settings_oauth2.tpl
@@ -0,0 +1,35 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+</div>
+
+<div class="section-content-tools-wrapper">
+<form action="settings/oauth2" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	<div id="profile-edit-links">
+		<ul>
+			<li>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth2/add">{{$add}}</a>
+			</li>
+		</ul>
+	</div>
+
+	{{foreach $apps as $app}}
+	<div class='oauthapp'>
+		{{if $app.client_id}}<h4>{{$app.client_id}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		<a href="{{$baseurl}}/settings/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/settings/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
+		{{/if}}		
+	</div>
+	{{/foreach}}
+
+</form>
+</div>
+</div>
diff --git a/view/tpl/settings_oauth2_edit.tpl b/view/tpl/settings_oauth2_edit.tpl
new file mode 100755
index 000000000..399c64977
--- /dev/null
+++ b/view/tpl/settings_oauth2_edit.tpl
@@ -0,0 +1,21 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+<div class="section-content-tools-wrapper">
+<form method="POST">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$grant}}
+{{include file="field_input.tpl" field=$scope}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
+</div>
+
+</form>
+</div>
+</div>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
index b94dec48a..e44b44723 100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -5,7 +5,6 @@
 <div class="section-content-tools-wrapper">
 <form method="POST">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
 {{include file="field_input.tpl" field=$name}}
 {{include file="field_input.tpl" field=$key}}
 {{include file="field_input.tpl" field=$secret}}
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 2be323deb..6ca4b0c77 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -15,6 +15,7 @@
 				</div>
 			</div>	
 			{{/if}}
+			<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button>
 			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
 			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
 		</div>