mail more or less working

5 files changed, 108 insertions, 3 deletions

diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
new file mode 100644
index 000000000..3c26a9c54
--- /dev/null
+++ b/view/mail_conv.tpl
@@ -0,0 +1,15 @@
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="$from_url" class="mail-conv-sender-url" ><img class="mail-conv-sender-photo" src="$from_photo" alt="$from_name" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >$from_name</div>
+		<div class="mail-conv-date">$date</div>
+		<div class="mail-conv-subject">$subject</div>
+		<div class="mail-conv-body">$body</div>
+	</div>
+</div>
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+
+<div class="mail-conv-outside-wrapper-end"></div>
+<hr class="mail-conv-break" />
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
new file mode 100644
index 000000000..dd53d621a
--- /dev/null
+++ b/view/mail_head.tpl
@@ -0,0 +1,9 @@
+<h3>$messages</h3>
+
+<div class="message-links">
+<ul>
+<li><a href="message" class="message-link-inbox">$inbox</a></li>
+<li><a href="message/sent" class="message-link-outbox">$outbox</li>
+<li><a href="message/new" class="message-link-new">$new</li>
+<ul>
+</div>
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index d5a79ef35..ee64f15e0 100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -1,9 +1,13 @@
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
 		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="$from_photo" alt="$from_name" /></a>
+	</div>
+	<div class="mail-list-detail">
 		<div class="mail-list-sender-name" >$from_name</div>
+		<div class="mail-list-date">$date</div>
+		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
 	</div>
-	<div class="mail-list-date">$date</div>
-	<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
 </div>
+<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" ><a href="message/dropconv/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-list-delete-icon-$id" class="mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-list-delete-end"></div>
+
 <div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 64c36b998..cf6ff50ee 100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -4,11 +4,13 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
+$parent
+
 <div id="prvmail-to-label">$to</div>
 $select
 
 <div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" />
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly />
 
 <div id="prvmail-message-label">$yourmessage</div>
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
diff --git a/view/style.css b/view/style.css
index ba5102fd3..6d634b776 100644
--- a/view/style.css
+++ b/view/style.css
@@ -1074,4 +1074,79 @@ input#dfrn-url {
 
 #prvmail-end {
 	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+
+
+
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.message-links ul {
+	list-style-type: none;
+}
+
+.message-links li {
+	margin-top: 10px;
 }
\ No newline at end of file