From c618bfc607498998916f01fd9c6985c2ecd47356 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 24 Feb 2018 19:42:39 +0100
Subject: mark connections where we do not have post_comments permissions with
 an no entry sign.

---
 view/tpl/connection_template.tpl | 7 ++++++-
 view/tpl/contact_template.tpl    | 3 +++
 view/tpl/micropro_img.tpl        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 8e49c9e27..4543a69d0 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -18,7 +18,12 @@
 	</div>
 	<div class="section-content-tools-wrapper">
 		<div class="contact-photo-wrapper" >
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >
+				<img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" />
+			</a>
+			{{if $contact.oneway}}
+			<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>
+			{{/if}}
 		</div>
 		<div class="contact-info">
 			{{if $contact.status}}
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index 3d1bfa4a4..2a2f996f4 100755
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
@@ -1,6 +1,9 @@
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
 		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+		{{if $contact.oneway}}
+		<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>
+		{{/if}}
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index a7c5973f3..7464430b5 100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1 +1 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}</a></div>
-- 
cgit v1.2.3


From 3153129e2eb968a189a8a7050d06892cbc13c651 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 24 Feb 2018 13:20:59 -0800
Subject: make the profile photo image picker work correctly with multiple
 profiles.

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

(limited to 'view/tpl')

diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 1f468c2e5..832f135f3 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -27,7 +27,7 @@
 			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
 			<select name="profile" id="profile-photo-profiles" class="form-control" >
 			{{foreach $profiles as $p}}
-				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
+				<option value="{{$p.id}}" {{if $p.selected}}selected="selected"{{/if}}>{{$p.name}}</option>
 			{{/foreach}}
 			</select>
 			<div class="clear"></div>
-- 
cgit v1.2.3