From b3fb9eed9ca42f339eca9c6ac8dc6702e57f440a Mon Sep 17 00:00:00 2001
From: fbormann <felipe.bormann@gmail.com>
Date: Mon, 24 Oct 2016 11:29:34 -0300
Subject: [PATCH] added image support #207

---
 app/templates/home_teacher_student_content.html |  2 +-
 core/static/css/base/amadeus.css                |  4 ++++
 core/templates/notifications.html               | 13 +++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/templates/home_teacher_student_content.html b/app/templates/home_teacher_student_content.html
index 3652822..f3b0289 100644
--- a/app/templates/home_teacher_student_content.html
+++ b/app/templates/home_teacher_student_content.html
@@ -7,7 +7,7 @@
   
     <div class="row">
         <div class="col-xs-2 col-md-1">
-            <img class="imgTimeLine" src="{{ notification.user.image_url }}">
+            <img class="imgTimeLine" src="{{ notification.actor.image_url }}">
         </div>
         <div class="col-xs-10 col-md-11">
             <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index fa6fd9d..af7fcc4 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -15,6 +15,10 @@
   width: 300px;
 }
 
+.user-notification-img{
+  width:40%;
+}
+
 /* HEADER */
 
 
diff --git a/core/templates/notifications.html b/core/templates/notifications.html
index b70502e..1dea4c8 100644
--- a/core/templates/notifications.html
+++ b/core/templates/notifications.html
@@ -5,8 +5,13 @@
 		<li>
 	  <a href="{% url 'core:notification_read' notification.id %}"><div class="list-group-item">
 	  <div class="row-picture">
-	    <img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">
-	    <div class="least-content ">{{ notification.datetime }}</div>
+	  {% if notification.actor.image %}
+	  	<img class="circle user-notification-img" src="{{ notification.actor.image.url }}" alt="icon">
+	  {% else %}
+	  	<img class="circle user-notification-img" src="{{ notification.actor.image_url }}" alt="icon">
+	  {% endif %}
+	    
+	    <div class="least-content "> {{ notification.datetime|timesince }} </div>
 	  </div>
 	  <div class="row-content">
 	    <p class="list-group-item-text">{{ notification.message }}</p>
@@ -19,11 +24,11 @@
 	    <a href="{% url 'core:notification_read' notification.id %}">
 	        <div class="list-group-item">
 	          <div class="row-action-primary">
-	            <i class="material-icons">folder</i>
+	            <i class="material-icons"></i>
 	          </div>
 	          <div class="row-content">
 
-	            <div class="least-content pull-right">{{ notification.datetime }}</div>
+	            <div class="least-content pull-right">{{ notification.datetime|timesince }}</div>
 
 	            <p class="list-group-item-text">{{ notification.message }}</p>
 	        </div>
--
libgit2 0.21.2