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')

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 94accd8a4c7500ee4f5c268fe7e84ad3ed9a6675 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 8 May 2016 20:25:10 -0700
Subject: remove the old IE html5 hack.

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

(limited to 'view/tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 9502dd91c..7e7155fec 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -2,10 +2,6 @@
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
 {{$metas}}
-<!--[if IE]>
-<script src="{{$baseurl}}/library/html5.js"></script>
-<![endif]-->
-
 {{$head_css}}
 {{$js_strings}}
 {{$head_js}}
-- 
cgit v1.2.3


From 7aeff7505be6bd5fd10b04efaedf0e35915e0154 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 9 May 2016 12:09:04 +0200
Subject: remove unused code and whitespace

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

(limited to 'view/tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a9f6766dc..685706026 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -8,7 +8,7 @@
 	{{/if}}
 	<div id="profile-jot-wrapper">
 		{{if $parent}}
-			<input type="hidden" name="parent" value="{{$parent}}" />
+		<input type="hidden" name="parent" value="{{$parent}}" />
 		{{/if}}
 		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-- 
cgit v1.2.3