diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-17 11:54:36 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-17 11:54:36 -0400 |
| commit | 75fb065526d11714c1c0fd8a4b6f94dea65674ae (patch) | |
| tree | 817d83b53bf530f1ecc0f1df128d1485bed9aee4 /view/tpl | |
| parent | 6c5086a933451969b72890c9b703d6ee141f9d9f (diff) | |
| parent | 2b674d4cd983d637ddc863f9b87b9d863542e250 (diff) | |
| download | volse-hubzilla-75fb065526d11714c1c0fd8a4b6f94dea65674ae.tar.gz volse-hubzilla-75fb065526d11714c1c0fd8a4b6f94dea65674ae.tar.bz2 volse-hubzilla-75fb065526d11714c1c0fd8a4b6f94dea65674ae.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photo_album.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/settings_tokens.tpl | 45 |
2 files changed, 28 insertions, 19 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index b391a00a1..f097646e4 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -12,8 +12,10 @@ <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} </div> + {{if !$no_fullscreen_btn}} <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> + {{/if}} </div> <h2>{{$album}}</h2> <div class="clear"></div> diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl index 6819a2e58..22af381e9 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/settings_tokens.tpl @@ -3,31 +3,38 @@ <h2>{{$title}}</h2> <div class="clear"></div> </div> - <div class="atoken-text descriptive-text">{{$desc}}</div> - <div class="atoken-text descriptive-text">{{$desc2}}</div> - <div class="atoken-example">{{$url1}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div> - <div class="atoken-example">{{$url2}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div> - <br /> - <form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" > - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}} - <div class="section-content-tools-wrapper"> + <div class="section-content-tools-wrapper"> + <div class="section-content-info-wrapper"> + {{$desc}} + </div> + + <form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + {{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}} {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$token}} {{include file="field_input.tpl" field=$expires}} - <div class="settings-submit-wrapper" > + <div class="settings-submit-wrapper form-group"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> - </div> - </form> + </form> + <div class="descriptive-text">{{$desc2}}</div> + <ul> + <li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> + <li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> + </ul> + </div> {{if $tokens}} - <div> - <ul class="atoken-list"> - {{foreach $tokens as $t}} - <li><span class="pull-right atoken-drop"><a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-trash btn btn-xs btn-default"></i></a></span><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></li> - {{/foreach}} - </ul> + <div class="section-content-wrapper-np"> + <table id="atoken-index"> + {{foreach $tokens as $t}} + <tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row"> + <td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td> + <td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td> + </tr> + {{/foreach}} + </table> + </div> {{/if}} - </div> |