summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAamir Khan <syst3m.w0rm@gmail.com>2012-06-24 16:52:23 -0400
committerAamir Khan <syst3m.w0rm@gmail.com>2012-06-24 16:52:23 -0400
commit00f021987e466c67aba3d925a49e2975d0e431b0 (patch)
tree325c5a83211ab659da198effe29f5bdef70875a4
parent8e325c2250b8a7eaa75c2e988cbf7af4e596d0c0 (diff)
downloadhyperkitty-00f021987e466c67aba3d925a49e2975d0e431b0.tar.gz
hyperkitty-00f021987e466c67aba3d925a49e2975d0e431b0.tar.xz
hyperkitty-00f021987e466c67aba3d925a49e2975d0e431b0.zip
Template refactoring: Rating now works on threads and message page
Diffstat
-rw-r--r--templates/base.html7
-rw-r--r--templates/message.html37
-rw-r--r--templates/messages/first_email.html28
-rw-r--r--templates/messages/message.html9
-rw-r--r--templates/thread.html44
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 @@
<!DOCTYPE HTML>
<html>
-
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="ROBOTS" content="INDEX, FOLLOW" />
@@ -41,10 +40,12 @@
{% endblock %}
</div>
<!-- End of Header -->
-
- {% block content %} {% endblock %}
+ <div id="content">
+ {% block content %} {% endblock %}
+ </div>
{% block footer %} {% endblock %}
</body>
+
<script src="{{ STATIC_URL }}/js/libs/jquery-1.7.1.min.js"></script>
{% block additionaljs %} {% endblock %}
</html>
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 %}
- <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
-
+ <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
{% endblock %}
{% block content %}
- <div class="content">
-
- <!-- main section, the email thread -->
<section id="thread_content">
- <!-- Start first email -->
{% include 'messages/first_email.html' with first_mail=message %}
- <!-- End first email -->
-
</section>
- </div> <!-- end of content -->
{% endblock %}
{% block additionaljs %}
+ <script type="text/javascript">
-<script type="text/javascript">
-
-$(document).ready(function() {
- $("#voteup").click(function(){
+ $(document).ready(function() {
+ $(".voteup").click(function(){
+ // @TODO: Extract the message id from the HTML DOM element instead of hard coding it in Javascript.
+ message_id = this.parentElement.getAttribute('messageid');
$.ajax({
type: "POST",
- url: '/vote/{{list_address}}/{{message.message_id}}/',
- data: { vote : 1, messageid : "{{message.message_id}}" , list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
+ url: '/vote/{{list_address}}/',
+ data: { vote : 1, messageid : message_id, list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
success: function(response){
alert(response);
}
@@ -40,11 +31,12 @@ $(document).ready(function() {
return false;
});
- $("#votedown").click(function(){
+ $(".votedown").click(function(){
+ message_id = this.parentElement.getAttribute('messageid');
$.ajax({
type: "POST",
- url: '/vote/{{list_address}}/{{message.message_id}}/',
- data: { vote : -1, messageid : "{{message.message_id}}" , list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
+ url: '/vote/{{list_address}}/',
+ data: { vote : -1, messageid : message_id , list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
success: function(response){
alert(response);
}
@@ -52,8 +44,7 @@ $(document).ready(function() {
return false;
});
-});
-
-</script>
+ });
+ </script>
{% 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 %}
+
<div class="first_email">
- <div class="email_header">
- {% gravatar_img_for_email first_mail.email 40 %}
- <div class="email_author inline-block">
- <span class="name">
- <a href="/message/{{list_address}}/{{first_mail.message_id}}">{{first_mail.sender}}</a>
- </span>
- <br />
- <span class="rank">Rank 10</span>
- </div>
- <div class="email_date inline-block right">
- <span class="date">{{first_mail.date}}</span>
- <br />
- <span class="time"></span>
- </div>
- </div>
- <div id="first_email_body">
- {{first_mail.content}}
- </div>
- <ul class="email_info inline">
- <li class="neutral"> 0</li>
- <li id="voteup"> <a href="#like"> Like</a></li>
- <li id="votedown"> <a href="#dislike"> Dislike</a></li>
- <li class="discussion add_comment"> <a href="#comment"> Add your own comment</a></li>
- </ul>
- </div>
+ {% include 'messages/message.html' with email=first_mail %}
+</div>
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 @@
<div class="email_header">
{% gravatar_img_for_email email.email 40 %}
<div class="email_author inline-block">
+ <span class="name">
<a href="/message/{{list_address}}/{{email.message_id}}">{{email.sender}}</a>
+ </span>
<br />
<span class="rank">Rank 8</span>
</div>
@@ -15,10 +17,9 @@
<div class="email_body">
{{email.content}}
</div>
- <ul class="email_info inline">
+ <ul class="email_info inline" messageid="{{email.message_id}}">
<li class="neutral"> 0</li>
- <li id="voteup"> <a href="#like"> Like</a></li>
- <li id="votedown"> <a href="#dislike"> Dislike</a></li>
- <li class="discussion add_comment"> <a href="#comment"> Add your own comment</a></li>
+ <li class="voteup"> <a href="#like"> Like</a></li>
+ <li class="votedown"> <a href="#dislike"> Dislike</a></li>
</ul>
diff --git a/templates/thread.html b/templates/thread.html
index 7d08701..8ffd5ea 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -37,14 +37,50 @@
-{% block addtionaljs %}
-<script src="{{ STATIC_URL }}jquery.expander.js"></script>
- <script>
+{% block additionaljs %}
+
+ <script src="{{ STATIC_URL }}jquery.expander.js"></script>
+ <script type="text/javascript">
$(document).ready(function() {
$('div.email_body').expander({
userCollapseText: 'View Less',
expandText: 'View More'
});
});
- </script>
+ </script>
+
+
+ <script type="text/javascript">
+
+ $(document).ready(function() {
+ $(".voteup").click(function(){
+ // @TODO: Extract the message id from the HTML DOM element instead of hard coding it in Javascript.
+ message_id = this.parentElement.getAttribute('messageid');
+ $.ajax({
+ type: "POST",
+ url: '/vote/{{list_address}}/',
+ data: { vote : 1, messageid : message_id, list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
+ success: function(response){
+ alert(response);
+ }
+ });
+ return false;
+ });
+
+ $(".votedown").click(function(){
+ message_id = this.parentElement.getAttribute('messageid');
+ $.ajax({
+ type: "POST",
+ url: '/vote/{{list_address}}/',
+ data: { vote : -1, messageid : message_id , list: "{{list_address}}", csrfmiddlewaretoken: '{{ csrf_token }}' },
+ success: function(response){
+ alert(response);
+ }
+ });
+ return false;
+ });
+
+ });
+ </script>
+
{% endblock %}
generated by cgit (git 2.34.1) at 2025-07-04 18:44:11 +0000