diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 2 |
4 files changed, 9 insertions, 7 deletions
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}} + <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", diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 5cf660b3b..fbeec9aa3 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -116,7 +116,7 @@ <div class="btn-group pull-right"> <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}"><i id="jot-perms-icon"></i></button> + <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}"><i id="jot-perms-icon" class="fa"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> </div> 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}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index ab5b2f93c..8157196ac 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -71,7 +71,7 @@ </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> {{$permissions}}</button> + <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> {{$aclselect}} </div> {{$group_select}} |