diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-04 22:33:53 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-04 22:33:53 -0700 |
| commit | ca58ef80ae665ab2b9da125e17fdb33a1ea90a40 (patch) | |
| tree | f5c53fc0a1ed04f986d4fb06ff45545081780335 /view | |
| parent | 05654e498034329759351c4a64349734ce6b7204 (diff) | |
| parent | c8000fca1f2ee379b62b473a00838af9a48bc4b6 (diff) | |
| download | volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.tar.gz volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.tar.bz2 volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index 531f999f9..3a4278630 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -972,8 +972,6 @@ function notify_popup_loader(notifyType) { window.location.href=window.location.href; } - console.log(data); - if(data.notify.length == 0){ $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3a8e31107..704d89bdd 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -46,7 +46,6 @@ <div class="section-content-tools-wrapper"> {{include file="field_select_grouped.tpl" field=$role}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> - <div class="form-group"> <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> @@ -54,8 +53,8 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">{{$lbl_p2macro}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> </div> <div class="modal-body"> {{foreach $permiss_arr as $permit}} |