some conv-item restructuring to allow full width elements

5 files changed, 71 insertions, 74 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index e409cf4cf..9b659ea9f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -83,15 +83,6 @@ code {
 	margin-right: 10px;
 }
 
-.wall-item-photo-wrapper {
-	margin-top: 0px;
-	margin-bottom: 20px;
-}
-
-.comment .wall-item-photo-wrapper {
-	margin-bottom: 15px;
-}
-
 .wall-item-wrapper {
 	margin-left:10px;
 }
@@ -171,11 +162,6 @@ a.wall-item-name-link {
 	margin-top: 10px;
 }
 
-.wall-item-tools {
-	width: 100%;
-	margin-top: 10px;
-}
-
 .item-tool {
 	cursor: pointer;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b51fea6cf..59b928ee9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -129,7 +129,7 @@ pre code {
 
 code {
 	font-size: 1em;
-	padding: 5px;
+	padding: 1em;
 	border: 1px solid #ccc;
 	background: #ccc;
 	color: #000;
@@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .profile-match-connect { margin-top: 5px; }
 
 .reshared-content { margin-left: 20px; }
-.shared_header img { margin-right: 10px; }
+.shared_header img {
+	border-radius: $radiuspx;
+	margin-right: 10px;
+}
 
 .tag1 {
     font-size : 0.9em !important;
@@ -1635,39 +1638,39 @@ img.mail-conv-sender-photo {
 
 /* conversation */
 
-.wall-item-title {
-   font-size: $font_size;
+.wall-item-head {
+	padding: 10px 10px 0px 10px;
 }
 
-.hide-comments-outer,
-.thread-wrapper .wall-item-comment-wrapper,
-.wall-item-content-wrapper.comment {
-	margin-left: $comment_indent;
+.wall-item-content {
+	padding: 1em 10px;
+}
+
+.wall-item-tools {
+	padding: 0px 10px 10px 10px;
+}
+
+
+.wall-item-title {
+   font-size: $font_size;
 }
 
 .wall-item-content-wrapper {
 	background-color: $item_colour;
-	padding: 10px;
 	border-top-right-radius: $radiuspx;
 	border-top-left-radius: $radiuspx;
 }
 
 .wall-item-content-wrapper.comment {
 	background-color: $comment_item_colour;
-	border-color: $comment_border_colour;
-	border-style: solid;
-	border-width: 0px 0px 0px 3px;
-	border-radius: 0px;
-	padding: 7px 10px 7px 7px;
 }
 
 .hide-comments-outer {
 	background-color: $comment_item_colour;
-	border-color: $comment_border_colour;
 	border-top-color: #ccc;
 	border-style: solid;
 	border-top-style: dashed;
-	border-width: 1px 0px 0px 3px;
+	border-width: 1px 0px 0px 0px;
 	text-align: center;
 	border-radius: 0px;
 }
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 4f5b69beb..cdc9de489 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -16,8 +16,8 @@
 	{{include file="field_colorinput.tpl" field=$background_image}}
 	{{include file="field_colorinput.tpl" field=$item_colour}}
 	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
-	{{include file="field_colorinput.tpl" field=$comment_border_colour}}
-	{{include file="field_input.tpl" field=$comment_indent}}
+	{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
+	{{*include file="field_input.tpl" field=$comment_indent*}}
 	{{include file="field_input.tpl" field=$body_font_size}}
 	{{include file="field_input.tpl" field=$font_size}}
 	{{include file="field_colorinput.tpl" field=$font_colour}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index dc8064f1a..a9661d9b5 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -8,30 +8,32 @@
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" 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" 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>{{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}}
+					{{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="wall-item-body" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
 						{{if $item.tags}}
@@ -52,6 +54,7 @@
 						</div>
 						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right btn-group pull-right">
@@ -167,6 +170,7 @@
 					{{/foreach}}
 					</div>
 					{{/if}}
+					<div class="clear"></div>
 				</div>
 				<div class="clear"></div>
 			</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 5487d5937..b10f50c13 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -8,30 +8,32 @@
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" 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" 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>{{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}}
+					{{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 conv-list-mode" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-title-end"></div>
 					<div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
 						{{if $item.tags}}
@@ -52,6 +54,7 @@
 						</div>
 						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right btn-group pull-right">
@@ -176,6 +179,7 @@
 						{{/foreach}}
 						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
 				<div class="clear"></div>
 			</div>