X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fphoto_view.tpl;h=e540a03f90fe7412b248f69b17d58e24d9ca7027;hb=5a929c587f69ba98a0f5d6f28cf3d209edc9bca0;hp=fd47097a5c03ae5dfb39b49f314cae734d0196b5;hpb=d39b0584f0bebe3f5e8b9f84593985074d69e04d;p=friendica.git

diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index fd47097a5c..e540a03f90 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -3,23 +3,37 @@
 {{* "live-photos" is needed for js autoupdate *}}
 <div id="live-photos"></div>
 
-<div id="photo-view-{{$id}}" class="general-content-wrapper">
-	<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
-
-	<div id="photo-edit-link-wrap">
+<div id="photo-view-{{$id}}" class="generic-page-wrapper">
+	<div class="pull-left" id="photo-edit-link-wrap">
+		<a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1|escape}}" data-toggle="tooltip">
+			<i class="fa fa-folder-open"></i>&nbsp;{{$album.1}}
+		</a>
+	</div>
+	<div class="pull-right" id="photo-edit-link-wrap">
 		{{if $tools}}
-		<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-		|
-		<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1|escape}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-pencil"></i>
+		</a>
+		<span class="icon-padding"> </span>
+		<a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1|escape}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-user"></i>
+		</a>
+		{{/if}}
+		{{if $lock}}
+		<span class="icon-padding"> </span>
+		<a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock|escape}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-lock"></i>
+		</a>
 		{{/if}}
-		{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 	</div>
+	<div class="clear"></div>
 
 	<div id="photo-view-wrapper">
 		<div id="photo-photo">
 			{{* The photo *}}
 			<div class="photo-container">
-				<a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$photo.filename}}"/></a>
+				<a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" alt="{{$photo.filename|escape}}"/></a>
 			</div>
 
 			{{* Overlay buttons for previous and next photo *}}
@@ -37,12 +51,19 @@
 
 		{{* Tags and mentions *}}
 		{{if $tags}}
-		<div id="photo-tags">{{$tags.1}}</div>
+		<div id="photo-tags">{{$tags.title}}
+			{{foreach $tags.tags as $t}}
+			<span class="category label btn-success sm">
+				<span class="p-category">{{$t.name|escape}}</span>
+				{{if $t.removeurl}} <a href="{{$t.removeurl}}">(X)</a> {{/if}}
+			</span>
+			{{/foreach}}
+		</div>
 		{{/if}}
 
-		{{if $tags.2}}
+		{{if $tags.removeanyurl}}
 		<div id="tag-remove">
-			<a href="{{$tags.2}}">{{$tags.3}}</a>
+			<a href="{{$tags.removeanyurl}}">{{$tags.removetitle}}</a>
 		</div>
 		{{/if}}
 
@@ -53,7 +74,7 @@
 		<div id="photo-like-div">
 			{{$likebuttons}}
 			{{$like}}
-			{{$dislike}}	
+			{{$dislike}}
 		</div>
 		{{/if}}
 		<hr>