listing mail

2 files changed, 15 insertions, 10 deletions

diff --git a/public/assets/js/lib/views/mail/mailbox.js b/public/assets/js/lib/views/mail/mailbox.js
index ac66c4c..199eeee 100644
--- a/public/assets/js/lib/views/mail/mailbox.js
+++ b/public/assets/js/lib/views/mail/mailbox.js
@@ -1,5 +1,5 @@
 var MailboxView = View.extend({
-  el: ".mailbox",
+  el: "#messages",
   
   events: {
   },
@@ -20,27 +20,32 @@ var MailboxView = View.extend({
   
   populate: function(data){
     this.boxlist.load(data.boxes)
-    data.messages.forEach(this.appendMessage.bind(this))
+    data.messages.forEach(function(message){
+      this.appendMessage(message, data.user)
+    }.bind(this))
   },
   
-  parseMessage: function(message){
+  parse: function(message, user){
     var datetime = verbose_date(message.date)
+    var size = hush_size(message.size)
     var id = message.id
 
+    var is_sender = message.sender == user.username
     var t = this.template
-                .replace(/{{id}}/g, thread.id)
-                .replace(/{{username}}/g, thread.username)
-                .replace(/{{subject}}/g, thread.title)
+                .replace(/{{id}}/g, message.id)
+                .replace(/{{to}}/g, is_sender ? "to " : "")
+                .replace(/{{username}}/g, is_sender ? message.recipient : message.sender)
+                .replace(/{{subject}}/g, message.subject)
                 .replace(/{{date}}/g, datetime[0])
                 .replace(/{{time}}/g, datetime[1])
-                .replace(/{{date_class}}/g, carbon_date(thread.lastmodified) )
+                .replace(/{{date_class}}/g, carbon_date(message.lastmodified) )
                 .replace(/{{size}}/g, size[1] )
                 .replace(/{{size_class}}/g, size[0] )
     return t
   },
 
-  appendMessage: function(message){
-    var $row = $( this.parseMessage(message) )
+  appendMessage: function(message, user){
+    var $row = $( this.parse(message, user) )
     this.$el.append($row)
   },
 
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index a5891ff..501108a 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -88,7 +88,7 @@ function hush_size (n, bias, nobold) {
   bias = 1 || bias
   n = n || 0
   if (n < 1024) {
-    return ["quiet", txt + "&nbsp;b."]
+    return ["quiet", n + "&nbsp;b."]
   }
   if (n < 1024*1024) {
     return ["quiet", txt + "&nbsp;kb."]