diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-11 20:08:54 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-11 20:08:54 -0400 |
| commit | 913d07a4a7d9494e0617baa048be4a5857792e44 (patch) | |
| tree | a8c31969e0fa7807f1e6b40e7c8a30985f99a6b3 /view | |
| parent | b40d8070f35695008d122a685f1dfc9cc32adfbe (diff) | |
| parent | 1fb21b781f47a4e0f8931bd703b589398ecf18e6 (diff) | |
| download | volse-hubzilla-913d07a4a7d9494e0617baa048be4a5857792e44.tar.gz volse-hubzilla-913d07a4a7d9494e0617baa048be4a5857792e44.tar.bz2 volse-hubzilla-913d07a4a7d9494e0617baa048be4a5857792e44.zip | |
Merge remote-tracking branch 'upstream/dev' into chat-notify
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 40 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins.tpl | 6 |
2 files changed, 23 insertions, 23 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 050417257..0e9562157 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -10,7 +10,7 @@ </div> <div class="section-content-wrapper"> {{if $aclModalDesc}} - <div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div> + <div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div> {{/if}} {{if $jotnets}} <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> @@ -23,34 +23,34 @@ {{/if}} <div id="acl-wrapper"> <div id="acl-radiowrapper-showall" class="radio"> - <label> - <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked> - {{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}} + <label> + <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked> + {{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> <input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2"> <span id=acl-showlimited-caption>{{$showlimited}}</span> - </label> - <div id="acl-list"> - <div id="acl-search-wrapper"> - <input type="text" id="acl-search" placeholder=" {{$search}}"> - </div> - <div id="acl-list-content-wrapper"> - <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> - <div id="acl-list-content"></div> - </div> + </label> + </div> + <div id="acl-list"> + <div id="acl-search-wrapper"> + <input type="text" id="acl-search" placeholder=" {{$search}}"> + </div> + <div id="acl-list-content-wrapper"> + <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> + <div id="acl-list-content"></div> </div> </div> - <span id="acl-fields"></span> </div> - <div class="acl-list-item" rel="acl-template" style="display:none"> <img data-src="{0}"><p>{1}</p> <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 186cb052d..f21a3057e 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -15,7 +15,7 @@ </div> <div class="clear"></div> <div class="section-content-info-wrapper"> - <h3>Installed Addon Repositories</h3> + <h3>Installed Plugin Repositories</h3> {{foreach $addonrepos as $repo}} <!-- <div class="section-content-tools-wrapper"> --> <div style="margin-left: 30%; margin-right: 30%;"> @@ -123,7 +123,7 @@ "/admin/plugins/updaterepo", {repoName: repoName}, function(response) { if (response.success) { - window.console.log('Addon repo'+repoName+'successfully updated :' + response['message']); + window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']); alert('Addon repo updated.'); } else { window.console.log('Error updating repo :' + response['message']); @@ -146,7 +146,7 @@ "/admin/plugins/removerepo", {repoName: repoName}, function(response) { if (response.success) { - window.console.log('Addon repo'+repoName+'successfully removed :' + response['message']); + window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']); if(confirm('Repo deleted. Click OK to refresh page.')) { location.reload(); } |