diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:21 -0800 |
| commit | 619f8f752b95749c2c4b90c204aee1dbba1dee78 (patch) | |
| tree | 0011b1e236588a3d08acf0cbaef057cb3a0b467c /view | |
| parent | b0a491eaa8759feef7bca1a9c1dd272fa07c4872 (diff) | |
| parent | 07b67963f128157e85c891057da2c42c286166e7 (diff) | |
| download | volse-hubzilla-619f8f752b95749c2c4b90c204aee1dbba1dee78.tar.gz volse-hubzilla-619f8f752b95749c2c4b90c204aee1dbba1dee78.tar.bz2 volse-hubzilla-619f8f752b95749c2c4b90c204aee1dbba1dee78.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
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/hq.tpl | 7 |
3 files changed, 14 insertions, 6 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/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> |