From 00ae6bdac6062594d16870dbd9ca0593f534198e Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 7 Feb 2016 21:06:17 -0800
Subject: a few tweaks to uno settings page to allow a default ACL to be
 created

---
 view/tpl/settings.tpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index af5f222fe..820ffd711 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -42,8 +42,12 @@
 				</div>
 				<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings">
 					<div class="section-content-tools-wrapper">
+						{{if $server_role != 'basic'}}
 						{{include file="field_select_grouped.tpl" field=$role}}
-						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
+						{{/if}}
+						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
+
+							{{if $server_role != 'basic'}}
 							<div class="form-group">
 								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
 							</div>
@@ -65,6 +69,7 @@
 									</div><!-- /.modal-content -->
 								</div><!-- /.modal-dialog -->
 							</div><!-- /.modal -->
+							{{/if}}
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i>&nbsp;{{$permissions}}</button>
 								{{$aclselect}}
-- 
cgit v1.2.3


From fe392a3144f2c2e81e0451b1e6629136a60a7acd Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Thu, 18 Feb 2016 16:53:04 +0100
Subject: Removed export temporary from UNO. Removed 'Remove Channel' from UNO,
 cause a UNO member has only 1 channel, so it's logical to remove the acccount
 (by experience on UNO hub). Styling oauth settings.

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

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

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 820ffd711..6f50f820a 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>{{/if}}
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
-- 
cgit v1.2.3