Merge remote-tracking branch 'upstream/master'

5 files changed, 104 insertions, 12 deletions

diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index ab190fc95..da762a094 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -21,6 +21,7 @@
 	<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
 	<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
 	<li><a href='{{$admin.features.0}}'>{{$admin.features.1}}</a></li>
+	<li><a href='{{$admin.profs.0}}'>{{$admin.profs.1}}</a></li>
 	<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
 </ul>
 </div>
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
new file mode 100644
index 000000000..8962c21b3
--- /dev/null
+++ b/view/tpl/admin_profiles.tpl
@@ -0,0 +1,38 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign">&nbsp;{{$new}}</i></a><h2>{{$title}}</h2>
+<div class="clear"></div>
+</div>
+
+<div class="section-content-tools-wrapper">
+
+<div class="section-content-info-wrapper">{{$all_desc}}
+<br /><br />
+{{$all}}
+</div>
+
+<form action="admin/profs" method="post">
+
+{{include file="field_textarea.tpl" field=$basic}}
+{{include file="field_textarea.tpl" field=$advanced}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+
+
+
+{{if $cust_fields}}
+<br /><br />
+<div><strong>{{$cust_field_desc}}</strong></div>
+<br />
+
+<table width="100%">
+{{foreach $cust_fields as $field}}
+<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="icon-trash"></i>&nbsp;{{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="icon-pencil"></i></a></td></tr>
+{{/foreach}}
+</table>
+{{/if}}
+
+</div>
+
+</div>
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>
 
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 034a6d43d..a724c41bb 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -72,7 +72,7 @@
 		{{if $profile.marital}}
 		<dl id="aprofile-marital" class="aprofile">
 		 <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
-		 <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+		 <dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
 		</dl>
 		{{/if}}
 		{{/if}}