diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
| commit | 99354ac57622002c0bbd820235d03321406f8d39 (patch) | |
| tree | f8ad698a1c901f757dfc4354721846c8be82ab7e /view/tpl | |
| parent | e7b853175154688d60d83ca5935650d1128973c6 (diff) | |
| parent | f396b1bf735a7dc9eb3632e49c1269de54777c6d (diff) | |
| download | volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2 volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/contact_block.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 20 | ||||
| -rw-r--r-- | view/tpl/settings_tokens.tpl | 33 |
3 files changed, 49 insertions, 5 deletions
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index a32437212..6a29abaef 100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -11,4 +11,3 @@ </div> {{/if}} </div> -<div class="clear"></div> diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 8254fc87d..4e210a300 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -1,8 +1,17 @@ <script> + var aside_padding_top; + var section_padding_top; + $(document).ready(function() { + + aside_padding_top = parseInt($('aside').css('padding-top')); + section_padding_top = parseInt($('section').css('padding-top')); + if($('#cover-photo').length && $(window).width() > 755) { $('.navbar-fixed-top').css('position', 'relative'); - $('aside, section').css('padding-top', 0 + 'px'); + $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); + $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); + $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); $('main').css('opacity', 0); $('header').hide(); } @@ -15,9 +24,11 @@ if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) { $('header').fadeIn(); $('main').css('opacity', 1); - $('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px'); + $('aside').css('padding-top', aside_padding_top + 'px'); + $('section').css('padding-top', section_padding_top + 'px'); $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) $('.navbar-fixed-top').css('position', 'fixed'); + $('main').css('margin-top', ''); $('#cover-photo').remove(); } if($('#cover-photo').length) { @@ -28,7 +39,8 @@ $(window).resize(function () { if($('#cover-photo').length && $(window).width() < 755) { $('main').css('opacity', 1); - $('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px'); + $('aside').css('padding-top', aside_padding_top + 'px'); + $('section').css('padding-top', section_padding_top + 'px'); $('.navbar-fixed-top').css('position', 'fixed'); $('#cover-photo').remove(); } @@ -36,7 +48,7 @@ }); function slideUpCover() { - $('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'}); + $('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }); } </script> diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl new file mode 100644 index 000000000..6819a2e58 --- /dev/null +++ b/view/tpl/settings_tokens.tpl @@ -0,0 +1,33 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <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"> + {{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" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </form> + {{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> + {{/if}} + +</div> |