Skip to content

Commit

Permalink
Fixes #3
Browse files Browse the repository at this point in the history
Changed showMessage to hide the inbox and show more info.
coercion committed Sep 15, 2013
1 parent fd69215 commit c982c28
Showing 4 changed files with 49 additions and 11 deletions.
3 changes: 3 additions & 0 deletions compose.php
Original file line number Diff line number Diff line change
@@ -19,4 +19,7 @@
<br />
<button onClick="sendMessage()">Send</button>
</form>
<div id="send_complete" style="display:none; padding: 10px;">
Message sent!
</div>
</div>
11 changes: 7 additions & 4 deletions mailbox.php
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ function getMessages($userid, $num)
{
?>

<li onclick="showMessage(<?php print $message['id']; ?>)">
<li onclick="showMessage(<?php print $message['id']; print ',\''; print $message['from']; print '\',\''; print $message['subject']; print '\',\''; print $message['timestamp']; print '\''; ?>)">
<span class="mailbox_controls">
<input type="checkbox" />
</span>
@@ -81,7 +81,10 @@ function getMessages($userid, $num)
<?php
}
?>

<div id="messagebox">

</div>
<div id="messagebox">
<div id="message_subject">Subject</div>
<div id="message_date">Date</div>
<div id="message_from">[email protected]</div>
<div id="message_content"></div>
</div>
28 changes: 27 additions & 1 deletion smail.css
Original file line number Diff line number Diff line change
@@ -153,7 +153,6 @@ ul.mailbox li {
padding: 5px 4px;
background: rgba(150,150,150,0.2);
cursor: pointer;
#border-top: 1px solid #D5d5d5;
font-size: 0.9em;
}

@@ -192,6 +191,33 @@ ul.mailbox li:hover {
text-align: right;
}

#messagebox {
display: none;
margin: 1px 0;
border-top: solid 1px rgba(100,50,0,0.8);
}

#message_subject {
float: left;
font-weight: bold;
margin: 0 0 5px 0;
}

#message_from {
clear: both;
color: #555;
}

#message_date {
color: #555;
float: left;
margin: 0px 0 0 20px;
}

#message_content {
clear:both;
padding: 20px 0;
}

#footer {
clear: both;
18 changes: 12 additions & 6 deletions smail.js
Original file line number Diff line number Diff line change
@@ -92,15 +92,19 @@ function determineEncStatus()

}

function showMessage(id)
function showMessage(id, from, subject, date)
{
$.ajax({
url: "api_handler.php",
data: {method: "get_message", id: id}
}).done(function (data) {

document.getElementById("messagebox").textContent = rsaDecrypt(openpgp.keyring.exportPrivateKey(0).armored, data);
});
}).done(function (data) {
$(".mailbox").hide();
document.getElementById("messagebox").style.display = "block";
document.getElementById("message_subject").textContent = subject;
document.getElementById("message_from").textContent = from;
document.getElementById("message_date").textContent = date;
document.getElementById("message_content").textContent = rsaDecrypt(openpgp.keyring.exportPrivateKey(0).armored, data);
});
}

function sendMessage()
@@ -126,7 +130,9 @@ function sendMessage()
data: {email: email, subject: subject, message: encmessage, post: post}
}).done(function (data) {
document.getElementById("composeform").reset();
});
document.getElementById("composeform").style.display = 'none';
document.getElementById("send_complete").style.display = 'block';
});
}

function logOff()

0 comments on commit c982c28

Please sign in to comment.