summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-22 21:57:42 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-22 21:57:42 -0500
commit9db263edfed889969c64fb103b125be78ba2a62f (patch)
tree2d5d2a51e8456183606008018e49c9e71cc67c77 /templates
parentcd5d1978ba9f2a0dfdd9a59bfef51669863de6f1 (diff)
downloadaskbot-9db263edfed889969c64fb103b125be78ba2a62f.tar.gz
askbot-9db263edfed889969c64fb103b125be78ba2a62f.tar.bz2
askbot-9db263edfed889969c64fb103b125be78ba2a62f.zip
fixed broken links in few places, added Arvyd's modification of user_reputation view, email sender cron job, some edits in INSTALL file
Diffstat (limited to 'templates')
-rw-r--r--templates/content/js/com.cnprog.post.js2
-rw-r--r--templates/content/style/style.css5
-rw-r--r--templates/question.html26
-rw-r--r--templates/user_reputation.html3
-rw-r--r--templates/user_votes.html5
5 files changed, 20 insertions, 21 deletions
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 58db9b33..0e604b8f 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -290,7 +290,7 @@ var Vote = function(){
fav.text(data.count);
}
else if(data.success == "1"){
- object.attr("src", $.i18n._("/") + "/content/images/vote-favorite-on.png");
+ object.attr("src", $.i18n._("/") + "content/images/vote-favorite-on.png");
var fav = getFavoriteNumber();
fav.text(data.count);
fav.addClass("my-favorite-number");
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 65a323db..6c1d6a3f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -163,7 +163,7 @@ blockquote
border-right:1px solid #b4b48e;
border-bottom:1px solid #b4b48e;*/
background: white;/* #f9f7ed;*/
- margin:10px 0 0 0;
+ margin:10px 0 10px 0;
/*background:url(../images/quest-bg.gif) repeat-x top;*/
}
#listA .qstA thumb {float:left; }
@@ -1144,9 +1144,6 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
.message p {
margin-bottom:0px;
}
-.message p.space-above {
- margin-top:10px;
-}
.warning{color:red;}
.darkred{color:darkred;}
diff --git a/templates/question.html b/templates/question.html
index 6929b762..9183767f 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -140,10 +140,6 @@
<span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
{% endif %}
{% separator %}
- {% if request.user|can_delete_post:question %}
- <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
- {% endif %}
- {% separator %}
{% if question.closed %}
{% if request.user|can_reopen_question:question %}
<span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
@@ -163,6 +159,10 @@
{% endif %}
</span>
{% endif %}
+ {% separator %}
+ {% if request.user|can_delete_post:question %}
+ <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
+ {% endif %}
{% endjoinitems %}
</div>
<div class="post-update-info-container">
@@ -294,15 +294,6 @@
<span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>
{% endif %}
{% separator %}
- {% if request.user|can_delete_post:answer %}
- {% spaceless %}
- <span class="action-link">
- <a id="answer-delete-link-{{answer.id}}">
- {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
- </span>
- {% endspaceless %}
- {% endif %}
- {% separator %}
{% if request.user|can_flag_offensive %}
<span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag"
title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
@@ -312,6 +303,15 @@
{% endif %}
</span>
{% endif %}
+ {% separator %}
+ {% if request.user|can_delete_post:answer %}
+ {% spaceless %}
+ <span class="action-link">
+ <a id="answer-delete-link-{{answer.id}}">
+ {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
+ </span>
+ {% endspaceless %}
+ {% endif %}
{% endjoinitems %}
</div>
<div class="post-update-info-container">
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index 29d642fe..16127140 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -1,6 +1,7 @@
{% extends "user.html" %}
<!-- user_reputation.html -->
{% load extra_tags %}
+{% load extra_filters %}
{% load humanize %}
{% block userjs %}
<script type='text/javascript' src='{% href "/content/js/excanvas.pack.js" %}'></script>
@@ -33,7 +34,7 @@
<div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
</div>
- <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>
+ <a href="{% url question rep.question_id %}{{ rep.title|slugify }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>
</p>
{% endfor %}
</div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 4abbf46d..b72b3ef6 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -1,6 +1,7 @@
{% extends "user.html" %}
<!-- user_votes.html -->
{% load extra_tags %}
+{% load extra_filters %}
{% load humanize %}
{% load i18n %}
@@ -18,9 +19,9 @@
</div>
<div style="float:left;overflow:hidden;width:750px">
{% ifequal vote.answer_id 0 %}
- <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
+ <span class="question-title-link"><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}">{{ vote.title }}</a></span>
{% else %}
- <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
+ <span class="answer-title-link" ><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
{% endifequal %}
<div style="height:5px"></div>
</div>