From 3dd64e7916872d21122c8184abb80eaa5a79a3fc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 23 Feb 2018 13:21:49 -0800
Subject: usability: click your own profile photo to change it instead of
 hunting it down in the profile edit navmenu. We still need work on the 'or
 use a photo from your albums' to use something like the photo selection
 widget in the post editor as you otherwise have to track down the 'use as
 profile photo' entry in the photo detail navmenu instead of just clicking an
 image.

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

(limited to 'view/tpl')

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 0f30e5816..07e6dcc0a 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,6 +1,6 @@
 <div class="vcard h-card">
 	{{if ! $zcard}}
-	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
+	<div id="profile-photo-wrapper">{{if $editmenu}}<a href="profile_photo" title="{{$change_photo}}">{{/if}}<img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}">{{if $editmenu}}</a>{{/if}}</div>
 	{{/if}}
 	{{if $connect}}
 	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-- 
cgit v1.2.3


From 2d91aed183a08a78bc2cc0f3554f3d4c277ae798 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 23 Feb 2018 19:23:17 -0800
Subject: use embed photos javascript widget to select existing photos for
 profile and cover photos

---
 view/tpl/cover_photo.tpl   | 26 ++++++++++++++++++++++++--
 view/tpl/profile_photo.tpl | 29 ++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 4352501ae..28bc7dc24 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -21,9 +21,31 @@
 
 		</form>
 		<br />
-		<br />
 		<div id="profile-photo-link-select-wrapper">
-			{{$select}}
+		{{$select}}
+		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+		</button>
 		</div>
 	</div>
 </div>
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index ca107bfcc..8dc640e35 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -22,6 +22,8 @@
 			<input type="hidden" name="profile" value="{{$profile0.id}}" />
 			{{else}}
 
+
+
 			<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}}
@@ -33,6 +35,8 @@
 			<br />
 			{{/if}}
 
+
+
 			<div id="profile-photo-submit-wrapper">
 				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 			</div>
@@ -40,9 +44,32 @@
 
 		</form>
 		<br />
-		<br />
 		<div id="profile-photo-link-select-wrapper">
 		{{$select}}
+		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+		</button>
 		</div>
 	</div>
 </div>
+
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
-- 
cgit v1.2.3


From 59dafb610d049c8b19a038871fa282231f809c93 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 23 Feb 2018 19:36:46 -0800
Subject: style the 'use existing' button a wee bit

---
 view/tpl/cover_photo.tpl   | 3 +--
 view/tpl/profile_photo.tpl | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 28bc7dc24..f2758b36d 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -22,9 +22,8 @@
 		</form>
 		<br />
 		<div id="profile-photo-link-select-wrapper">
-		{{$select}}
 		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> {{$select}}
 		</button>
 		</div>
 	</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 8dc640e35..04d04d549 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -45,9 +45,8 @@
 		</form>
 		<br />
 		<div id="profile-photo-link-select-wrapper">
-		{{$select}}
 		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> {{$select}}
 		</button>
 		</div>
 	</div>
-- 
cgit v1.2.3


From 7ddf51722cdbe2d69084b7e9597fc6b11aeeb686 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 23 Feb 2018 19:43:05 -0800
Subject: style the buttons even more

---
 view/tpl/cover_photo.tpl   | 4 ++--
 view/tpl/profile_photo.tpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index f2758b36d..7ad4482e4 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -22,8 +22,8 @@
 		</form>
 		<br />
 		<div id="profile-photo-link-select-wrapper">
-		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> {{$select}}
+		<button id="embed-photo-wrapper" class="btn btn-default btn-primary" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+		<i id="embed-photo" class="fa fa-file-image-o"></i> {{$select}}
 		</button>
 		</div>
 	</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 04d04d549..1f468c2e5 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -45,8 +45,8 @@
 		</form>
 		<br />
 		<div id="profile-photo-link-select-wrapper">
-		<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-		<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> {{$select}}
+		<button id="embed-photo-wrapper" class="btn btn-default btn-primary" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+		<i id="embed-photo" class="fa fa-file-image-o"></i> {{$select}}
 		</button>
 		</div>
 	</div>
-- 
cgit v1.2.3