From aa0384bcece9ebf0a014c5387a91bb3f0d564301 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 24 Aug 2016 22:39:30 +0200
Subject: Revert "revert cover photo changes"

This reverts commit 4c840d70a494dae62a856ed91f9039eb16bc51ee.
---
 view/tpl/cover_photo_widget.tpl | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 4e210a300..91f304ccb 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,9 +1,12 @@
 <script>
 	var aside_padding_top;
 	var section_padding_top;
+	var coverSlid = false;
 
 	$(document).ready(function() {
 
+		$('body').on('click',slideUpCover);
+
 		aside_padding_top = parseInt($('aside').css('padding-top'));
 		section_padding_top = parseInt($('section').css('padding-top'));
 
@@ -12,7 +15,7 @@
 			$('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);
+			$('main').css('opacity', 0.5);
 			$('header').hide();
 		}
 		else {
@@ -21,15 +24,16 @@
 	});
 
 	$(window).scroll(function () {
-		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
+		if((! coverSlid) && $('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
 			$('header').fadeIn();
 			$('main').css('opacity', 1);
 			$('aside').css('padding-top', aside_padding_top + 'px');
 			$('section').css('padding-top', section_padding_top + 'px');
+			$('#cover-photo').css('padding-top', $('nav').outerHeight());
 			$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
-			$('.navbar-fixed-top').css('position', 'fixed');
+			$('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0});
 			$('main').css('margin-top', '');
-			$('#cover-photo').remove();
+			coverSlid = true;
 		}
 		if($('#cover-photo').length) {
 			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
@@ -39,20 +43,28 @@
 	$(window).resize(function () {
 		if($('#cover-photo').length && $(window).width() < 755) {
 			$('main').css('opacity', 1);
-			$('aside').css('padding-top', aside_padding_top + 'px');
-			$('section').css('padding-top', section_padding_top + 'px');
-			$('.navbar-fixed-top').css('position', 'fixed');
+			$('aside').css('padding-top', aside_padding_top + $('nav').outerHeight() + 20 + 'px');
+			$('section').css('padding-top', section_padding_top  + $('nav').outerHeight() + 20 + 'px');
+			$('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0 });
 			$('#cover-photo').remove();
 		}
 
 	});
 
 	function slideUpCover() {
+		if(coverSlid)
+			return;
 		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+		$('#cover-photo').css({ 'position' : 'relative' , 'top' : $('nav').outerHeight() });
+		$('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0});
+		$('aside').css('padding-top', aside_padding_top + 'px');
+		$('section').css('padding-top', section_padding_top + 'px');
+		$('main').css('margin-top', '');
+		coverSlid = true;
 	}
 </script>
 
-<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}">
+<div id="cover-photo" title="{{$hovertitle}}">
 	{{$photo_html}}
 	<div id="cover-photo-caption">
 		<div class="cover-photo-title">
-- 
cgit v1.2.3