Merge https://github.com/redmatrix/hubzilla into pending_merge

5 files changed, 33 insertions, 79 deletions

diff --git a/mod/mail.php b/mod/mail.php
index 2e7e3699a..75e8f4dd5 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -313,10 +313,10 @@ function mail_content(&$a) {
 			'id' => $message['id'],
 			'from_name' => $message['from']['xchan_name'],
 			'from_url' =>  chanlink_hash($message['from_xchan']),
-			'from_photo' => $message['from']['xchan_photo_m'],
+			'from_photo' => $message['from']['xchan_photo_s'],
 			'to_name' => $message['to']['xchan_name'],
 			'to_url' =>  chanlink_hash($message['to_xchan']),
-			'to_photo' => $message['to']['xchan_photo_m'],
+			'to_photo' => $message['to']['xchan_photo_s'],
 			'subject' => $message['title'],
 			'body' => smilies(bbcode($message['body']) . $s),
 			'delete' => t('Delete message'),
@@ -353,7 +353,7 @@ function mail_content(&$a) {
 		'$showinputs' => '',
 		'$subject' => t('Subject:'),
 		'$subjtxt' => $message['title'],
-		'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+		'$readonly' => 'readonly="readonly"',
 		'$yourmessage' => t('Your message:'),
 		'$text' => '',
 		'$select' => $select,
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 11affffbd..f0f4458fa 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,26 +1,3 @@
-/* message */
-
-#mail-list-wrapper {
-	border-top: 1px solid #ccc;
-	padding: 5px 5px 5px 5px;
-}
-
-span.mail-list {
-	float: left;
-	width: 20%;
-}
-
-img.mail-list-sender-photo {
-	height: 24px;
-	width: 24px;
-	float: left;
-	margin-right: 30px;
-}
-
-.mail-list-remove {
-	width: 5% !important;
-}
-
 /* message/new */
 
 #prvmail-to-label,
@@ -48,49 +25,26 @@ img.mail-list-sender-photo {
 	cursor: pointer;
 }
 
-#prvmail-end {
-	clear: both;
-}
-
 /* message/id */
 
 .mail-conv-outside-wrapper {
-	margin-top: 30px;
+	display: table;
+	table-layout: fixed;
 }
 
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-.mail-conv-recall-wrapper {
-	float: right;
+.mail-conv-sender {
+	display: table-cell;
+	vertical-align: top;
 	margin-right: 10px;
-	margin-top: 15px;
-	margin-bottom: 5px;
 }
 
-.mail-conv-outside-wrapper-end {
-	clear: both;
+.mail-conv-sender-name {
+	font-weight: bold;
 }
 
-.mail-conv-break {
-	clear: both;
+.mail-conv-detail {
+	display: table-cell;
+	vertical-align: top;
+	width: 100%;
+	padding-left: 10px;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index efb5b39ba..2ff6c1eb4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1565,9 +1565,9 @@ th,td {
 	overflow: hidden;
 }
 	
-/* message */
+/* mail */
 
-img.mail-list-sender-photo {
+img.mail-conv-sender-photo {
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
 }
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index ec8f8c1e3..0a5e5a2c5 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,18 +1,18 @@
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
-		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
 	</div>
-	<div class="mail-conv-detail" >
+	<div class="mail-conv-detail">
 		{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+		<div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
 		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
-	{{if $mail.can_recall}}
-	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
-	{{/if}}
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
+		<div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
+			{{if $mail.can_recall}}
+			<a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
+			{{/if}}
+			<a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
+		</div>
+	</div>
+	<div class="clear"></div>
 </div>
-<hr class="mail-conv-break" />
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index c6f393aa4..a83896f32 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -8,7 +8,7 @@
 <div id="prvmail-to-label">{{$to}}</div>
 
 {{if $showinputs}}
-<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" tabindex="10" />
 <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
 {{$select}}
@@ -18,10 +18,10 @@
 <input type="hidden" name="media_str" id="jot-media" value="" />
 
 <div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
 <div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+<textarea class="prvmail-text form-control" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
 <div id="prvmail-submit-wrapper" >
@@ -51,6 +51,6 @@
 		<div id="prvmail-rotator"></div>
 	</div> 
 </div>
-<div id="prvmail-end"></div>
+<div id="prvmail-end" class="clear"></div>
 </form>
 </div>