From 17dba9542ad2745025550cefc28d38aa84a69c0d Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Sun, 1 May 2016 05:59:02 +1000
Subject: update icon names in view/

---
 view/tpl/acl_selector.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 88df7481a..e57fdba12 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -16,7 +16,7 @@
 				</div>
 				{{/if}}
 				<div id="acl-wrapper">
-					<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
+					<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
 					<input type="text" id="acl-search" placeholder="&#xf002;">
 					<div id="acl-list">
 						<div id="acl-list-content"></div>
@@ -26,8 +26,8 @@
 
 				<div class="acl-list-item" rel="acl-template" style="display:none">
 					<img data-src="{0}"><p>{1}</p>
-					<button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
-					<button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
+					<button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button>
+					<button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button>
 				</div>
 			</div>
 			<div class="modal-footer clear">
-- 
cgit v1.2.3


From 33a8d845c12a9a6394a5fb8fa8edd851126e19e2 Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Wed, 4 May 2016 23:55:32 +1000
Subject: Refine permissions dialog UI

---
 view/tpl/acl_selector.tpl | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e57fdba12..49d90cd3e 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -3,9 +3,13 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title">{{$aclModalTitle}}</h4>
+				{{if $helpUrl}}
+				<a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question-circle-o"></i></a>
+				{{/if}}
+				<h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4>
 			</div>
 			<div class="modal-body">
+				<div id="acl-dialog-description">{{$aclModalDesc}}</div>
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
 					<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
@@ -16,11 +20,24 @@
 				</div>
 				{{/if}}
 				<div id="acl-wrapper">
-					<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
-					<input type="text" id="acl-search" placeholder="&#xf002;">
-					<div id="acl-list">
-						<div id="acl-list-content"></div>
+					<div id="acl-radiowrapper-showall" class="radio">
+					  <label>
+					    <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
+					    <i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span>
+					  </label>
+					</div>
+					<div id="acl-radiowrapper-showlimited" class="radio">
+						<label>
+							<input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
+							<span id=acl-showlimited-caption>{{$showlimited}}</span>
+					    </label>
+						<div id="acl-list">
+							<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+							<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
+							<div id="acl-list-content"></div>
+						</div>
 					</div>
+
 					<span id="acl-fields"></span>
 				</div>
 
-- 
cgit v1.2.3


From e1e56936c971bee54f58664df3aa58796a71ead4 Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Thu, 5 May 2016 02:09:47 +1000
Subject: add help to some permissions dialogs

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

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 49d90cd3e..a3fe73d0c 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -4,12 +4,14 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 				{{if $helpUrl}}
-				<a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question-circle-o"></i></a>
+				<a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a>
 				{{/if}}
 				<h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4>
 			</div>
 			<div class="modal-body">
-				<div id="acl-dialog-description">{{$aclModalDesc}}</div>
+				{{if $aclModalDesc}}
+					<div id="acl-dialog-description">{{$aclModalDesc}}</div>
+				{{/if}}
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
 					<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
-- 
cgit v1.2.3


From 4a36834d3f10fee5e912b6205d75c820f70d5250 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 6 May 2016 10:42:38 +0200
Subject: use darker background colour only for searchbar

---
 view/tpl/acl_selector.tpl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index a3fe73d0c..75e89a0c6 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -34,9 +34,13 @@
 							<span id=acl-showlimited-caption>{{$showlimited}}</span>
 					    </label>
 						<div id="acl-list">
-							<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
-							<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
-							<div id="acl-list-content"></div>
+							<div id="acl-search-wrapper">
+								<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+							</div>
+							<div id="acl-list-content-wrapper">
+								<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
+								<div id="acl-list-content"></div>
+							</div>
 						</div>
 					</div>
 
-- 
cgit v1.2.3


From b08fc746d81e9e486988439ae9a51918e9f9ee37 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 6 May 2016 10:55:11 +0200
Subject: use section-content-info-wrapper class for info text

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

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 75e89a0c6..0df72747a 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -8,9 +8,9 @@
 				{{/if}}
 				<h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4>
 			</div>
-			<div class="modal-body">
+			<div class="section-content-wrapper">
 				{{if $aclModalDesc}}
-					<div id="acl-dialog-description">{{$aclModalDesc}}</div>
+					<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
 				{{/if}}
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
-- 
cgit v1.2.3


From e7a65c1f8d97b92e311beb064a7094216e23b119 Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Sun, 8 May 2016 20:44:30 +1000
Subject: improve non-ACL option description in ACL dialog

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

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 0df72747a..050417257 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -25,8 +25,12 @@
 					<div id="acl-radiowrapper-showall" class="radio">
 					  <label>
 					    <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
-					    <i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span>
+					    {{if $showallIcon}}<i class="fa {{$showallIcon}}"></i>{{/if}}
+					    <span id="acl-showall-caption">{{$showall}}</span>
 					  </label>
+					  {{if $showallOrigin}}
+					    &nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
+					  {{/if}}
 					</div>
 					<div id="acl-radiowrapper-showlimited" class="radio">
 						<label>
@@ -61,6 +65,8 @@
 </div><!-- /.modal -->
 
 <script>
+	$('[data-toggle="popover"]').popover(); // Init the popover, if present
+
 	if(typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
-- 
cgit v1.2.3


From 5632022d79432eff76f7fc69d311f1b9b152d07c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 11 May 2016 22:23:13 +0200
Subject: whitespace

---
 view/tpl/acl_selector.tpl | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 050417257..90bf782f5 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -23,34 +23,34 @@
 				{{/if}}
 				<div id="acl-wrapper">
 					<div id="acl-radiowrapper-showall" class="radio">
-					  <label>
-					    <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
-					    {{if $showallIcon}}<i class="fa {{$showallIcon}}"></i>{{/if}}
-					    <span id="acl-showall-caption">{{$showall}}</span>
-					  </label>
-					  {{if $showallOrigin}}
-					    &nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
-					  {{/if}}
+						<label>
+							<input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
+							{{if $showallIcon}}
+							<i class="fa {{$showallIcon}}"></i>
+							{{/if}}
+							<span id="acl-showall-caption">{{$showall}}</span>
+						</label>
+						{{if $showallOrigin}}
+						&nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
+						{{/if}}
 					</div>
 					<div id="acl-radiowrapper-showlimited" class="radio">
 						<label>
 							<input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
 							<span id=acl-showlimited-caption>{{$showlimited}}</span>
-					    </label>
-						<div id="acl-list">
-							<div id="acl-search-wrapper">
-								<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
-							</div>
-							<div id="acl-list-content-wrapper">
-								<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
-								<div id="acl-list-content"></div>
-							</div>
+						</label>
+					</div>
+					<div id="acl-list">
+						<div id="acl-search-wrapper">
+							<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+						</div>
+						<div id="acl-list-content-wrapper">
+							<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
+							<div id="acl-list-content"></div>
 						</div>
 					</div>
-
 					<span id="acl-fields"></span>
 				</div>
-
 				<div class="acl-list-item" rel="acl-template" style="display:none">
 					<img data-src="{0}"><p>{1}</p>
 					<button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button>
-- 
cgit v1.2.3


From 25df2080ead7301b5a26aeb7953065787c63d259 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 11 May 2016 22:31:05 +0200
Subject: more whitespace

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

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 90bf782f5..0e9562157 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -10,7 +10,7 @@
 			</div>
 			<div class="section-content-wrapper">
 				{{if $aclModalDesc}}
-					<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
+				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
 				{{/if}}
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
-- 
cgit v1.2.3


From 573dea42d0b71a360d8630ab20783dba13768a49 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 13 May 2016 16:22:43 +0200
Subject: instead of radio buttons use select to choose between public and
 restricted acl. if restricted is selected acl is set to default. if there is
 no default acl will be set to self. if public is selected acl-list will be
 hidden and acl-info is visible.

---
 view/tpl/acl_selector.tpl | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 0e9562157..a6c753cf0 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -12,6 +12,18 @@
 				{{if $aclModalDesc}}
 				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
 				{{/if}}
+
+				<select id="acl-select" name="optionsRadios" class="form-control form-group">
+					<option id="acl-showall" value="option1" selected>{{$showall}}</option>
+					<option id="acl-showlimited" value="option2">{{$showlimited}}</option>
+				</select>
+
+				{{if $showallOrigin}}
+				<div id="acl-info" class="form-group">
+					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
+				</div>
+				{{/if}}
+
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
 					<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
@@ -21,25 +33,8 @@
 					<div class="clear"></div>
 				</div>
 				{{/if}}
+
 				<div id="acl-wrapper">
-					<div id="acl-radiowrapper-showall" class="radio">
-						<label>
-							<input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
-							{{if $showallIcon}}
-							<i class="fa {{$showallIcon}}"></i>
-							{{/if}}
-							<span id="acl-showall-caption">{{$showall}}</span>
-						</label>
-						{{if $showallOrigin}}
-						&nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
-						{{/if}}
-					</div>
-					<div id="acl-radiowrapper-showlimited" class="radio">
-						<label>
-							<input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
-							<span id=acl-showlimited-caption>{{$showlimited}}</span>
-						</label>
-					</div>
 					<div id="acl-list">
 						<div id="acl-search-wrapper">
 							<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
-- 
cgit v1.2.3


From 1e00fa79b323c6d340b79789bf9be072a9aa629b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 13 May 2016 17:38:50 +0200
Subject: change wording restricted -> custom selection and add a label to the
 select

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

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index a6c753cf0..b30669f9a 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -12,7 +12,7 @@
 				{{if $aclModalDesc}}
 				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
 				{{/if}}
-
+				<label for="acl-select">{{$select_label}}</label>
 				<select id="acl-select" name="optionsRadios" class="form-control form-group">
 					<option id="acl-showall" value="option1" selected>{{$showall}}</option>
 					<option id="acl-showlimited" value="option2">{{$showlimited}}</option>
-- 
cgit v1.2.3


From 0f5eb6521010b6cd41b07b1f4a1dea2c40d4ebae Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 19 May 2016 23:35:19 +0200
Subject: provide an acl select option for only me

---
 view/tpl/acl_selector.tpl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index b30669f9a..1711cee8a 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -14,10 +14,15 @@
 				{{/if}}
 				<label for="acl-select">{{$select_label}}</label>
 				<select id="acl-select" name="optionsRadios" class="form-control form-group">
-					<option id="acl-showall" value="option1" selected>{{$showall}}</option>
-					<option id="acl-showlimited" value="option2">{{$showlimited}}</option>
+					<option id="acl-showall" value="public" selected>{{$showall}}</option>
+					<option id="acl-onlyme" value="onlyme">{{$onlyme}}</option>
+					<option id="acl-showlimited" value="limited">{{$showlimited}}</option>
 				</select>
 
+				<div id="show-acl" class="form-group">
+					<button type="button" class="btn btn-success form-group" onclick="openClose('acl-list'); closeOpen('show-acl');"><i class="fa fa-user-plus"></i>&nbsp;{{$add_others}}</button>
+				</div>
+
 				{{if $showallOrigin}}
 				<div id="acl-info" class="form-group">
 					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
-- 
cgit v1.2.3


From 9908a7193ae9ef79536540693e505a9c2d813425 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 25 May 2016 14:31:58 +0200
Subject: remove the add others button for now - after some research it turned
 out not beeing so useful

---
 view/tpl/acl_selector.tpl | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 1711cee8a..60fae0a29 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -19,10 +19,6 @@
 					<option id="acl-showlimited" value="limited">{{$showlimited}}</option>
 				</select>
 
-				<div id="show-acl" class="form-group">
-					<button type="button" class="btn btn-success form-group" onclick="openClose('acl-list'); closeOpen('show-acl');"><i class="fa fa-user-plus"></i>&nbsp;{{$add_others}}</button>
-				</div>
-
 				{{if $showallOrigin}}
 				<div id="acl-info" class="form-group">
 					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
-- 
cgit v1.2.3