mail qa

4 files changed, 16 insertions, 6 deletions

diff --git a/public/assets/css/bucky.css b/public/assets/css/bucky.css
index cab7caa..d203c97 100644
--- a/public/assets/css/bucky.css
+++ b/public/assets/css/bucky.css
@@ -228,7 +228,6 @@ table, tr {
   padding-right: 4px;
 }
 .ledger .row td:nth-child(1) a {
-  margin-left: 10px;
   color: #444;
   text-decoration: none;
 }
@@ -467,6 +466,7 @@ pre br {
   min-width: 50px;
 }
 #compose textarea {
+  margin-top: 5px;
   margin-left: 50px;
 }
 #compose input[name=subject] {
@@ -794,11 +794,14 @@ pre br {
 #message {
   text-align: left;
   max-width: 500px;
-  margin: 0 auto;
+  margin-top: 10px;
 }
 #message .av {
   float: left;
-  margin-right: 10px;
+  margin: 4px 8px 4px 4px;
+  width: 40px;
+  height: 40px;
+  background: #fff;
 }
 #message span {
   display: inline-block;
@@ -808,6 +811,7 @@ pre br {
 #message .subject {
   font-weight: bold;
   font-size: 15px;
+  display: block;
 }
 #message hr {
   clear: both;
diff --git a/public/assets/js/lib/router.js b/public/assets/js/lib/router.js
index 1419e81..388bdac 100644
--- a/public/assets/js/lib/router.js
+++ b/public/assets/js/lib/router.js
@@ -17,7 +17,8 @@ var SiteRouter = Router.extend({
 		"/mail/:mailbox":          'mailbox',
 		"/mail/compose":           'compose',
 		"/mail/compose/:username": 'compose',
-		"/message/:id":            'message',
+		"/mail/read/:id":          'message',
+		"/mail/reply/:id":         'compose',
 		"/comment/:id/edit":       'editComment',
 		"/profile":                'profile',
 		"/profile/:username":      'profile',
diff --git a/public/assets/js/lib/views/mail/compose.js b/public/assets/js/lib/views/mail/compose.js
index 2c76b3f..b3e302e 100644
--- a/public/assets/js/lib/views/mail/compose.js
+++ b/public/assets/js/lib/views/mail/compose.js
@@ -5,7 +5,7 @@ var ComposeView = FormView.extend({
   events: {
   },
   
-  action: "",
+  action: "/api/mail/send",
   
   initialize: function(){
     this.__super__.initialize.call(this)
diff --git a/public/assets/js/lib/views/mail/message.js b/public/assets/js/lib/views/mail/message.js
index da5e1b4..19293e5 100644
--- a/public/assets/js/lib/views/mail/message.js
+++ b/public/assets/js/lib/views/mail/message.js
@@ -10,7 +10,12 @@ var MessageView = View.extend({
 
   load: function(name){
     name = sanitize(name) || "inbox"
-    $.get(this.action + name, this.populate.bind(this))
+    $.ajax({
+      url: this.action + name,
+      method: 'get',
+      success: this.populate.bind(this),
+      error: app.router.error404
+    })
   },
   
   populate: function(data){