summaryrefslogtreecommitdiffstats
path: root/askbot/templates
diff options
context:
space:
mode:
Diffstat (limited to 'askbot/templates')
-rw-r--r--askbot/templates/base.html9
-rw-r--r--askbot/templates/email/macros.html2
-rw-r--r--askbot/templates/email/notify_admins_about_new_tags.html26
-rw-r--r--askbot/templates/email/reply_by_email_error.html7
-rw-r--r--askbot/templates/group_messaging/home.html2
-rw-r--r--askbot/templates/group_messaging/macros.html16
-rw-r--r--askbot/templates/group_messaging/senders_list.html15
-rw-r--r--askbot/templates/group_messaging/stored_message.html2
-rw-r--r--askbot/templates/group_messaging/thread_details.html7
-rw-r--r--askbot/templates/group_messaging/threads_list.html21
-rw-r--r--askbot/templates/main_page/tag_search.html1
-rw-r--r--askbot/templates/meta/html_head_meta.html8
-rw-r--r--askbot/templates/user_inbox/base.html4
-rw-r--r--askbot/templates/user_inbox/messages.html43
14 files changed, 107 insertions, 56 deletions
diff --git a/askbot/templates/base.html b/askbot/templates/base.html
index eaf2261d..63d7115f 100644
--- a/askbot/templates/base.html
+++ b/askbot/templates/base.html
@@ -2,7 +2,14 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title>
- {% include "meta/html_head_meta.html" %}
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ {% block meta_description %}
+ <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
+ {% endblock %}
+ <meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" />
+ {% if settings.GOOGLE_SITEMAP_CODE %}
+ <meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
+ {% endif %}
<link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" />
{% block before_css %}{% endblock %}
{% include "meta/html_head_stylesheets.html" %}
diff --git a/askbot/templates/email/macros.html b/askbot/templates/email/macros.html
index f1b06fc8..125705e2 100644
--- a/askbot/templates/email/macros.html
+++ b/askbot/templates/email/macros.html
@@ -70,7 +70,7 @@
{% endif %}
</p>
{% endif %}
- {{ post.html|absolutize_urls }}
+ {{ post.html }}
{{ end_quote(quote_level) }}
{% endspaceless %}
{% endmacro %}
diff --git a/askbot/templates/email/notify_admins_about_new_tags.html b/askbot/templates/email/notify_admins_about_new_tags.html
index dd37bb34..9aaaffc2 100644
--- a/askbot/templates/email/notify_admins_about_new_tags.html
+++ b/askbot/templates/email/notify_admins_about_new_tags.html
@@ -1,18 +1,8 @@
-{% extends "email/base_mail.html"%}
-{%block headline%}
- {%trans %}Hello{%endtrans%}
-{% endblock %}
-
-{%block content %}
- <p>{% trans %}Please have a look at these new tags {{tags|join(', ')}},
- created by {{user.username}}.{% endtrans %}</p>
- <p>{% trans %}If you decide not to use the tags, please reply to this email
- to the user {% endtrans %}<p>
- <p>{%trans%}Otherwise, please <a href="{{ thread_url }}">visit the question</a>
- and apply the tags{%endtrans%}</p>
- <p>{%trans%}Thank you.{%endtrans%}</p>
-{% endblock %}
-
-{%block footer %}
-{% include "email/footer.html" %}
-{% endblock %}
+<p>Hello,</p>
+<p>Please have a look at these new tags {{tags|join(', ')}},
+created by {{user.username}}.</p>
+<p>If you decide not to use the tags, please reply to this email
+to the user<p>
+<p>Otherwise, please <a href="{{ thread_url }}">visit the question</a>
+and apply the tags</p>
+<p>Thank you.</p>
diff --git a/askbot/templates/email/reply_by_email_error.html b/askbot/templates/email/reply_by_email_error.html
index 618e061a..53648184 100644
--- a/askbot/templates/email/reply_by_email_error.html
+++ b/askbot/templates/email/reply_by_email_error.html
@@ -1,11 +1,4 @@
-{% extends "email/base_mail.html"%}
-{%block headline%}{% trans %}Oops, there was an error.{% endblock %}
-{%block content %}
{% trans %}
<p>The system was unable to process your message successfully, the reason being:<p>
{% endtrans %}
{{error}}
-{% endblock %}
-{%block footer %}
-{% include "email/footer.html" %}
-{% endblock %}
diff --git a/askbot/templates/group_messaging/home.html b/askbot/templates/group_messaging/home.html
index b6733624..d5d34a37 100644
--- a/askbot/templates/group_messaging/home.html
+++ b/askbot/templates/group_messaging/home.html
@@ -1,5 +1,7 @@
<div class="group-messaging"
data-create-thread-url="{% url create_thread %}"
+ data-get-threads-url="{% url get_threads %}"
+ data-reply-url="{% url post_reply %}"
>
<div class="first-col">
<button class="submit compose">{% trans %}compose{% endtrans %}</button>
diff --git a/askbot/templates/group_messaging/macros.html b/askbot/templates/group_messaging/macros.html
new file mode 100644
index 00000000..7fbe4434
--- /dev/null
+++ b/askbot/templates/group_messaging/macros.html
@@ -0,0 +1,16 @@
+{%- macro message(post, visitor) -%}
+<div class="message" data-message-id="{{ post.id }}">
+ <p class="header">
+ {% if post.sender == visitor %}
+ {% trans date=post.sent_at %}You wrote on {{ date }}:{% endtrans %}
+ {% else %}
+ {% trans user=post.sender.username,
+ date=post.sent_at
+ %}{{ user }} wrote on {{ date }}:{% endtrans %}
+ {% endif %}
+ </p>
+ <div class="content">
+ {{ post.html|safe }}
+ </div>
+</div>
+{%- endmacro -%}
diff --git a/askbot/templates/group_messaging/senders_list.html b/askbot/templates/group_messaging/senders_list.html
index 43f8ea28..687cacd6 100644
--- a/askbot/templates/group_messaging/senders_list.html
+++ b/askbot/templates/group_messaging/senders_list.html
@@ -1,9 +1,14 @@
+{#<ul class="mailboxes">
+ <li><a class="inbox selected">{% trans %}Inbox{% endtrans %}</a></li>
+ <li><a class="sent">{% trans %}Sent{% endtrans %}</a></li>
+ <li><a class="trash">{% trans %}Trash{% endtrans %}</a></li>
+</ul>#}
{% if senders %}
<ul class="senders-list">
-{% for sender in senders %}
- <li>{% trans %}Senders:{% endtrans %}</li>
- <li><a data-sender-id="-1">{% trans %}all{% endtrans %}</a></li>
- <li><a data-sender-id="{{ sender.id }}">{{ sender.username|escape }}</a></li>
-{% endfor %}
+ <li>{% trans %}Messages by sender:{% endtrans %}</li>
+ <li><a class="selected" data-sender-id="-1">{% trans %}all users{% endtrans %}</a></li>
+ {% for sender in senders %}
+ <li><a data-sender-id="{{ sender.id }}">{{ sender.username|escape }}</a></li>
+ {% endfor %}
</ul>
{% endif %}
diff --git a/askbot/templates/group_messaging/stored_message.html b/askbot/templates/group_messaging/stored_message.html
new file mode 100644
index 00000000..1bf31368
--- /dev/null
+++ b/askbot/templates/group_messaging/stored_message.html
@@ -0,0 +1,2 @@
+{% from "group_messaging/macros.html" import message %}
+{{ message(post, user) }}
diff --git a/askbot/templates/group_messaging/thread_details.html b/askbot/templates/group_messaging/thread_details.html
new file mode 100644
index 00000000..969479d8
--- /dev/null
+++ b/askbot/templates/group_messaging/thread_details.html
@@ -0,0 +1,7 @@
+{% from "group_messaging/macros.html" import message %}
+<ul class="thread" data-thread-id="{{ root_message.id }}">
+ <li>{{ message(root_message, request.user) }}</li>
+ {% for response in responses %}
+ <li>{{ message(response, request.user) }}</li>
+ {% endfor %}
+</ul>
diff --git a/askbot/templates/group_messaging/threads_list.html b/askbot/templates/group_messaging/threads_list.html
index 164867a1..8469198c 100644
--- a/askbot/templates/group_messaging/threads_list.html
+++ b/askbot/templates/group_messaging/threads_list.html
@@ -1,13 +1,18 @@
-<ul class="threads-list">
+<table class="threads-list">
{% if threads %}
{% for thread in threads %}
- <li>
- <a data-thread-id="{{ thread.id }}">
- {{ thread.headline|escape }}
- </a>
- </li>
+ {% set thread_data = threads_data[thread.id] %}
+ <tr class="thread-heading {{ thread_data['status'] }}"
+ data-thread-id="{{ thread.id }}"
+ >
+ <td class="senders">{{ thread_data['senders_info']|escape }}</td>
+ <td class="subject">{{ thread.headline|escape }}</td>
+ <td class="timestamp">{{ thread.last_active_at|timesince }}</td>
+ </tr>
{% endfor %}
{% else %}
- <li class="empty">{% trans %}there are no messages yet...{% endtrans %}</li>
+ <tr>
+ <td class="empty" colspan="3">{% trans %}there are no messages yet...{% endtrans %}<td>
+ </tr>
{% endif %}
-</ul>
+</table>
diff --git a/askbot/templates/main_page/tag_search.html b/askbot/templates/main_page/tag_search.html
index 0d81bf4e..45f12b2f 100644
--- a/askbot/templates/main_page/tag_search.html
+++ b/askbot/templates/main_page/tag_search.html
@@ -1,6 +1,5 @@
<div id="tagSearch" class="box">
<h2>{% trans %}Tag search{% endtrans %}</h2>
- <label for="ab-tag-search">{% trans %}Please note that tag search is case sensitive!{% endtrans %}</label>
<div class="inputs">
<input id="ab-tag-search" autocomplete="off" type="text"/>
<input id="ab-tag-search-add" type="submit" value="{% trans %}search{% endtrans %}"/>
diff --git a/askbot/templates/meta/html_head_meta.html b/askbot/templates/meta/html_head_meta.html
deleted file mode 100644
index 352ffb53..00000000
--- a/askbot/templates/meta/html_head_meta.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-{% block meta_description %}
-<meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
-{% endblock %}
-<meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" />
-{% if settings.GOOGLE_SITEMAP_CODE %}
-<meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
-{% endif %}
diff --git a/askbot/templates/user_inbox/base.html b/askbot/templates/user_inbox/base.html
index 890cb0f7..8beababc 100644
--- a/askbot/templates/user_inbox/base.html
+++ b/askbot/templates/user_inbox/base.html
@@ -13,10 +13,10 @@
<div id="re_sections">
{% trans %}Sections:{% endtrans %}
{% set sep = joiner('|') %}
- {{ sep() }}
+ {#{ sep() }}
<a href="{{request.user.get_absolute_url()}}?sort=inbox&section=messages"
{% if inbox_section == 'messages' %}class="on"{% endif %}
- >{% trans %}messages{% endtrans %}</a>
+ >{% trans %}messages{% endtrans %}</a>#}
{% if re_count > 0 %}{{ sep() }}
<a href="{{request.user.get_absolute_url()}}?sort=inbox&section=forum"
{% if inbox_section == 'forum' %}class="on"{% endif %}
diff --git a/askbot/templates/user_inbox/messages.html b/askbot/templates/user_inbox/messages.html
index 8bb64c4a..5108d15e 100644
--- a/askbot/templates/user_inbox/messages.html
+++ b/askbot/templates/user_inbox/messages.html
@@ -6,20 +6,49 @@
.group-messaging {
padding-top: 25px;
}
- .group-messaging ul {
+ ul.senders-list {
padding: 0px;
+ margin-left: 1em;
+ margin-top: 0.5em;
}
- .group-messaging li {
+ .senders-list li {
+ height: 1.5em;
+ vertical-align: center;
list-style-type: none;
list-style-position: outside;
}
- li.empty {
+ .senders-list .selected {
+ font-weight: bold;
+ }
+ table.threads-list {
+ width: 100%;
+ }
+ .threads-list tr {
+ height: 2em;
+ }
+ .threads-list td {
+ vertical-align: center;
+ }
+ .threads-list tr.new {
+ font-weight: bold;
+ color: #777;
+ }
+ .threads-list tr:hover {
+ background-color: #eff5f6;
+ }
+ td.empty {
line-height: 30px;
vertical-align: middle;
background: #eee;
padding-left: 320px;
margin: 0px;
}
+ td.senders {
+ padding-left: 10px;
+ }
+ td.timestamp {
+ width: 180px;
+ }
button.compose {
width: 150px;
}
@@ -31,12 +60,16 @@
width: 150px;
}
.second-col {
- width: 810px;
+ width: 790px;
+ margin-left: 20px;
}
.message-composer {
- padding: 0 0 10px 25px;
+ padding-bottom: 10px;
margin-top: -25px;
}
+ .reply-composer .message-composer {
+ margin-top: 0;
+ }
.message-composer input.recipients,
.message-composer textarea {
width: 400px;
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-08-28 15:53:54 +0000