Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.

4 files changed, 53 insertions, 24 deletions

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6b8729ee6..d810e69f7 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -41,6 +41,7 @@
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_select.tpl" field=$server_role}}
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
 	{{include file="field_select.tpl" field=$language}}
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index 6a29abaef..580a8a41c 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,13 +1,14 @@
 <div id="contact-block" class="widget">
-<h3>{{$contacts}}</h3>
-{{if $micropro}}
-		{{if $viewconnections}}
-		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
-		{{/if}}
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
+	<h3>{{$contacts}}</h3>
+	{{if $micropro}}
+	{{if $viewconnections}}
+	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+	{{/if}}
+	<div class='contact-block-content'>
+	{{foreach $micropro as $m}}
+		{{$m}}
+	{{/foreach}}
+	</div>
+	{{/if}}
 </div>
+<div class="clear"></div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 4e210a300..2b47270c9 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,22 +1,28 @@
 <script>
 	var aside_padding_top;
 	var section_padding_top;
+	var coverSlid = false;
 
 	$(document).ready(function() {
 
 		aside_padding_top = parseInt($('aside').css('padding-top'));
 		section_padding_top = parseInt($('section').css('padding-top'));
 
+		$(document).on('click', slideUpCover);
+
 		if($('#cover-photo').length && $(window).width() > 755) {
-			$('.navbar-fixed-top').css('position', 'relative');
-			$('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();
+			if($(window).scrollTop() < $('#cover-photo').height()) {
+				$('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');
+				$('.navbar-fixed-top').css('position', 'relative');
+				$('main').css('opacity', 0);
+				$('header').hide();
+			}
 		}
 		else {
 			$('#cover-photo').remove();
+			coverSlid = true;
 		}
 	});
 
@@ -26,10 +32,26 @@
 			$('main').css('opacity', 1);
 			$('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');
+			$('.navbar-fixed-top').css('position', '');
 			$('main').css('margin-top', '');
-			$('#cover-photo').remove();
+			coverSlid = true;
+		}
+		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+			if(coverSlid) {
+				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				setTimeout(function(){ coverSlid = false; }, 1000);
+			}
+			else {
+				if($(window).scrollTop() < $('#cover-photo').height()) {
+					$('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');
+
+					$('.navbar-fixed-top').css('position', 'relative');
+					$('main').css('opacity', 0);
+					$('header').hide();
+				}
+			}
 		}
 		if($('#cover-photo').length) {
 			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
@@ -38,21 +60,26 @@
 
 	$(window).resize(function () {
 		if($('#cover-photo').length && $(window).width() < 755) {
+			$('#cover-photo').remove();
 			$('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');
-			$('#cover-photo').remove();
+			$('.navbar-fixed-top').css('position', '');
+			coverSlid = true;
 		}
 
 	});
 
 	function slideUpCover() {
+		if(coverSlid) {
+			return;
+		}
 		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+		return;
 	}
 </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">
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index 5ecd3243b..f7a0108a8 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -19,7 +19,7 @@
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{include file="field_input.tpl" field=$siteurl}}
-{{include file="field_checkbox.tpl" field=$advanced}}
+{{include file="field_select.tpl" field=$server_role}}
 
 {{include file="field_select_grouped.tpl" field=$timezone}}