aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-07 16:22:35 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-07 16:22:35 -0400
commit284d86ad7681d05c3e362bddf39e1b7759ab20a5 (patch)
tree39212a74ecaa9f9a24963ef9916e168dd878b77f /view
parent852ff39856e5df78599dc14cd72a297cff560753 (diff)
parent7f974a543f1b3d37153d33f0639006d4cc82de2b (diff)
downloadvolse-hubzilla-284d86ad7681d05c3e362bddf39e1b7759ab20a5.tar.gz
volse-hubzilla-284d86ad7681d05c3e362bddf39e1b7759ab20a5.tar.bz2
volse-hubzilla-284d86ad7681d05c3e362bddf39e1b7759ab20a5.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/event_form.tpl2
-rwxr-xr-xview/tpl/settings.tpl2
2 files changed, 2 insertions, 2 deletions
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/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>&nbsp;{{$permissions}}</button>
+ <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
{{$aclselect}}
</div>
{{$group_select}}