allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.

6 files changed, 104 insertions, 85 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9b659ea9f..d72315fc2 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -77,6 +77,10 @@ code {
 
 /* conv_item */
 
+.wall-photo-item img {
+	width: 100%;
+}
+
 .wall-item-info {
 	display: block;
 	float: left;
@@ -144,22 +148,8 @@ a.wall-item-name-link {
 	word-wrap: break-word;
 }
 
-.body-tag, .filesavetags, .categorytags {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-}
-
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.body-tag {
-	margin-top: 10px;
-}
-
-.categorytags {
-	margin-top: 10px;
+.body-tags {
+	margin-top: 5px;
 }
 
 .item-tool {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 59b928ee9..b25ca333b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1529,22 +1529,6 @@ a .drop-icons:hover {
 	margin-right: 10px;
 	color: #FF0000;
 }
- 
-.attachlink {
-	float: left;
-	border: 1px solid black;
-	padding: 5px;
-	margin-right: 8px;
-}
-
-.attach-icons {
-	font-size: 1.4em;
-}
-
-.attach-clip {
-	margin-right: 3px;
-	font-size: 1.8em;
-}
 
 #menulist {
 	list-style-type: none;
@@ -1646,13 +1630,17 @@ img.mail-conv-sender-photo {
 	padding: 1em 10px;
 }
 
+.wall-photo-item {
+	padding: 10px 0px;
+}
+
 .wall-item-tools {
 	padding: 0px 10px 10px 10px;
 }
 
 
 .wall-item-title {
-   font-size: $font_size;
+	font-size: $font_size;
 }
 
 .wall-item-content-wrapper {
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index a9661d9b5..5bac5b412 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -33,29 +33,42 @@
 					</div>
 					<div class="clear"></div>
 				</div>
-				<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
+				<div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
 					<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
-						{{if $item.tags}}
-						<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-						</div>
-						{{/if}}
-						{{if $item.has_cats}}
-						<div class="categorytags">
-							<span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
-							{{if $item.has_folders}}
-						<div class="filesavetags">
-							<span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
 					</div>
 					<div class="clear"></div>
 				</div>
+				{{if $item.has_tags}}
+				<div class="wall-item-tools">
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+					{{if $item.attachments}}
+					<div class="body-tags" id="item-attachments">
+						<span class='tag'>{{$item.attachments}}</span>
+					</div>
+					{{/if}}
+					<div class="clear"></div>
+				</div>
+				{{/if}}
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right btn-group pull-right">
 						{{if $item.like}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index eeea25967..7638f39e7 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,8 +1,5 @@
-<div class="clear"></div>
 {{if $attaches}}
-<div class="body-attach">
-	{{foreach $attaches as $a}}
-	<a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a>
-	{{/foreach}}
-</div>
+{{foreach $attaches as $a}}
+<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+{{/foreach}}
 {{/if}}
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
index ec2639a6f..eea0e0b8f 100644
--- a/view/tpl/item_categories.tpl
+++ b/view/tpl/item_categories.tpl
@@ -1,7 +1,7 @@
 {{if $categories}}
 <div class="categorytags">
 {{foreach $categories as $cat}}
-<span class="item-category"><i class="icon-asterisk cat-icons"></i>&nbsp;{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+<span class="item-category"><i class="icon-asterisk cat-icons"></i>{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
 {{/foreach}}
 </div>
 {{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 256443b84..003dae993 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -2,33 +2,68 @@
 	<a name="{{$item.id}}" ></a>
 	<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
-			<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}" >
-				<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+			<div class="wall-item-head">
+				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+					</div>
+					<div class="wall-item-photo-end" style="clear:both"></div>
 				</div>
-				<div class="wall-item-photo-end" style="clear:both"></div>
-			</div>
-			{{if $item.title}}
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div>
-			{{/if}}
-			{{if $item.lock}}
-			<div class="wall-item-lock dropdown">
-				<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
-			</div>
-			{{/if}}
-			<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-			</div>
-			<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-				{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				{{if $item.title}}
+				<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+				<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+				</div>
+				{{/if}}
+				{{if $item.lock}}
+				<div class="wall-item-lock dropdown">
+					<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+				</div>
+				{{/if}}
+				<div class="wall-item-author">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+					{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				</div>
+				<div class="clear"></div>
 			</div>
-			<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-				<div class="wall-item-title-end"></div>
+			<div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
 				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
 					{{$item.body}}
 				</div>
+				<div class="clear"></div>
 			</div>
-				<div class="wall-item-tools">
+			{{if $item.has_tags}}
+			<div class="wall-item-tools">
+				{{if $item.mentions}}
+				<div class="body-tags" id="item-mentions">
+					<span class="tag">{{$item.mentions}}</span>
+				</div>
+				{{/if}}
+				{{if $item.tags}}
+				<div class="body-tags" id="item-tags">
+					<span class="tag">{{$item.tags}}</span>
+				</div>
+				{{/if}}
+				{{if $item.categories}}
+				<div class="body-tags" id="item-categories">
+					<span class="tag">{{$item.categories}}</span>
+				</div>
+				{{/if}}
+				{{if $item.folders}}
+				<div class="body-tags" id="item-folders">
+					<span class="tag">{{$item.folders}}</span>
+				</div>
+				{{/if}}
+				{{if $item.attachments}}
+				<div class="body-tags" id="item-attachments">
+					<span class='tag'>{{$item.attachments}}</span>
+				</div>
+				{{/if}}
+				<div class="clear"></div>
+			</div>
+			{{/if}}
+			<div class="wall-item-tools">
 				<div class="wall-item-tools-right btn-group pull-right">
 					<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
 						<i class="icon-caret-down"></i>
@@ -39,16 +74,12 @@
 						{{/if}}
 						{{if $item.drop.dropping}}
 						<li role="presentation" class="divider"></li>
-						<li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
+						<li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
 						{{/if}}
 					</ul>
 				</div>
+				<div class="clear"></div>
 			</div>
-			{{* we dont' use this do we?
-			{{if $item.drop.pagedrop}}
-			<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
-			{{/if}}
-			*}}
 			<div class="clear"></div>
 		</div>
 		<div class="wall-item-wrapper-end"></div>