From f31ef3420db5ed600a988dc300f2d2f56b31acc6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Oct 2016 20:52:02 -0700
Subject: issue #549, ACL has 'public' selected even when restrictive ACL is
 being used.

---
 view/tpl/acl_selector.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index dbdbd6a56..c23840c16 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -15,10 +15,10 @@
 				{{/if}}
 				<label for="acl-select">{{$select_label}}</label>
 				<select id="acl-select" name="optionsRadios" class="form-control form-group">
-					<option id="acl-showall" value="public" selected>{{$showall}}</option>
+					<option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option>
 					{{$groups}}
-					<option id="acl-onlyme" value="onlyme">{{$onlyme}}</option>
-					<option id="acl-custom" value="custom">{{$custom}}</option>
+					<option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option>
+					<option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option>
 				</select>
 
 				{{if $showallOrigin}}
-- 
cgit v1.2.3


From 2db7b2d9487d9393d511998ae0258979fde379c4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Oct 2016 16:46:09 -0700
Subject: change event behaviour - share by default.

---
 view/tpl/event_form.tpl | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'view')

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a2bb1f112..0f37d8287 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -105,10 +105,6 @@
 		</div>
 	</div>
 
-	{{if ! $eid}}
-	{{include file="field_checkbox.tpl" field=$share}}
-	{{/if}}
-
 	<div class="clear"></div>
 
 	<button type="button" class="btn btn-default" onclick="openClose('advanced');">{{$advanced}}</button>
-- 
cgit v1.2.3


From 2a59f45a3b2da30d00656729b6b008df410178ec Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Oct 2016 18:30:50 -0700
Subject: Change the behaviour of 'use existing photo for profile'. For a
 channel with one profile, works just as it did previously. For multiple
 profiles, go back to the "upload form" but with a pre-existing file selected
 so that the correct profile can be selected. The text on this page and the
 resulting form are changed to remove the 'upload' text and file selection;
 but falls through to cropping in either case.

---
 view/tpl/profile_photo.tpl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 88e17407b..ca107bfcc 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -9,10 +9,15 @@
 
 		<div id="profile-photo-upload-wrapper">
 
+			{{if $importfile}}
+			<input type="hidden" name="importfile" value="{{$importfile}}">
+			{{else}}
 			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
 			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			{{/if}}
 			<div class="clear"></div>
 
+
 			{{if $single}}
 			<input type="hidden" name="profile" value="{{$profile0.id}}" />
 			{{else}}
-- 
cgit v1.2.3