Merge branch 'master' of https://github.com/friendica/red

1 files changed, 228 insertions, 232 deletions

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index aa169e6c0..1f99bf1ad 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,233 +1,229 @@
-<div id="profile-content-wrapper" class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-{{if $profile.canlike || $profile.like_count}}
-<div id="profile-like-wrapper">
-{{if $profile.canlike}}
-	<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
-	<i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
-	</button>
-{{/if}}
-
-
-{{if $profile.like_count}}
-<div class="btn-group">
-<button type="button" class="btn btn-default btn-sm 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>
-{{/if}}
-</div>
-{{/if}}
-</div>
-{{/if}}
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{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 $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.keywords.0}}</dt>
- <dd>{{$profile.keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.channels}}
-<dl id="aprofile-channels" class="aprofile">
- <dt>{{$profile.channels.0}}</dt>
- <dd>{{$profile.channels.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1}}</dd>
-</dl>
-{{/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>
-</dl>
-{{/if}}
-{{/foreach}}
-
-
-{{if $things}}
-{{foreach $things as $key => $items}}
-<b>{{$profile.fullname.1}} {{$key}}</b>
-<ul class="profile-thing-list">
-{{foreach $items as $item}}
-<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}}
-<a href="{{$item.url}}" >{{$item.term}}</a>
-{{if $profile.canlike}}<br />
-<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
-<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
-</button>
-{{/if}}
-{{if $item.like_count}}
-<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>
-{{/if}}
-</div>
-{{/if}}
-</li>
-{{/foreach}}
-</ul>
-<div class="clear"></div>
-{{/foreach}}
-{{/if}}
-
+<div id="profile-content-wrapper" class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right dropdown">
+			{{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>
+			{{/if}}
+			{{/if}}
+			{{if $profile.canlike}}
+			<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+				<i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
+			</button>
+			{{/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>
+
+		{{if $profile.gender}}
+		<dl id="aprofile-gender" class="aprofile">
+		 <dt>{{$profile.gender.0}}</dt>
+		 <dd>{{$profile.gender.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.birthday}}
+		<dl id="aprofile-birthday" class="aprofile">
+		 <dt>{{$profile.birthday.0}}</dt>
+		 <dd>{{$profile.birthday.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.age}}
+		<dl id="aprofile-age" class="aprofile">
+		 <dt>{{$profile.age.0}}</dt>
+		 <dd>{{$profile.age.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{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 $profile.sexual}}
+		<dl id="aprofile-sexual" class="aprofile">
+		 <dt>{{$profile.sexual.0}}</dt>
+		 <dd>{{$profile.sexual.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.keywords}}
+		<dl id="aprofile-tags" class="aprofile">
+		 <dt>{{$profile.keywords.0}}</dt>
+		 <dd>{{$profile.keywords.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.homepage}}
+		<dl id="aprofile-homepage" class="aprofile">
+		 <dt>{{$profile.homepage.0}}</dt>
+		 <dd>{{$profile.homepage.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.hometown}}
+		<dl id="aprofile-hometown" class="aprofile">
+		 <dt>{{$profile.hometown.0}}</dt>
+		 <dd>{{$profile.hometown.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.politic}}
+		<dl id="aprofile-politic" class="aprofile">
+		 <dt>{{$profile.politic.0}}</dt>
+		 <dd>{{$profile.politic.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.religion}}
+		<dl id="aprofile-religion" class="aprofile">
+		 <dt>{{$profile.religion.0}}</dt>
+		 <dd>{{$profile.religion.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.about}}
+		<dl id="aprofile-about" class="aprofile">
+		 <dt>{{$profile.about.0}}</dt>
+		 <dd>{{$profile.about.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.interest}}
+		<dl id="aprofile-interest" class="aprofile">
+		 <dt>{{$profile.interest.0}}</dt>
+		 <dd>{{$profile.interest.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.likes}}
+		<dl id="aprofile-likes" class="aprofile">
+		 <dt>{{$profile.likes.0}}</dt>
+		 <dd>{{$profile.likes.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.dislikes}}
+		<dl id="aprofile-dislikes" class="aprofile">
+		 <dt>{{$profile.dislikes.0}}</dt>
+		 <dd>{{$profile.dislikes.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.contact}}
+		<dl id="aprofile-contact" class="aprofile">
+		 <dt>{{$profile.contact.0}}</dt>
+		 <dd>{{$profile.contact.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.channels}}
+		<dl id="aprofile-channels" class="aprofile">
+		 <dt>{{$profile.channels.0}}</dt>
+		 <dd>{{$profile.channels.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.music}}
+		<dl id="aprofile-music" class="aprofile">
+		 <dt>{{$profile.music.0}}</dt>
+		 <dd>{{$profile.music.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.book}}
+		<dl id="aprofile-book" class="aprofile">
+		 <dt>{{$profile.book.0}}</dt>
+		 <dd>{{$profile.book.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.tv}}
+		<dl id="aprofile-tv" class="aprofile">
+		 <dt>{{$profile.tv.0}}</dt>
+		 <dd>{{$profile.tv.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.film}}
+		<dl id="aprofile-film" class="aprofile">
+		 <dt>{{$profile.film.0}}</dt>
+		 <dd>{{$profile.film.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.romance}}
+		<dl id="aprofile-romance" class="aprofile">
+		 <dt>{{$profile.romance.0}}</dt>
+		 <dd>{{$profile.romance.1}}</dd>
+		</dl>
+		{{/if}}
+
+
+		{{if $profile.work}}
+		<dl id="aprofile-work" class="aprofile">
+		 <dt>{{$profile.work.0}}</dt>
+		 <dd>{{$profile.work.1}}</dd>
+		</dl>
+		{{/if}}
+
+		{{if $profile.education}}
+		<dl id="aprofile-education" class="aprofile">
+		 <dt>{{$profile.education.0}}</dt>
+		 <dd>{{$profile.education.1}}</dd>
+		</dl>
+		{{/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>
+		</dl>
+		{{/if}}
+		{{/foreach}}
+
+
+		{{if $things}}
+		{{foreach $things as $key => $items}}
+		<b>{{$profile.fullname.1}} {{$key}}</b>
+		<ul class="profile-thing-list">
+		{{foreach $items as $item}}
+		<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}}
+		<a href="{{$item.url}}" >{{$item.term}}</a>
+		{{if $profile.canlike}}<br />
+		<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
+		<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+		</button>
+		{{/if}}
+		{{if $item.like_count}}
+		<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>
+		{{/if}}
+		</div>
+		{{/if}}
+		</li>
+		{{/foreach}}
+		</ul>
+		<div class="clear"></div>
+		{{/foreach}}
+		{{/if}}
+	</div>
 </div>