From 00f021987e466c67aba3d925a49e2975d0e431b0 Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Sun, 24 Jun 2012 16:52:23 -0400 Subject: Template refactoring: Rating now works on threads and message page --- templates/base.html | 7 +++--- templates/message.html | 37 ++++++++++++------------------- templates/messages/first_email.html | 28 +++-------------------- templates/messages/message.html | 9 ++++---- templates/thread.html | 44 +++++++++++++++++++++++++++++++++---- 5 files changed, 66 insertions(+), 59 deletions(-) diff --git a/templates/base.html b/templates/base.html index 48d4809..3d51c0d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,5 @@ - @@ -41,10 +40,12 @@ {% endblock %} - - {% block content %} {% endblock %} +
+ {% block content %} {% endblock %} +
{% block footer %} {% endblock %} + {% block additionaljs %} {% endblock %} diff --git a/templates/message.html b/templates/message.html index 13a267f..70aa67e 100644 --- a/templates/message.html +++ b/templates/message.html @@ -1,38 +1,29 @@ {% extends "base.html" %} {% load gravatar %} -{% block title %}{{ app_name }}{% endblock %} - {% block additional_stylesheets %} - - + {% endblock %} {% block content %} -
- -
- {% include 'messages/first_email.html' with first_mail=message %} - -
-
{% endblock %} {% block additionaljs %} + + }); + {% endblock %} diff --git a/templates/messages/first_email.html b/templates/messages/first_email.html index a51adab..593b237 100644 --- a/templates/messages/first_email.html +++ b/templates/messages/first_email.html @@ -1,27 +1,5 @@ {% load gravatar %} +
- -
- {{first_mail.content}} -
- -
+ {% include 'messages/message.html' with email=first_mail %} + diff --git a/templates/messages/message.html b/templates/messages/message.html index 67786e3..e104248 100644 --- a/templates/messages/message.html +++ b/templates/messages/message.html @@ -3,7 +3,9 @@
{% gravatar_img_for_email email.email 40 %} @@ -15,10 +17,9 @@ -