aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-03 14:49:34 -0800
committerredmatrix <git@macgirvin.com>2016-03-03 14:49:34 -0800
commitdd4a66353af9150f418e4b0976c890923b57b04b (patch)
tree73528e3609b5b1006c259772422820d99c799483 /view/tpl
parent2cf54c465d25918d582efcf2bce0e3086d270e72 (diff)
parentd3491c9165855ac7c2f1e0243a6c796ab36f9109 (diff)
downloadvolse-hubzilla-dd4a66353af9150f418e4b0976c890923b57b04b.tar.gz
volse-hubzilla-dd4a66353af9150f418e4b0976c890923b57b04b.tar.bz2
volse-hubzilla-dd4a66353af9150f418e4b0976c890923b57b04b.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge1.3
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/cover_photo_widget.tpl53
-rwxr-xr-xview/tpl/jot.tpl22
2 files changed, 64 insertions, 11 deletions
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
new file mode 100755
index 000000000..d6d2517e7
--- /dev/null
+++ b/view/tpl/cover_photo_widget.tpl
@@ -0,0 +1,53 @@
+<script>
+ $(document).ready(function() {
+ if($('#cover-photo').length && $(window).width() > 755) {
+ $('.navbar-fixed-top').css('position', 'relative');
+ $('aside, section').css('padding-top', 0 + 'px');
+ $('main').css('opacity', 0);
+ $('header').hide();
+ }
+ else {
+ $('#cover-photo').remove();
+ }
+ });
+
+ $(window).scroll(function () {
+ if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
+ $('header').fadeIn();
+ $('main').css('opacity', 1);
+ $('aside, section').css('padding-top', 71 + 'px');
+ $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
+ $('.navbar-fixed-top').css('position', 'fixed');
+ $('#cover-photo').remove();
+ }
+ if($('#cover-photo').length) {
+ $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
+ }
+ });
+
+ $(window).resize(function () {
+ if($('#cover-photo').length && $(window).width() < 755) {
+ $('main').css('opacity', 1);
+ $('aside, section').css('padding-top', 71 + 'px');
+ $('.navbar-fixed-top').css('position', 'fixed');
+ $('#cover-photo').remove();
+ }
+
+ });
+
+ function slideUpCover() {
+ $('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'});
+ }
+</script>
+
+<div id="cover-photo" onclick="slideUpCover();">
+ {{$photo_html}}
+ <div id="cover-photo-caption">
+ <div class="cover-photo-title">
+ {{$title}}
+ </div>
+ <div class="cover-photo-subtitle">
+ {{$subtitle}}
+ </div>
+ </div>
+</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 631f55d83..dea75efa9 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,12 +1,12 @@
-{{$mimeselect}}
-{{$layoutselect}}
-{{if $id_select}}
-<div class="channel-id-select-div">
- <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-</div>
-{{/if}}
-<div id="profile-jot-wrapper">
- <form id="profile-jot-form" action="{{$action}}" method="post">
+<form id="profile-jot-form" action="{{$action}}" method="post">
+ {{$mimeselect}}
+ {{$layoutselect}}
+ {{if $id_select}}
+ <div class="channel-id-select-div">
+ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+ </div>
+ {{/if}}
+ <div id="profile-jot-wrapper">
{{if $parent}}
<input type="hidden" name="parent" value="{{$parent}}" />
{{/if}}
@@ -160,8 +160,8 @@
</div>
<div id="profile-jot-text-loading"></div>
<div id="profile-jot-end" class="clear"></div>
- </form>
-</div>
+ </div>
+</form>
<div id="jot-preview-content" style="display:none;"></div>