diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-04 21:26:52 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-04 21:26:52 -0400 |
| commit | 8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5 (patch) | |
| tree | ee9fc7e669c86c6c1ddf1ab9e5e0443d2b02a209 /view/tpl | |
| parent | e4a2aacd1d2f852264319aff848257349575131e (diff) | |
| parent | 8c9a773a90fc331f0b4d6ce44119abe1278fd8ea (diff) | |
| download | volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.tar.gz volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.tar.bz2 volse-hubzilla-8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 29 | ||||
| -rw-r--r-- | view/tpl/app_create.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/app_select.tpl | 4 |
3 files changed, 30 insertions, 7 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index e57fdba12..a3fe73d0c 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -3,9 +3,15 @@ <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$aclModalTitle}}</h4> + {{if $helpUrl}} + <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a> + {{/if}} + <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4> </div> <div class="modal-body"> + {{if $aclModalDesc}} + <div id="acl-dialog-description">{{$aclModalDesc}}</div> + {{/if}} {{if $jotnets}} <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> @@ -16,11 +22,24 @@ </div> {{/if}} <div id="acl-wrapper"> - <button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button> - <input type="text" id="acl-search" placeholder=""> - <div id="acl-list"> - <div id="acl-list-content"></div> + <div id="acl-radiowrapper-showall" class="radio"> + <label> + <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked> + <i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span> + </label> </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"> + <input type="text" id="acl-search" placeholder=" {{$search}}"> + <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> + <div id="acl-list-content"></div> + </div> + </div> + <span id="acl-fields"></span> </div> diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl index ff28e0598..0590e7031 100644 --- a/view/tpl/app_create.tpl +++ b/view/tpl/app_create.tpl @@ -12,6 +12,10 @@ <input type="hidden" name="addr" value="{{$addr}}" /> {{/if}} +<input type="hidden" name="requires" value="{{$requires}}" /> +<input type="hidden" name="system" value="{{$system}}" /> + + {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$url}} {{include file="field_textarea.tpl" field=$desc}} diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index 527d01eae..93049d522 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -2,8 +2,8 @@ <div class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> -<li><a href="appman">{{$new}}</a></li> -<li><a href="apps/edit">{{$edit}}</a></li> +<li><a href="appman"><i class="fa fa-plus"></i> {{$new}}</a></li> +<li><a href="apps/edit"><i class="fa fa-pencil"></i> {{$edit}}</a></li> </ul> </div> {{/if}} |