Merge branch 'master' of ghghgh.us:bucky3

2 files changed, 7 insertions, 6 deletions

diff --git a/public/assets/js/lib/views/mail/message.js b/public/assets/js/lib/views/mail/message.js
index c765b0a..4b25f5f 100644
--- a/public/assets/js/lib/views/mail/message.js
+++ b/public/assets/js/lib/views/mail/message.js
@@ -1,13 +1,13 @@
 var MessageView = View.extend({
 
   el: "#message",
-  
+
   events: {
     'click .discard_link': 'discard',
   },
 
   action: '/api/message/',
-  
+
   initialize: function(){
     this.template = this.$(".template").html()
   },
@@ -21,12 +21,12 @@ var MessageView = View.extend({
       error: app.router.error404
     })
   },
-  
+
   populate: function(data){
     this.parse(data)
     $("body").removeClass('loading')
   },
-  
+
   parse: function(data){
     var message = data.message
 //     var user = data.user
@@ -39,6 +39,7 @@ var MessageView = View.extend({
     var t = this.template
                 .replace(/{{id}}/g, message.id)
                 .replace(/{{sender}}/g, message.sender)
+                .replace(/{{avatar}}/g, profile_image(message.sender))
                 .replace(/{{subject}}/g, message.subject)
                 .replace(/{{date}}/g, datetime[0])
                 .replace(/{{time}}/g, datetime[1])
@@ -49,7 +50,7 @@ var MessageView = View.extend({
     }
     this.$el.empty().append($t)
   },
-  
+
   discard: function(e){
     var id = $(e.target).data('id')
     var ok = confirm("Really delete this message?")
diff --git a/views/pages/message.ejs b/views/pages/message.ejs
index f6399e7..93987b4 100644
--- a/views/pages/message.ejs
+++ b/views/pages/message.ejs
@@ -7,7 +7,7 @@
 
 <div class="bluebox" id="message">
   <script class="template" type="text/html">
-    <a href="/profile/{{sender}}" class="av" style="background-image:url(/data/profile/{{sender}}.jpg);"></a>
+    <a href="/profile/{{sender}}" class="av" style="background-image:url({{avatar}});"></a>
     <span class="subject">{{subject}}</span>
     <span class="sender">
       sent by