From 6f8d29ad8076fc53019739cdc9afa3d15d250d8e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 22 Oct 2015 10:52:10 +0200
Subject: move photo object stuff from itemObject to prepare_body() so we can
 do more stuff with it

---
 view/css/conversation.css         | 5 -----
 view/theme/redbasic/css/style.css | 5 ++++-
 view/tpl/conv_item.tpl            | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index ecdf9dc2f..6f1d4b899 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -77,11 +77,6 @@ code {
 
 /* conv_item */
 
-.wall-photo-item {
-	display: table;
-	margin: 0px auto;
-}
-
 .wall-item-info {
 	display: block;
 	float: left;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e079af4da..d90e9e7c8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1621,6 +1621,10 @@ img.mail-conv-sender-photo {
 }
 
 /* conversation */
+.nsfw-wrap {
+	text-align: center;
+	font-size: $body_font_size;
+}
 
 .wall-item-head {
 	padding: 10px 10px 0.5em 10px;
@@ -1762,7 +1766,6 @@ img.mail-conv-sender-photo {
 
 .divgrow-showmore:hover {
 	border-top: 1px dashed #adadad;
-	text-decoration: underline;
 }
 
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 0a6622fa4..e6e9d880e 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -33,9 +33,9 @@
 					</div>
 					<div class="clear"></div>
 				</div>
-				{{if $item.is_photo}}
+				{{if $item.photo}}
 				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-					<a href="{{$item.photo.link}}"><img style="max-width:{{$item.photo.width}}px; width:100%; height:auto;" src={{$item.photo.url}}></a>
+					{{$item.photo}}
 				</div>
 				{{/if}}
 				{{if $item.body}}
-- 
cgit v1.2.3