diff options
| -rw-r--r-- | Zotlabs/Module/Embedphotos.php | 2 | ||||
| -rw-r--r-- | view/css/mod_settings.css | 19 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/settings_tokens.tpl | 45 |
5 files changed, 48 insertions, 21 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php index 2cd420664..0dac873c5 100644 --- a/Zotlabs/Module/Embedphotos.php +++ b/Zotlabs/Module/Embedphotos.php @@ -159,7 +159,7 @@ function embedphotos_widget_album($args) { '$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)), '$order' => false, '$upload_form' => $upload_form, - '$usage' => $usage_message + '$no_fullscreen_btn' => true )); return $o; diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index e81d115d4..4236b3dff 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -7,5 +7,22 @@ } .channel-menu { - margin-top: 24px; + margin-top: 24px; +} + +.zat-example { + color: red; +} + +#atoken-index { + width: 100%; +} + +#atoken-index td:nth-child(1){ + padding: 7px 3px 7px 10px; + white-space: nowrap; +} + +.atoken-index-tool { + padding: 7px 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 426e8e2ee..982f32ce7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1655,6 +1655,7 @@ main.fullscreen .section-content-wrapper-np { display: none; } +.atoken-index-row:hover td, .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, 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> |