diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/acl.js | 6 | ||||
| -rw-r--r-- | view/js/main.js | 7 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/follow.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/hq.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/searchbox.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 2 |
8 files changed, 19 insertions, 11 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 6042b43ca..c8f7c7180 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -173,11 +173,7 @@ ACL.prototype.on_custom = function(event) { that.deny_cid = []; that.deny_gid = []; - $("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) { - //Replace data-src attribute with src attribute for every image - $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); - }); + datasrc2src('#acl-list-content .acl-list-item img[data-src]'); that.update_view('custom'); that.on_submit(); diff --git a/view/js/main.js b/view/js/main.js index a228e6fbc..77b8e91e7 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -92,6 +92,13 @@ $(document).ready(function() { }); +function datasrc2src(selector) { + $(selector).each(function(i, el) { + $(el).attr("src", $(el).data("src")); + $(el).removeAttr("data-src"); + }); +} + function confirmDelete() { return confirm(aStr.delitem); } diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 3b152ef5e..cfb7ae67e 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -19,7 +19,7 @@ <form action="{{$cmd}}" method="get" > <div class="input-group form-group"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> </div> </div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 4def1415d..2fb753784 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -3,7 +3,7 @@ <form action="follow" method="post" /> <div class="input-group"> <input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> </div> </div> diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl index bd27250e6..fce11ff83 100755 --- a/view/tpl/hq.tpl +++ b/view/tpl/hq.tpl @@ -1,9 +1,14 @@ {{if $no_messages}} <div class="alert alert-warning alert-dismissible fade show" role="alert"> - {{$no_messages_label}} <button type="button" class="close" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> </button> + <h3>{{$no_messages_label.0}}</h3> + <br> + {{$no_messages_label.1}} </div> {{/if}} +<div id="jot-popup"> +{{$editor}} +</div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 2ecfbaff9..5f420f6d0 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -3,7 +3,7 @@ <form action="directory" method="post" /> <div class="input-group form-group"> <input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 8f7ac5162..abcdb8933 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -2,7 +2,7 @@ <input type="hidden" name="f" value="" /> <div id="{{$id}}" class="input-group"> <input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> {{if $savedsearch}} <button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 22480be5b..f1ab1ebad 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -66,7 +66,7 @@ <div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none"> <div class="input-group"> <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> - <div class="input-group-btn"> + <div class="input-group-append"> <button id="save-page" type="button" class="btn btn-primary disabled">Save</button> </div> </div> |