diff options
| -rw-r--r-- | hyperkitty/templates/ajax/replies.html (renamed from hyperkitty/templates/threads/replies.html) | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/ajax/temp_message.html (renamed from hyperkitty/templates/messages/temp_message.html) | 0 | ||||
| -rw-r--r-- | hyperkitty/templates/thread.html | 2 | ||||
| -rw-r--r-- | hyperkitty/views/message.py | 2 | ||||
| -rw-r--r-- | hyperkitty/views/thread.py | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/hyperkitty/templates/threads/replies.html b/hyperkitty/templates/ajax/replies.html index 19ee0e2..7b6fc70 100644 --- a/hyperkitty/templates/threads/replies.html +++ b/hyperkitty/templates/ajax/replies.html @@ -9,3 +9,5 @@ <!-- End of email --> </div> {% endfor %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/messages/temp_message.html b/hyperkitty/templates/ajax/temp_message.html index f518114..f518114 100644 --- a/hyperkitty/templates/messages/temp_message.html +++ b/hyperkitty/templates/ajax/temp_message.html diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index 78ef424..1e1f7ed 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -51,7 +51,7 @@ <div class="replies"> {% if is_bot %} - {% include 'threads/replies.html' %} + {% include 'ajax/replies.html' %} {% else %} <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}img/ajax-loader.gif" /> {% endif %} diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py index 7508aa0..2cf2f29 100644 --- a/hyperkitty/views/message.py +++ b/hyperkitty/views/message.py @@ -178,7 +178,7 @@ def reply(request, mlist_fqdn, message_id_hash): "content": form.cleaned_data["message"], "level": message.thread_depth, # no need to increment, level = thread_depth - 1 } - t = loader.get_template('messages/temp_message.html') + t = loader.get_template('ajax/temp_message.html') html = t.render(RequestContext(request, { 'email': reply })) result = {"result": "The reply has been sent successfully.", "message_html": html} diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py index 5c3c7a1..cc4e23a 100644 --- a/hyperkitty/views/thread.py +++ b/hyperkitty/views/thread.py @@ -179,7 +179,7 @@ def replies(request, mlist_fqdn, threadid): context["replies"] = _get_thread_replies(request, thread, offset=offset, limit=chunk_size) - replies_tpl = loader.get_template('threads/replies.html') + replies_tpl = loader.get_template('ajax/replies.html') replies_html = replies_tpl.render(RequestContext(request, context)) response = {"replies_html": replies_html, "more_pending": False, |