From 723a49cceecf92a87eb34243e824b8deb900f184 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 1 Feb 2016 17:42:53 -0800
Subject: add photos to the profile "likes this" dropdowns

---
 view/tpl/profile_advanced.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a4413e536..a027a7c2e 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -4,7 +4,7 @@
 			{{if $profile.like_count}}
 			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
 			{{if $profile.likers}}
-			<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}">{{$liker.name}}</a></li>{{/foreach}}</ul>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
 			{{/if}}
 			{{/if}}
 			{{if $profile.canlike}}
@@ -215,7 +215,7 @@
 		<div class="btn-group">
 		<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button>
 		{{if $item.likes}}
-		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
+		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
 		{{/if}}
 		</div>
 		{{/if}}
-- 
cgit v1.2.3


From b2474334a7b7f009442883a08d544280231b29fc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 22:50:16 +0100
Subject: provide an edit button for the profile page

---
 view/tpl/profile_advanced.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a027a7c2e..780626cf9 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -12,6 +12,9 @@
 				<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}}
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
-- 
cgit v1.2.3


From d27a627c4f65ca67bcc0f46fb830368c713043cd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 29 Feb 2016 22:01:13 +0100
Subject: simplify profile edit button(s) and make it useful for multiple
 profiles

---
 view/tpl/profile_advanced.tpl | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 780626cf9..3d09b762d 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -12,8 +12,19 @@
 				<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>
+			{{else}}
+			<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>
-- 
cgit v1.2.3


From 492609d20bd04ff76efb3406766d714d7384c6d0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 1 Mar 2016 14:41:14 +0100
Subject: do not show empty buttons if not logged in

---
 view/tpl/profile_advanced.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 3d09b762d..0f968a53f 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -23,7 +23,7 @@
 				<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>
-			{{else}}
+			{{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>
-- 
cgit v1.2.3


From 765dd5569b9ce2f18ac9974123d96452d0d19926 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 1 Mar 2016 14:55:04 -0800
Subject: Allow configuration of the display order of profile fields. This is
 an important piece of a more general profile configuration framework which
 will eventually be accessible via the admin page.

---
 view/tpl/profile_advanced.tpl | 73 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 9 deletions(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 3d09b762d..b7c527c31 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -31,186 +31,241 @@
 		<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}}
-- 
cgit v1.2.3


From 428b4dbad63d429c3b0d47b49ff5918dbda3c596 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 1 Mar 2016 22:47:07 -0800
Subject: sort out the with and howlong dependencies

---
 view/tpl/profile_advanced.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/profile_advanced.tpl')

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}}
-- 
cgit v1.2.3


From f364343b554507e7ae309d48e7dbd2875d95c75d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 8 Mar 2016 11:43:21 +0100
Subject: add generic-content-wrapper and setction-content-wrapper to
 profile_edit.tpl

---
 view/tpl/profile_advanced.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a724c41bb..273778ae8 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,4 +1,4 @@
-<div id="profile-content-wrapper" class="generic-content-wrapper">
+<div id="" class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right dropdown">
 			{{if $profile.like_count}}
-- 
cgit v1.2.3


From d59268a5d8ed862ca4d57912800f4eebf90f74f4 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 8 Mar 2016 11:47:17 +0100
Subject: removed id by mistake - add it again

---
 view/tpl/profile_advanced.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 273778ae8..a724c41bb 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,4 +1,4 @@
-<div id="" class="generic-content-wrapper">
+<div id="profile-content-wrapper" class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right dropdown">
 			{{if $profile.like_count}}
-- 
cgit v1.2.3


From a41a05e6c0b0fa5f9497f0880a2db9d8d7374092 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 17 Mar 2016 11:50:53 +0100
Subject: bring more structure to profiles edit

---
 view/tpl/profile_advanced.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/profile_advanced.tpl')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a724c41bb..f928aa3ee 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -71,7 +71,7 @@
 		{{if $f == 'marital'}}
 		{{if $profile.marital}}
 		<dl id="aprofile-marital" class="aprofile">
-		 <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+		 <dt><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
 		 <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}}
-- 
cgit v1.2.3