Merge remote-tracking branch 'upstream/master'

6 files changed, 98 insertions, 32 deletions

diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 08c8aa64a..c29d80347 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
+			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 128bbfbe1..d6a7f56b2 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,4 +1,4 @@
-	<div class='form-group field input'>
+	<div id="id_{{$field.0}}_wrapper" class='form-group field input'>
 		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 		<input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
 		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 32a08a9b3..631f55d83 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,10 @@
+{{$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">
 		{{if $parent}}
@@ -17,13 +24,7 @@
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		{{if $showacl}}{{$acl}}{{/if}}
-		{{$mimeselect}}
-		{{$layoutselect}}
-		{{if $id_select}}
-		<div class="channel-id-select-div">
-			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-		</div>
-		{{/if}}
+
 		{{if $webpage}}
 		<div id="jot-pagetitle-wrap" class="jothidden">
 			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
@@ -159,10 +160,11 @@
 		</div>
 		<div id="profile-jot-text-loading"></div>
 		<div id="profile-jot-end" class="clear"></div>
-		<div id="jot-preview-content" style="display:none;"></div>
 	</form>
 </div>
 
+<div id="jot-preview-content" style="display:none;"></div>
+
 <!-- Modal for item expiry-->
 <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 11a08204d..5bcef5dc1 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,7 +26,7 @@
 			<div id="body-textarea">
 			{{include file="field_textarea.tpl" field=$body}}
 			</div>
-			<div class="pull-right btn-group form-group">
+			<div class="pull-right btn-group">
 				<div class="btn-group">
 					{{if $lockstate}}
 					<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 780626cf9..034a6d43d 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -12,194 +12,260 @@
 				<i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
 			</button>
 			{{/if}}
-			{{if $edit}}
-			<a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i>&nbsp;{{$edit.label}}</a>
+			{{if $editmenu.multi}}
+			<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			<ul class="dropdown-menu" role="menu">
+				{{foreach $editmenu.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
+				</li>
+				{{/foreach}}
+				<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+				{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
+			</ul>
+			{{elseif $editmenu}}
+			<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
 			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>
 	<div class="section-content-wrapper">
-		<dl id="aprofile-fullname" class="aprofile">
-		 <dt>{{$profile.fullname.0}}</dt>
-		 <dd>{{$profile.fullname.1}}</dd>
-		</dl>
 
+	{{foreach $fields as $f}}
+		{{if $f == 'name'}}
+			<dl id="aprofile-fullname" class="aprofile">
+			 <dt>{{$profile.fullname.0}}</dt>
+			 <dd>{{$profile.fullname.1}}</dd>
+			</dl>
+		{{/if}}
+
+		{{if $f == 'gender'}}
 		{{if $profile.gender}}
 		<dl id="aprofile-gender" class="aprofile">
 		 <dt>{{$profile.gender.0}}</dt>
 		 <dd>{{$profile.gender.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'birthday'}}
 		{{if $profile.birthday}}
 		<dl id="aprofile-birthday" class="aprofile">
 		 <dt>{{$profile.birthday.0}}</dt>
 		 <dd>{{$profile.birthday.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'age'}}
 		{{if $profile.age}}
 		<dl id="aprofile-age" class="aprofile">
 		 <dt>{{$profile.age.0}}</dt>
 		 <dd>{{$profile.age.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+
+		{{if $f == 'marital'}}
 		{{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>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'sexual'}}
 		{{if $profile.sexual}}
 		<dl id="aprofile-sexual" class="aprofile">
 		 <dt>{{$profile.sexual.0}}</dt>
 		 <dd>{{$profile.sexual.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'keywords'}}
 		{{if $profile.keywords}}
 		<dl id="aprofile-tags" class="aprofile">
 		 <dt>{{$profile.keywords.0}}</dt>
 		 <dd>{{$profile.keywords.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'homepage'}}
 		{{if $profile.homepage}}
 		<dl id="aprofile-homepage" class="aprofile">
 		 <dt>{{$profile.homepage.0}}</dt>
 		 <dd>{{$profile.homepage.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'hometown'}}
 		{{if $profile.hometown}}
 		<dl id="aprofile-hometown" class="aprofile">
 		 <dt>{{$profile.hometown.0}}</dt>
 		 <dd>{{$profile.hometown.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+
+		{{if $f == 'politic'}}
 		{{if $profile.politic}}
 		<dl id="aprofile-politic" class="aprofile">
 		 <dt>{{$profile.politic.0}}</dt>
 		 <dd>{{$profile.politic.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'religion'}}
 		{{if $profile.religion}}
 		<dl id="aprofile-religion" class="aprofile">
 		 <dt>{{$profile.religion.0}}</dt>
 		 <dd>{{$profile.religion.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'about'}}
 		{{if $profile.about}}
 		<dl id="aprofile-about" class="aprofile">
 		 <dt>{{$profile.about.0}}</dt>
 		 <dd>{{$profile.about.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'interest'}}
 		{{if $profile.interest}}
 		<dl id="aprofile-interest" class="aprofile">
 		 <dt>{{$profile.interest.0}}</dt>
 		 <dd>{{$profile.interest.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'likes'}}
 		{{if $profile.likes}}
 		<dl id="aprofile-likes" class="aprofile">
 		 <dt>{{$profile.likes.0}}</dt>
 		 <dd>{{$profile.likes.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'dislikes'}}
 		{{if $profile.dislikes}}
 		<dl id="aprofile-dislikes" class="aprofile">
 		 <dt>{{$profile.dislikes.0}}</dt>
 		 <dd>{{$profile.dislikes.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'contact'}}
 		{{if $profile.contact}}
 		<dl id="aprofile-contact" class="aprofile">
 		 <dt>{{$profile.contact.0}}</dt>
 		 <dd>{{$profile.contact.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'channels'}}
 		{{if $profile.channels}}
 		<dl id="aprofile-channels" class="aprofile">
 		 <dt>{{$profile.channels.0}}</dt>
 		 <dd>{{$profile.channels.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'music'}}
 		{{if $profile.music}}
 		<dl id="aprofile-music" class="aprofile">
 		 <dt>{{$profile.music.0}}</dt>
 		 <dd>{{$profile.music.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'book'}}
 		{{if $profile.book}}
 		<dl id="aprofile-book" class="aprofile">
 		 <dt>{{$profile.book.0}}</dt>
 		 <dd>{{$profile.book.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'tv'}}
 		{{if $profile.tv}}
 		<dl id="aprofile-tv" class="aprofile">
 		 <dt>{{$profile.tv.0}}</dt>
 		 <dd>{{$profile.tv.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'film'}}
 		{{if $profile.film}}
 		<dl id="aprofile-film" class="aprofile">
 		 <dt>{{$profile.film.0}}</dt>
 		 <dd>{{$profile.film.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'romance'}}
 		{{if $profile.romance}}
 		<dl id="aprofile-romance" class="aprofile">
 		 <dt>{{$profile.romance.0}}</dt>
 		 <dd>{{$profile.romance.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
 
+		{{if $f == 'work'}}
 		{{if $profile.work}}
 		<dl id="aprofile-work" class="aprofile">
 		 <dt>{{$profile.work.0}}</dt>
 		 <dd>{{$profile.work.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
+		{{if $f == 'education'}}
 		{{if $profile.education}}
 		<dl id="aprofile-education" class="aprofile">
 		 <dt>{{$profile.education.0}}</dt>
 		 <dd>{{$profile.education.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 
-		{{foreach $profile.extra_fields as $f}}
-		{{if $profile.$f}}
-		<dl id="aprofile-{{$f}}" class="aprofile">
-		 <dt>{{$profile.$f.0}}</dt>
-		 <dd>{{$profile.$f.1}}</dd>
+		{{foreach $profile.extra_fields as $fld}}
+		{{if $f == $fld}}
+		{{if $profile.$fld}}
+		<dl id="aprofile-{{$fld}}" class="aprofile">
+		 <dt>{{$profile.$fld.0}}</dt>
+		 <dd>{{$profile.$fld.1}}</dd>
 		</dl>
 		{{/if}}
+		{{/if}}
 		{{/foreach}}
+	{{/foreach}}
 
 
 		{{if $things}}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 56c262564..943cc6339 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -6,19 +6,21 @@
 	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
 	{{/if}}
 	{{if ! $zcard}}
-	{{if $profile.edit}}
+	{{if $editmenu.multi}}
 	<div class="dropdown">
-	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
+	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
 	<ul class="dropdown-menu" role="menu">
-		{{foreach $profile.menu.entries as $e}}
+		{{foreach $editmenu.menu.entries as $e}}
 		<li>
-			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
+			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a>
 		</li>
 		{{/foreach}}
-		<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-		{{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}}
+		<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
 	</ul>
 	</div>
+	{{elseif $editmenu}}
+	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
 	{{/if}}
 	{{/if}}
 
@@ -27,9 +29,6 @@
 	{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}		
 	{{/if}}
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-
-
 	{{if $location}}
 		<dl class="location"><dt class="location-label">{{$location}}</dt> 
 		<dd class="adr">
@@ -45,7 +44,6 @@
 	{{/if}}
 
 	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}