Merge branch 'dev' into oauth2

4 files changed, 55 insertions, 7 deletions

diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 468f2febc..307dc8956 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,14 +1,15 @@
 <div class="section-title-wrapper">
-	{{if $actionspanel}}
 	<div class="pull-right">
 		<a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-list-ul{{else}}fa-table{{/if}}"></i></a>
+		{{if $actionspanel}}
 		{{if $is_owner}}
 		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
 		{{/if}}
 		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
 		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
+		{{/if}}
 	</div>
-	{{/if}}
+
 	<h2>{{$header}}</h2>
 	<div class="clear"></div>
 </div>
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 4352501ae..7ad4482e4 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -21,9 +21,30 @@
 
 		</form>
 		<br />
-		<br />
 		<div id="profile-photo-link-select-wrapper">
-			{{$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>
 </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..1f468c2e5 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,31 @@
 
 		</form>
 		<br />
-		<br />
 		<div id="profile-photo-link-select-wrapper">
-		{{$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>
 </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_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>