summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholyantony2015-03-26 11:31:05 +0530
committerholyantony2015-03-26 11:31:05 +0530
commitad9f4ac915d8f74b02298c93ff2b24782c661e98 (patch)
tree7f3af86d533cd7edc835a371c93ef0d56843d214
parentbaae6fb32e0e2f961159297e1eb895ec7f7c77f2 (diff)
downloadFOSSEE-Forum-ad9f4ac915d8f74b02298c93ff2b24782c661e98.tar.gz
FOSSEE-Forum-ad9f4ac915d8f74b02298c93ff2b24782c661e98.tar.bz2
FOSSEE-Forum-ad9f4ac915d8f74b02298c93ff2b24782c661e98.zip
Subject:Email redirection to http://forums.fossee.in/ in view
Description: 1. Updated main.css
-rw-r--r--static/website/css/main.css2
-rw-r--r--static/website/templates/user-answers.html2
-rw-r--r--website/views.py20
3 files changed, 12 insertions, 12 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css
index 171503d..7d9f533 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -310,7 +310,7 @@ table .question a{
.my-answer {
position: relative;
margin: 10px auto;
- padding: 15px;
+ padding: 10px;
border-left: 2px solid #424242;
background: #f7f7f7;
}
diff --git a/static/website/templates/user-answers.html b/static/website/templates/user-answers.html
index 34a1c68..86cbd0a 100644
--- a/static/website/templates/user-answers.html
+++ b/static/website/templates/user-answers.html
@@ -7,7 +7,7 @@
<span class="body">
<a href="{% url 'website:get_question' answer.question.id %}#answer{{ answer.id }}">{{ answer.body|safe }}</a>
</span>
- <br>
+
<span class="date">
<small>
Replied on:
diff --git a/website/views.py b/website/views.py
index c30106c..ca5b793 100644
--- a/website/views.py
+++ b/website/views.py
@@ -106,7 +106,7 @@ def question_answer(request,qid):
""".format(
user.username,
question.title,
- 'http://forums.spoken-tutorial.org/question/' + str(question.id) + "#answer" + str(answer.id)
+ 'http://forums.fossee.in/question/' + str(question.id) + "#answer" + str(answer.id)
)
email = EmailMultiAlternatives(
@@ -165,10 +165,10 @@ def answer_comment(request):
A comment has been posted on your answer.<br>
Link: {1}<br><br>
Regards,<br>
- Spoken Tutorial Forums
+ FOSSEE Forums
""".format(
user.username,
- "http://forums.spoken-tutorial.org/question/" + str(answer.question.id) + "#answer" + str(answer.id)
+ "http://forums.fossee.in/question/" + str(answer.question.id) + "#answer" + str(answer.id)
)
forums_mail(user.email, subject, message)
# notifying other users in the comment thread
@@ -192,10 +192,10 @@ def answer_comment(request):
A reply has been posted on your comment.<br>
Link: {1}<br><br>
Regards,<br>
- Spoken Tutorial Forums
+ FOSSEE Forums
""".format(
user.username,
- "http://forums.spoken-tutorial.org/question/" + str(answer.question.id) + "#answer" + str(answer.id)
+ "http://forums.fossee.in/question/" + str(answer.question.id) + "#answer" + str(answer.id)
)
forums_mail(user.email, subject, message)
@@ -251,7 +251,7 @@ def new_question(request):
# Sending email when a new question is asked
subject = 'New Forum Question'
message = """
- The following new question has been posted in the Spoken Tutorial Forum: <br>
+ The following new question has been posted in the FOSSEE Forum: <br>
Title: <b>{0}</b><br>
Category: <b>{1}</b><br>
@@ -260,11 +260,11 @@ def new_question(request):
question.title,
question.category,
#question.tutorial,
- 'http://forums.spoken-tutorial.org/question/'+str(question.id)
+ 'http://forums.fossee.in/question/'+str(question.id)
)
email = EmailMultiAlternatives(
subject,'', 'forums',
- ['team@spoken-tutorial.org', 'team@fossee.in'],
+ ['team@fossee.in'],
headers={"Content-type":"text/html;charset=iso-8859-1"}
)
email.attach_alternative(message, "text/html")
@@ -552,9 +552,9 @@ def unanswered_notification(request):
total_count,
question.title,
question.category,
- 'http://forums.spoken-tutorial.org/question/' + str(question.id)
+ 'http://forums.fossee.in/question/' + str(question.id)
)
- to = "team@spoken-tutorial.org, team@fossee.in"
+ to = "team@fossee.in"
subject = "Unanswered questions in the forums."
if total_count:
forums_mail(to, subject, message)