Merge remote-tracking branch 'upstream/dev' into plugin-repo

view/theme/redbasic/css/style.css

@@ -1046,6 +1046,13 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 	font-size: 140%;
 }
 
+#acl-info-icon,
+#acl-info-icon:active {
+	font-size: 110%;
+	color: $link_colour;
+	text-decoration: none;
+}
+
 #acl-showall-caption {
 	margin-left: 0.35em;
 }

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",

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}}

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}}" />