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

diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index fd47097a5c..de45eecff0 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -3,17 +3,47 @@
 {{* "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">
-		{{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>
-		{{/if}}
-		{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+<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}}" 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}}
+	{{if $tools.view}}
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.view.0}}" title="{{$tools.view.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-image"></i>
+		</a>
+	{{/if}}
+	{{if $tools.edit}}
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-pencil"></i>
+		</a>
+	{{/if}}
+	{{if $tools.delete}}
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.delete.0}}" title="{{$tools.delete.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-trash"></i>
+		</a>
+	{{/if}}
+	{{if $tools.profile}}
+		<span class="icon-padding"> </span>
+		<a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-user"></i>
+		</a>
+	{{/if}}
+	{{if $tools.lock}}
+		<span class="icon-padding"> </span>
+		<a id="photo-lock-link" onclick="lockview(event, 'photo', {{$id}});" title="{{$tools.lock}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-lock"></i>
+		</a>
+	{{/if}}
+{{/if}}
+	</div>
+	<div class="clear"></div>
 
 	<div id="photo-view-wrapper">
 		<div id="photo-photo">
@@ -33,36 +63,45 @@
 
 		<div id="photo-photo-end"></div>
 		{{* The photo description *}}
-		<div id="photo-caption">{{$desc}}</div>
+		<div id="photo-caption">{{$desc nofilter}}</div>
 
 		{{* 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 nofilter}}</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}}
 
 		{{* The part for editing the photo - only available for the edit subpage *}}
-		{{if $edit}}{{$edit}}{{/if}}
+		{{if $edit}}{{$edit nofilter}}{{/if}}
 
 		{{if $likebuttons}}
 		<div id="photo-like-div">
-			{{$likebuttons}}
-			{{$like}}
-			{{$dislike}}	
+			{{$likebuttons nofilter}}
+			{{$like nofilter}}
+			{{$dislike nofilter}}
 		</div>
 		{{/if}}
 		<hr>
 	</div>
 
+{{if !$edit}}
 	{{* Insert the comments *}}
 	<div id="photo-comment-wrapper-{{$id}}" class="photo-comment-wrapper">
-		{{$comments}}
+		{{$comments nofilter}}
 	</div>
 
-	{{$paginate}}
+	{{$paginate nofilter}}
+{{/if}}
 </div>