private mail compositor changes

5 files changed, 68 insertions, 89 deletions

diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index cabfb299f..5fd646765 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,32 +1,3 @@
-/* message/new */
-
-#prvmail-to-label,
-#prvmail-subject-label,
-#prvmail-expires-label,
-#prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-
-#prvmail-upload-wrapper,
-#prvmail-attach-wrapper,
-#prvmail-link-wrapper,
-#prvmail-expire-wrapper,
-#prvmail-encrypt-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	cursor: pointer;
-}
-
-/* message/id */
-
 .mail-conv-sender {
 	float: left;
 	margin-right: 10px;
@@ -49,3 +20,7 @@
 .mail-conv-body img {
 	max-width: 100%;
 }
+
+#prvmail-rotator {
+	margin: 15px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2ff6c1eb4..b51fea6cf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1722,6 +1722,7 @@ img.mail-conv-sender-photo {
 }
 
 .wall-item-content,
+.mail-conv-body,
 .page-body {
 	font-size: $font_size;
 	clear: both;
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 9c0fda483..4f54f1a6a 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -11,6 +11,7 @@
 	<div class="mail-conv-content">
 		<div class="mail-conv-body">
 			{{$mail.body}}
+			<div class="clear"></div>
 		</div>
 		<div class="pull-right dropdown">
 			<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 2119d3b02..593b3652e 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -48,17 +48,6 @@ else
 <script type="text/javascript" src="view/js/ajaxupload.js" ></script>
 <script>
 	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload-wrapper',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}				 
-			}
-		);
 
 		var file_uploader = new window.AjaxUpload(
 			'prvmail-attach-wrapper',
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index a83896f32..c31c311cc 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,56 +1,69 @@
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="mail" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<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}}
+{{if $new}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
 {{/if}}
+		<div id="prvmail-wrapper" >
+			<form id="prvmail-form" action="mail" method="post" >
 
-<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
-<input type="hidden" name="media_str" id="jot-media" value="" />
+				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+				<input type="hidden" name="media_str" id="jot-media" value="" />
 
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+				{{if $new}}
+				<div class="form-group">
+					<label for="recip">{{$to}}</label>
+					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
+					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+				</div>
+				<div class="form-group">
+					<label for="prvmail-subject">{{$subject}}</label>
+					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
+				</div>
+				{{/if}}
 
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea class="prvmail-text form-control" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+				{{if $reply}}
+				<input type="hidden" name="replyto" value="{{$parent}}" />
+				<input type="hidden" name="messageto" value="{{$recphash}}" />
+				<input type="hidden" name="subject" value="{{$subjtxt}}" />
+				{{/if}}
 
+				<div class="form-group">
+					<label for="prvmail-text">{{$yourmessage}}</label>
+					<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea>
+				</div>
 
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<button id="prvmail-upload-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
-	</button> 
-
-	<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
-	</button> 
-
-	<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
-		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
-	</button> 
-	{{if $feature_expire}}
-	<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
-		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
-	</button>
-	{{/if}}
-	{{if $feature_encrypt}}
-	<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
-		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
-	</button> 
-	{{/if}}
-	<div id="prvmail-rotator-wrapper" >
-		<div id="prvmail-rotator"></div>
-	</div> 
-</div>
-<div id="prvmail-end" class="clear"></div>
-</form>
+				<div id="prvmail-submit-wrapper" class="form-group">
+					<div id="prvmail-submit" class="pull-right">
+						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+					</div>
+					<div id="prvmail-tools" class="btn-group pull-left">
+						<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
+							<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
+						</button>
+						<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
+							<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
+						</button>
+						{{if $feature_expire}}
+						<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
+							<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
+						</button>
+						{{/if}}
+						{{if $feature_encrypt}}
+						<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
+							<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
+						</button>
+						{{/if}}
+					</div>
+					<div id="prvmail-rotator-wrapper" class="pull-left">
+						<div id="prvmail-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+{{if $new}}
+	</div>
 </div>
+{{/if}}