Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove more of the old theme files.

  • Loading branch information...
commit 500893e6c3ac3ffa023135a2765e0ba21907c4f7 1 parent ba9dd9f
@rlr rlr authored
Showing with 659 additions and 6,172 deletions.
  1. +1 −5 apps/forums/templates/forums/base.html
  2. +0 −44 apps/forums/templates/forums/edit_post-new.html
  3. +0 −41 apps/forums/templates/forums/edit_post-old.html
  4. +44 −5 apps/forums/templates/forums/edit_post.html
  5. +0 −30 apps/forums/templates/forums/edit_thread-new.html
  6. +0 −30 apps/forums/templates/forums/edit_thread-old.html
  7. +30 −5 apps/forums/templates/forums/edit_thread.html
  8. +0 −57 apps/forums/templates/forums/forums-new.html
  9. +0 −50 apps/forums/templates/forums/forums-old.html
  10. +56 −5 apps/forums/templates/forums/forums.html
  11. +0 −32 apps/forums/templates/forums/includes/forum_macros-new.html
  12. +3 −4 apps/forums/templates/forums/includes/forum_macros.html
  13. +23 −19 apps/forums/templates/forums/includes/post.html
  14. +0 −8 apps/forums/templates/forums/includes/post_preview-new.html
  15. +0 −49 apps/forums/templates/forums/new_thread-new.html
  16. +0 −46 apps/forums/templates/forums/new_thread-old.html
  17. +49 −5 apps/forums/templates/forums/new_thread.html
  18. +0 −131 apps/forums/templates/forums/posts-new.html
  19. +0 −129 apps/forums/templates/forums/posts-old.html
  20. +130 −5 apps/forums/templates/forums/posts.html
  21. +0 −54 apps/forums/templates/forums/threads-new.html
  22. +0 −48 apps/forums/templates/forums/threads-old.html
  23. +53 −5 apps/forums/templates/forums/threads.html
  24. +3 −6 apps/forums/views.py
  25. +1 −1  apps/kbforums/templates/kbforums/base.html
  26. +1 −1  apps/landings/templates/landings/home.html
  27. +0 −3  apps/questions/templates/questions/base.html
  28. +1 −1  apps/questions/views.py
  29. +12 −28 apps/search/templates/search/includes/macros.html
  30. +1 −13 apps/sumo/helpers.py
  31. +0 −46 media/css/autocomplete.css
  32. +0 −797 media/css/customercare.css
  33. +0 −563 media/css/forums.css
  34. +0 −239 media/css/home.css
  35. +0 −1,873 media/css/main.css
  36. +0 −34 media/css/reset.css
  37. +0 −112 media/css/showfor.css
  38. +0 −54 media/css/tags.css
  39. +0 −964 media/js/libs/modernizr-1.7.js
  40. +2 −25 settings.py
  41. +213 −5 templates/base.html
  42. +0 −214 templates/base_new.html
  43. +0 −243 templates/base_old.html
  44. +36 −84 templates/includes/common_macros.html
  45. +0 −26 templates/includes/sidebar_modules.html
  46. +0 −11 templates/layout/breadcrumbs-old.html
  47. +0 −10 templates/layout/footer.html
  48. +0 −12 templates/layout/menu_links.html
View
6 apps/forums/templates/forums/base.html
@@ -1,11 +1,7 @@
{# vim: set ts=2 et sts=2 sw=2: #}
{% extends "base.html" %}
{% if not styles %}
- {% if show_new_sumo(request) %}
- {% set styles = ('forums-new',) %}
- {% else %}
- {% set styles = ('forums',) %}
- {% endif %}
+ {% set styles = ('forums',) %}
{% endif %}
{% set scripts = ('forums',) %}
View
44 apps/forums/templates/forums/edit_post-new.html
@@ -1,44 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor %}
-{# L10n: {f} if the name of the forum, {t} if the name of the thread. #}
-{% set title = _('Edit a post | {t} | {f} | Forums')|f(t=thread.title,f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
-(url('forums.threads', forum.slug), forum.name),
-(url('forums.posts', forum.slug, thread.id), thread.title),
-(None, _('Edit a post'))] %}
-
-{% block content %}
- <div id="edit-post" class="grid_12">
- <h1>{{ _('Edit a post') }}</h1>
-
- <form action="{{ url('forums.edit_post', forum.slug, thread.id, post.id) }}" method="post" class="edit-post">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
- {{ form.content.label_tag()|safe }}
- <div class="content-box">
- {{ content_editor(form.content) }}
- </div>
- </div>
-
- <div class="form-widget submit">
- <button type="submit" class="btn btn-submit big">{{ _('Update post') }}</button>
- <button type="submit" id="preview" name="preview" class="btn"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content">{{ _('Preview') }}
- </button>
- <a class="btn" href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
- </div>
- </form>
-
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
- </div>
-{% endblock %}
View
41 apps/forums/templates/forums/edit_post-old.html
@@ -1,41 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor %}
-{# L10n: {f} if the name of the forum, {t} if the name of the thread. #}
-{% set title = _('Edit a post | {t} | {f} | Forums')|f(t=thread.title,f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
- (url('forums.threads', forum.slug), forum.name),
- (url('forums.posts', forum.slug, thread.id), thread.title),
- (None, _('Edit a post'))] %}
-
-{% block content %}
-<article id="edit-post" class="main">
- <h1>{{ _('Edit a post') }}</h1>
-
- <form action="{{ url('forums.edit_post', forum.slug, thread.id, post.id) }}" method="post" class="edit-post">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
- {{ form.content.label_tag()|safe }}
- {{ content_editor(form.content) }}
- </div>
-
- <div class="form-widget submit">
- <input type="submit" class="btn-important" value="{{ _('Update post') }}" />
- <input type="submit" id="preview" name="preview" value="{{ _('Preview') }}"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content" />
- <a href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
- </div>
- </form>
-
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
-</article>
-{% endblock %}
View
49 apps/forums/templates/forums/edit_post.html
@@ -1,5 +1,44 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/edit_post-new.html" %}
-{% else %}
- {% extends "forums/edit_post-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from "layout/errorlist.html" import errorlist %}
+{% from "includes/common_macros.html" import content_editor %}
+{# L10n: {f} if the name of the forum, {t} if the name of the thread. #}
+{% set title = _('Edit a post | {t} | {f} | Forums')|f(t=thread.title,f=forum.name) %}
+{% set crumbs = [(url('forums.forums'), _('Forums')),
+(url('forums.threads', forum.slug), forum.name),
+(url('forums.posts', forum.slug, thread.id), thread.title),
+(None, _('Edit a post'))] %}
+
+{% block content %}
+ <div id="edit-post" class="grid_12">
+ <h1>{{ _('Edit a post') }}</h1>
+
+ <form action="{{ url('forums.edit_post', forum.slug, thread.id, post.id) }}" method="post" class="edit-post">
+ {{ csrf() }}
+ {{ errorlist(form) }}
+
+ <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
+ {{ form.content.label_tag()|safe }}
+ <div class="content-box">
+ {{ content_editor(form.content) }}
+ </div>
+ </div>
+
+ <div class="form-widget submit">
+ <button type="submit" class="btn btn-submit big">{{ _('Update post') }}</button>
+ <button type="submit" id="preview" name="preview" class="btn"
+ data-preview-url="{{ url('forums.post_preview_async') }}"
+ data-preview-container-id="post-preview"
+ data-preview-content-id="id_content">{{ _('Preview') }}
+ </button>
+ <a class="btn" href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
+ </div>
+ </form>
+
+ <div id="post-preview">
+ {% if post_preview %}
+ {% include "forums/includes/post_preview.html" %}
+ {% endif %}
+ </div>
+ </div>
+{% endblock %}
View
30 apps/forums/templates/forums/edit_thread-new.html
@@ -1,30 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{# L10n: {f} is the name of the forum, {t} is the name of the thread. #}
-{% set title = _('Edit thread "{t}" | {f} | Forums')|f(t=thread.title, f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
-(url('forums.threads', forum.slug), forum.name),
-(url('forums.posts', forum.slug, thread.id), thread.title),
-(None, _('Edit thread'))] %}
-
-{% block content %}
- <div id="edit-thread" class="grid_12">
- <h1>{{ _('Edit thread "{t}"')|f(t=thread.title) }}</h1>
-
- <form action="{{ url('forums.edit_thread', forum.slug, thread.id) }}" method="post" class="edit-thread">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- <div class="form-widget{% if form.title.errors %} invalid{% endif %}">
- {{ form.title.label_tag()|safe }}
- {{ form.title|safe }}
- </div>
-
- <div class="form-widget submit">
- <button type="submit" class="btn btn-submit big">{{ _('Update thread') }}</button>
- <a class="btn" href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
- </div>
- </form>
- </div>
-{% endblock %}
View
30 apps/forums/templates/forums/edit_thread-old.html
@@ -1,30 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{# L10n: {f} is the name of the forum, {t} is the name of the thread. #}
-{% set title = _('Edit thread "{t}" | {f} | Forums')|f(t=thread.title, f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
- (url('forums.threads', forum.slug), forum.name),
- (url('forums.posts', forum.slug, thread.id), thread.title),
- (None, _('Edit thread'))] %}
-
-{% block content %}
-<article id="edit-thread" class="main">
- <h1>{{ _('Edit thread "{t}"')|f(t=thread.title) }}</h1>
-
- <form action="{{ url('forums.edit_thread', forum.slug, thread.id) }}" method="post" class="edit-thread">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- <div class="form-widget{% if form.title.errors %} invalid{% endif %}">
- {{ form.title.label_tag()|safe }}
- {{ form.title|safe }}
- </div>
-
- <div class="form-widget submit">
- <input type="submit" value="{{ _('Update thread') }}" />
- <a href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
- </div>
- </form>
-</article>
-{% endblock %}
View
35 apps/forums/templates/forums/edit_thread.html
@@ -1,5 +1,30 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/edit_thread-new.html" %}
-{% else %}
- {% extends "forums/edit_thread-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from "layout/errorlist.html" import errorlist %}
+{# L10n: {f} is the name of the forum, {t} is the name of the thread. #}
+{% set title = _('Edit thread "{t}" | {f} | Forums')|f(t=thread.title, f=forum.name) %}
+{% set crumbs = [(url('forums.forums'), _('Forums')),
+(url('forums.threads', forum.slug), forum.name),
+(url('forums.posts', forum.slug, thread.id), thread.title),
+(None, _('Edit thread'))] %}
+
+{% block content %}
+ <div id="edit-thread" class="grid_12">
+ <h1>{{ _('Edit thread "{t}"')|f(t=thread.title) }}</h1>
+
+ <form action="{{ url('forums.edit_thread', forum.slug, thread.id) }}" method="post" class="edit-thread">
+ {{ csrf() }}
+ {{ errorlist(form) }}
+
+ <div class="form-widget{% if form.title.errors %} invalid{% endif %}">
+ {{ form.title.label_tag()|safe }}
+ {{ form.title|safe }}
+ </div>
+
+ <div class="form-widget submit">
+ <button type="submit" class="btn btn-submit big">{{ _('Update thread') }}</button>
+ <a class="btn" href="{{ url('forums.posts', forum.slug, thread.id) }}">{{ _('Cancel') }}</a>
+ </div>
+ </form>
+ </div>
+{% endblock %}
View
57 apps/forums/templates/forums/forums-new.html
@@ -1,57 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from 'includes/common_macros.html' import for_contributors_sidebar %}
-{% set styles = ('forums-new',) %}
-{% set title = _('Contributor Forums') %}
-{% set crumbs = [(None, title)] %}
-{% set canonical_url = unlocalized_url('forums.forums') %}
-{% if forums.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=forums.number) %}
-{% endif %}
-
-{% block content %}
- <div class="grid_3">
- {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
- <br />
- </div>
- <article class="grid_9">
- <div id="forums" class="content-box">
- <h1>{{ title }}</h1>
-
- <ol class="forums-columns cf">
- <li class="name">{{ _('Name') }}</li>
- <li class="threads">{{ _('Threads') }}</li>
- <li class="last-post">{{ _('Last Post') }}</li>
- </ol>
- {% if forums.object_list %}
- <ol class="forums">
- {% for forum in forums.object_list %}
- <li class="cf">
- <div class="name">
- <a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ forum.name }}</a><br/>
- {{ forum.description|safe }}
- </div>
- <div class="threads">{{ forum.thread_count }}</div>
- <div class="last-post">
- {% if forum.last_post %}
- <a href="{{ forum.last_post.get_absolute_url() }}">
- {{ datetimeformat(forum.last_post.created) }}
- </a><br/>
- {{ _('by <a class="username" href="{profile_url}">{username}</a>')|fe(profile_url=profile_url(forum.last_post.author), username=forum.last_post.author.username) }}
- {% else %}
- {# Not localized because it's not worth localizers time. #}
- No posts.
- {% endif %}
- </div>
- </li>
- {% endfor %}
- </ol>
-
- {{ forums|paginator }}
- {% else %}{# if forums #}
- {# Not localized because it's not worth localizers time. #}
- <p>There are no forums. You should create some!</p>
- {% endif %}
- </article>
- </div>
-{% endblock %}
View
50 apps/forums/templates/forums/forums-old.html
@@ -1,50 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% set title = _('Forums') %}
-{% set crumbs = [(None, title)] %}
-{% set canonical_url = unlocalized_url('forums.forums') %}
-{% if forums.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=forums.number) %}
-{% endif %}
-
-{% block content %}
-<article id="forums" class="main">
- <h1>{{ title }}</h1>
-
- <ol class="forums-columns">
- <li class="name">{{ _('Name') }}</li>
- <li class="threads">{{ _('Threads') }}</li>
- <li class="last-post">{{ _('Last Post') }}</li>
- </ol>
- {% if forums.object_list %}
- <ol class="forums">
- {% for forum in forums.object_list %}
- <li>
- <div class="name">
- <a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ forum.name }}</a><br/>
- {{ forum.description|safe }}
- </div>
- <div class="threads">{{ forum.thread_count }}</div>
- <div class="last-post">
- {% if forum.last_post %}
- <a href="{{ forum.last_post.get_absolute_url() }}">
- {{ datetimeformat(forum.last_post.created) }}
- </a><br/>
- {{ _('by <a class="username" href="{profile_url}">{username}</a>')|fe(profile_url=profile_url(forum.last_post.author), username=forum.last_post.author.username) }}
- {% else %}
- {# Not localized because it's not worth localizers time. #}
- No posts.
- {% endif %}
- </div>
- <hr/>
- </li>
- {% endfor %}
- </ol>
-
- {{ forums|paginator }}
- {% else %}{# if forums #}
- {# Not localized because it's not worth localizers time. #}
- <p>There are no forums. You should create some!</p>
- {% endif %}
-</article>
-{% endblock %}
View
61 apps/forums/templates/forums/forums.html
@@ -1,5 +1,56 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/forums-new.html" %}
-{% else %}
- {% extends "forums/forums-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from 'includes/common_macros.html' import for_contributors_sidebar %}
+{% set title = _('Contributor Forums') %}
+{% set crumbs = [(None, title)] %}
+{% set canonical_url = unlocalized_url('forums.forums') %}
+{% if forums.number > 1 %}
+ {% set canonical_url = canonical_url|urlparams(page=forums.number) %}
+{% endif %}
+
+{% block content %}
+ <div class="grid_3">
+ {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
+ <br />
+ </div>
+ <article class="grid_9">
+ <div id="forums" class="content-box">
+ <h1>{{ title }}</h1>
+
+ <ol class="forums-columns cf">
+ <li class="name">{{ _('Name') }}</li>
+ <li class="threads">{{ _('Threads') }}</li>
+ <li class="last-post">{{ _('Last Post') }}</li>
+ </ol>
+ {% if forums.object_list %}
+ <ol class="forums">
+ {% for forum in forums.object_list %}
+ <li class="cf">
+ <div class="name">
+ <a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ forum.name }}</a><br/>
+ {{ forum.description|safe }}
+ </div>
+ <div class="threads">{{ forum.thread_count }}</div>
+ <div class="last-post">
+ {% if forum.last_post %}
+ <a href="{{ forum.last_post.get_absolute_url() }}">
+ {{ datetimeformat(forum.last_post.created) }}
+ </a><br/>
+ {{ _('by <a class="username" href="{profile_url}">{username}</a>')|fe(profile_url=profile_url(forum.last_post.author), username=forum.last_post.author.username) }}
+ {% else %}
+ {# Not localized because it's not worth localizers time. #}
+ No posts.
+ {% endif %}
+ </div>
+ </li>
+ {% endfor %}
+ </ol>
+
+ {{ forums|paginator }}
+ {% else %}{# if forums #}
+ {# Not localized because it's not worth localizers time. #}
+ <p>There are no forums. You should create some!</p>
+ {% endif %}
+ </article>
+ </div>
+{% endblock %}
View
32 apps/forums/templates/forums/includes/forum_macros-new.html
@@ -1,32 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% macro thread_list(threads, forum=None) -%}
- <ol class="threads">
- {% for thread in threads.object_list %}
- {% if forum %}
- {% set _forum = forum %}
- {% else %}
- {% set _forum = thread.forum %}
- {% endif %}
- <li class="cf">
- <div class="type">
- {% if thread.is_locked %}
- <img src="{{ MEDIA_URL }}img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
- {% endif %}
- {% if thread.is_sticky %}
- <img src="{{ MEDIA_URL }}img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
- {% endif %}
- </div>
- <div class="title"><a href="{{ url('forums.posts', forum_slug=_forum.slug, thread_id=thread.id)|urlparams(last=thread.last_post.id) }}">{{ thread.title }}</a></div>
- <div class="author"><a class="username" href="{{ profile_url(thread.creator) }}">{{ thread.creator.username }}</a></div>
- <div class="replies">{{ thread.replies }}</div>
- <div class="last-post">
- <a href="{{ thread.get_last_post_url() }}">
- {{ datetimeformat(thread.last_post.created) }}
- </a><br/>
- {{ _('by <a class="username" href="{profile_url}">{username}</a>')|fe(profile_url=profile_url(thread.last_post.author), username=thread.last_post.author.username) }}
- </div>
- </li>
- {% endfor %}
- </ol>
- {{ threads|paginator }}
-{%- endmacro %}
View
7 apps/forums/templates/forums/includes/forum_macros.html
@@ -7,13 +7,13 @@
{% else %}
{% set _forum = thread.forum %}
{% endif %}
- <li>
+ <li class="cf">
<div class="type">
{% if thread.is_locked %}
- <img src="{{ MEDIA_URL }}img/forums/type/locked.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}"/>
+ <img src="{{ MEDIA_URL }}img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
{% endif %}
{% if thread.is_sticky %}
- <img src="{{ MEDIA_URL }}img/forums/type/sticky.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}"/>
+ <img src="{{ MEDIA_URL }}img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
{% endif %}
</div>
<div class="title"><a href="{{ url('forums.posts', forum_slug=_forum.slug, thread_id=thread.id)|urlparams(last=thread.last_post.id) }}">{{ thread.title }}</a></div>
@@ -25,7 +25,6 @@
</a><br/>
{{ _('by <a class="username" href="{profile_url}">{username}</a>')|fe(profile_url=profile_url(thread.last_post.author), username=thread.last_post.author.username) }}
</div>
- <hr/>
</li>
{% endfor %}
</ol>
View
42 apps/forums/templates/forums/includes/post.html
@@ -1,21 +1,25 @@
-<div class="author">
- <a href="{{ profile_url(post.author, request.user == post.author) }}">
- <img src="{{ profile_avatar(post.author) }}" height="45" width="45" alt=""/>
+<div class="author" xmlns="http://www.w3.org/1999/html"
+ xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
+ <a class="avatar" href="{{ profile_url(post.author, request.user == post.author) }}">
+ <img src="{{ profile_avatar(post.author) }}" height="45" width="45" alt="{{ post.author }}"/>
</a>
<a class="author-name" href="{{ profile_url(post.author, request.user == post.author) }}">{{ post.author }}</a>
- {{ private_message(post.author) }}
+
+ <ul>
+ <li>{{ private_message(post.author) }}</li>
+ {% if post.id and not thread.is_locked and
+ has_perm_or_owns('forums_forum.post_edit_forum', post, forum, 'author') %}
+ <li><a href="{{ url('forums.edit_post', forum.slug, thread.id, post.id) }}">{{ _('Edit this post') }}</a></li>
+ {% endif %}
+ {% if post.id and has_perm('forums_forum.post_delete_forum', forum) %}
+ <li><a href="{{ url('forums.delete_post', forum.slug, thread.id, post.id) }}">{{ _('Delete this post') }}</a></li>
+ {% endif %}
+ </ul>
+
{# L10n: {0} is the number of posts. #}
<span class="posts">{{ ngettext('1 post', '{0} posts', post.author_post_count)|f(post.author_post_count) }}</span>
<div class="post-actions">
- {% if post.id and not thread.is_locked and
- has_perm_or_owns('forums_forum.post_edit_forum', post, forum, 'author') %}
- <a href="{{ url('forums.edit_post', forum.slug, thread.id, post.id) }}"><img src="{{ MEDIA_URL }}img/forums/edit.png" alt="{{ _('Edit') }}" title="{{ _('Edit') }}"/></a>
- {% endif %}
- {% if post.id and has_perm('forums_forum.post_delete_forum', forum) %}
- <a href="{{ url('forums.delete_post', forum.slug, thread.id, post.id) }}">
- <img src="{{ MEDIA_URL }}img/forums/delete.png" alt="{{ _('Delete') }}" title="{{ _('Delete') }}">
- </a>
- {% endif %}
+
</div>
</div>
<div class="content">
@@ -23,16 +27,16 @@
</div>
<div class="content-raw">{{ post.content }}</div>
<div class="info">
- {{ datetimeformat(post.created, format='longdatetime') }}
- <a href="#post-{{ post.id }}" class="permalink" title="{{ _('Link to this post.') }}">#</a>
- {% if post.id and user.is_authenticated() and not thread.is_locked and forum.allows_posting_by(user) %}
+ <div>
+ {% if post.id and user.is_authenticated() and not thread.is_locked and forum.allows_posting_by(user) %}
<span class="post-action">
<a class="reply" data-post="{{ post.id }}" href="#thread-reply">{{ _('Reply') }}</a>
</span>
{% endif %}
+ {{ datetimeformat(post.created, format='longdatetime') }}
+ <a href="#post-{{ post.id }}" class="permalink" title="{{ _('Link to this post.') }}">#</a>
+ </div>
{% if post.id and post.created != post.updated %}
- <span class="post-modified">
- {{ _('Modified by {name} on {datetime}')|fe(name=post.updated_by.username, datetime=datetimeformat(post.updated, format='longdatetime')) }}
- </span>
+ {{ _('Modified by {name} on {datetime}')|fe(name=post.updated_by.username, datetime=datetimeformat(post.updated, format='longdatetime')) }}
{% endif %}
</div>
View
8 apps/forums/templates/forums/includes/post_preview-new.html
@@ -1,8 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-<h3>{{ _('Post Preview:') }}</h3>
-<ol class="posts">
- <li>
- {% set post = post_preview %}
- {% include "forums/includes/post-new.html" %}
- </li>
-</ol>
View
49 apps/forums/templates/forums/new_thread-new.html
@@ -1,49 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor %}
-{# L10n: {f} if the name of the forum. #}
-{% set title = _('Create a new thread | {f} | Forums')|f(f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
-(url('forums.threads', forum.slug), forum.name),
-(None, _('Create a new thread'))] %}
-
-{% block content %}
- <div id="new-thread" class="grid_12">
- <h1>{{ _('Create a new thread') }}</h1>
-
- <form action="{{ url('forums.new_thread', forum.slug) }}" method="post" class="new-thread">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- {% for field in form %}
- <div class="form-widget{% if field.errors %} invalid{% endif %}">
- {{ field.label_tag()|safe }}
- {% if field.name == 'content' %}
- <div class="content-box">
- {{ content_editor(field) }}
- </div>
- {% else %}
- {{ field|safe }}
- {% endif %}
- </div>
- {% endfor %}
-
- <div class="form-widget submit">
- <button type="submit" class="btn btn-submit big">{{ _('Post Thread') }}</button>
- <button type="submit" class="btn" id="preview" name="preview"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content">{{ _('Preview') }}
- </button>
- <a class="btn" href="{{ url('forums.threads', forum.slug) }}">{{ _('Cancel') }}</a>
- </div>
-
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
- </form>
- </div>
-{% endblock %}
View
46 apps/forums/templates/forums/new_thread-old.html
@@ -1,46 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor %}
-{# L10n: {f} if the name of the forum. #}
-{% set title = _('Create a new thread | {f} | Forums')|f(f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
- (url('forums.threads', forum.slug), forum.name),
- (None, _('Create a new thread'))] %}
-
-{% block content %}
-<article id="new-thread" class="main">
- <h1>{{ _('Create a new thread') }}</h1>
-
- <form action="{{ url('forums.new_thread', forum.slug) }}" method="post" class="new-thread">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- {% for field in form %}
- <div class="form-widget{% if field.errors %} invalid{% endif %}">
- {{ field.label_tag()|safe }}
- {% if field.name == 'content' %}
- {{ content_editor(field) }}
- {% else %}
- {{ field|safe }}
- {% endif %}
- </div>
- {% endfor %}
-
- <div class="form-widget submit">
- <input type="submit" class="btn-important" value="{{ _('Post') }}" />
- <input type="submit" id="preview" name="preview" value="{{ _('Preview') }}"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content" />
- <a href="{{ url('forums.threads', forum.slug) }}">{{ _('Cancel') }}</a>
- </div>
-
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
- </form>
-</article>
-{% endblock %}
View
54 apps/forums/templates/forums/new_thread.html
@@ -1,5 +1,49 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/new_thread-new.html" %}
-{% else %}
- {% extends "forums/new_thread-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from "layout/errorlist.html" import errorlist %}
+{% from "includes/common_macros.html" import content_editor %}
+{# L10n: {f} if the name of the forum. #}
+{% set title = _('Create a new thread | {f} | Forums')|f(f=forum.name) %}
+{% set crumbs = [(url('forums.forums'), _('Forums')),
+(url('forums.threads', forum.slug), forum.name),
+(None, _('Create a new thread'))] %}
+
+{% block content %}
+ <div id="new-thread" class="grid_12">
+ <h1>{{ _('Create a new thread') }}</h1>
+
+ <form action="{{ url('forums.new_thread', forum.slug) }}" method="post" class="new-thread">
+ {{ csrf() }}
+ {{ errorlist(form) }}
+
+ {% for field in form %}
+ <div class="form-widget{% if field.errors %} invalid{% endif %}">
+ {{ field.label_tag()|safe }}
+ {% if field.name == 'content' %}
+ <div class="content-box">
+ {{ content_editor(field) }}
+ </div>
+ {% else %}
+ {{ field|safe }}
+ {% endif %}
+ </div>
+ {% endfor %}
+
+ <div class="form-widget submit">
+ <button type="submit" class="btn btn-submit big">{{ _('Post Thread') }}</button>
+ <button type="submit" class="btn" id="preview" name="preview"
+ data-preview-url="{{ url('forums.post_preview_async') }}"
+ data-preview-container-id="post-preview"
+ data-preview-content-id="id_content">{{ _('Preview') }}
+ </button>
+ <a class="btn" href="{{ url('forums.threads', forum.slug) }}">{{ _('Cancel') }}</a>
+ </div>
+
+ <div id="post-preview">
+ {% if post_preview %}
+ {% include "forums/includes/post_preview.html" %}
+ {% endif %}
+ </div>
+ </form>
+ </div>
+{% endblock %}
View
131 apps/forums/templates/forums/posts-new.html
@@ -1,131 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor, for_contributors_sidebar %}
-{# L10n: {t} is the title of the thread. {f} is the name of the forum. #}
-{% set title = _('{t} | {f} | Forums')|f(t=thread.title, f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Contributor Forums')),
-(url('forums.threads', forum.slug), forum.name),
-(None, thread.title)] %}
-{% set styles = ('forums-new',) %}
-{% set canonical_url = unlocalized_url('forums.posts', forum.slug, thread.id) %}
-{% if posts.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=posts.number) %}
-{% endif %}
-
-{% block above_main %}
- <h1 id="forum-title">{{ forum.name }}</h1>
-{% endblock %}
-
-{% block content %}
- <div class="grid_3">
- <ul id="thread-actions" class="sidebar-nav">
- {% if not thread.is_locked and
- has_perm_or_owns('forums_forum.thread_edit_forum', thread, forum) %}
- <li><a href="{{ url('forums.edit_thread', forum.slug, thread.id) }}">{{ _('Edit this thread') }}</a></li>
- {% endif %}
- {% if has_perm('forums_forum.thread_delete_forum', forum) %}
- <li><a href="{{ url('forums.delete_thread', forum.slug, thread.id) }}">{{ _('Delete this thread') }}</a></li>
- {% endif %}
- {% if has_perm('forums_forum.thread_locked_forum', forum) %}
- <li>
- <form id="thread-lock-form" action="{{ url('forums.lock_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- </form>
- <a data-type="submit" data-form="thread-lock-form">{% if thread.is_locked %}{{ _('Unlock this thread') }}{% else %}{{ _('Lock this thread') }}{% endif %}</a>
- </li>
- {% endif %}
- {% if has_perm('forums_forum.thread_sticky_forum', forum) %}
- <li>
- <form id="thread-sticky-form" action="{{ url('forums.sticky_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- </form>
- <a data-type="submit" data-form="thread-sticky-form">{% if thread.is_sticky %}{{ _('Unsticky this thread') }}{% else %}{{ _('Sticky this thread') }}{% endif %}</a>
- </li>
- {% endif %}
- </ul>
-
- {% if has_perm('forums_forum.thread_move_forum', forum) %}
- <form id="move-thread-form" action="{{ url('forums.move_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- <select name="forum">
- {% for f in forums %}
- {% if has_perm('forums_forum.thread_move_forum', f) %}
- <option value="{{ f.id }}" {% if f == forum %}selected="selected"{% endif %}>{{ f.name }}</option>
- {% endif %}
- {% endfor %}
- </select>
- <input type="submit" value="Move Thread" />
- </form>
- {% endif %}
-
- {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
- <br />
- </div>
-
- <article id="posts" class="grid_9">
- <h1 class="nomargin">{{ thread.title }}</h1>
- <ul class="cf" id="thread-meta">
- {% if count %}<li>{{ count - 1 }} {{ _('Replies') }}</li>{% endif %}
- {% if last_post %}<li>{{ _('Last reply by') }} {{ last_post.author }}</li>{% endif %}
- {% if thread.is_sticky %}<li>{{ _('Sticky') }}</li>{% endif %}
- {% if thread.is_locked %}<li>{{ _('Locked') }}</li>{% endif %}
- </ul>
- {% if user.is_authenticated() %}
- <form action="{{ url('forums.watch_thread', forum_slug=forum.slug, thread_id=thread.id) }}" method="post">
- {{ csrf() }}
- {% if is_watching_thread %}
- {% set watch = _('Stop watching this thread') %}
- <input type="hidden" name="watch" value="no" />
- {% else %}
- {% set watch = _('Watch this thread') %}
- <input type="hidden" name="watch" value="yes" />
- {% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ MEDIA_URL }}img/blank.png" alt="" /> {{ watch }}</button>
- </form>
- {% endif %}
-
- {% if posts %}
- <ol class="posts">
- {% for post in posts.object_list %}
- <li class="cf" id="post-{{ post.id }}">
- {% include "forums/includes/post-new.html" %}
- </li>
- {% endfor %}
- </ol>
-
- {{ posts|paginator }}
-
- {% else %}
- <p>{{ _('Oh, no! Looks like there are no posts!') }}</p>
- {% endif %}
-
- {% if user.is_authenticated() and not thread.is_locked and forum.allows_posting_by(user) %}
- <form action="{{ url('forums.reply', forum.slug, thread.id)|urlparams(hash='post-reply') }}" method="post">
- {{ csrf() }}
- <h3 id="thread-reply-title">{{ _('Post a reply') }}</h3>
- {{ errorlist(form) }}
- <div id="thread-reply">
- {{ content_editor(form.content) }}
- </div>
- <div class="editor-actions">
- <button type="submit" class="btn btn-submit big">{{ _('Post Reply') }}</button>
- <button type="submit" class="btn" id="preview" name="preview"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content">{{ _('Preview Reply') }}
- </button>
- </div>
- </form>
- {% elif user.is_authenticated() and thread.is_locked %}
- <div id="thread-reply">
- <p id="thread-locked">{{ _('This thread has been locked. It is no longer possible to post new replies.') }}</p>
- </div>
- {% endif %}
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
- </article>
-{% endblock %}
View
129 apps/forums/templates/forums/posts-old.html
@@ -1,129 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "layout/errorlist.html" import errorlist %}
-{% from "includes/common_macros.html" import content_editor %}
-{# L10n: {t} is the title of the thread. {f} is the name of the forum. #}
-{% set title = _('{t} | {f} | Forums')|f(t=thread.title, f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')),
- (url('forums.threads', forum.slug), forum.name),
- (None, thread.title)] %}
-{% set canonical_url = unlocalized_url('forums.posts', forum.slug, thread.id) %}
-{% if posts.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=posts.number) %}
-{% endif %}
-
-{% block content %}
-<article id="posts" class="main">
- <h1>{{ thread.title }}</h1>
- <div class="badges">
- {% if thread.is_sticky %}<span class="sticky">{{ _('Sticky') }}</span>{% endif %}
- {% if thread.is_locked %}<span class="locked">{{ _('Locked') }}</span>{% endif %}
- </div>
- <div class="thread-actions">
- {% if user.is_authenticated() %}
- <form action="{{ url('forums.watch_thread', forum_slug=forum.slug, thread_id=thread.id) }}" method="post">
- {{ csrf() }}
- {% if is_watching_thread %}
- {% set watch = _('Stop watching this thread') %}
- <input type="hidden" name="watch" value="no" />
- {% else %}
- {% set watch = _('Watch this thread') %}
- <input type="hidden" name="watch" value="yes" />
- {% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ MEDIA_URL }}img/forums/watch.png" alt="" /> {{ watch }}</button>
- </form>
- {% endif %}
- {% if not thread.is_locked and
- has_perm_or_owns('forums_forum.thread_edit_forum', thread, forum) %}
- <a href="{{ url('forums.edit_thread', forum.slug, thread.id) }}"><img src="{{ MEDIA_URL }}img/forums/edit.png" alt="{{ _('Edit') }}" title="{{ _('Edit') }}"/></a>
- {% endif %}
- {% if has_perm('forums_forum.thread_delete_forum', forum) %}
- <a href="{{ url('forums.delete_thread', forum.slug, thread.id) }}">
- <img src="{{ MEDIA_URL }}img/forums/delete.png" alt="{{ _('Delete') }}" title="{{ _('Delete') }}">
- </a>
- {% endif %}
- {% if has_perm('forums_forum.thread_locked_forum', forum) %}
- <form action="{{ url('forums.lock_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- <input type="image" src="{{ MEDIA_URL }}img/forums/type/locked.png" alt="{{ _('Change locked status') }}" title="{{ _('Change locked status') }}"/>
- </form>
- {% endif %}
- {% if has_perm('forums_forum.thread_sticky_forum', forum) %}
- <form action="{{ url('forums.sticky_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- <input type="image" src="{{ MEDIA_URL }}img/forums/type/sticky.png" alt="{{ _('Change sticky status') }}" title="{{ _('Change sticky status') }}" />
- </form>
- {% endif %}
- {% if has_perm('forums_forum.thread_move_forum', forum) %}
- <form class="move" action="{{ url('forums.move_thread', forum.slug, thread.id) }}" method="post">
- {{ csrf() }}
- <select name="forum">
- {% for f in forums %}
- {% if has_perm('forums_forum.thread_move_forum', f) %}
- <option value="{{ f.id }}" {% if f == forum %}selected="selected"{% endif %}>{{ f.name }}</option>
- {% endif %}
- {% endfor %}
- </select>
- <input type="submit" value="Move Thread" />
- </form>
- {% endif %}
- </div>
-
- <div class="thread-watch">
- {% if user.is_authenticated() %}
- {% endif %}
- </div>
-
- {{ posts|paginator }}
-
- <ol class="posts-columns">
- <li class="author">{{ _('Author') }}</li>
- <li class="message">{{ _('Message') }}</li>
- </ol>
-
- {% if posts %}
- <ol class="posts">
- {% for post in posts.object_list %}
- <li id="post-{{ post.id }}">
- {% include "forums/includes/post.html" %}
- </li>
- {% endfor %}
- </ol>
-
- {{ posts|paginator }}
-
- {% else %}
- <p>{{ _('Oh, no! Looks like there are no posts!') }}</p>
- {% endif %}
-
- {% if user.is_authenticated() and not thread.is_locked and forum.allows_posting_by(user) %}
- <div id="thread-reply">
- <h3>{{ _('Post a reply') }}</h3>
-
- <form action="{{ url('forums.reply', forum.slug, thread.id)|urlparams(hash='post-reply') }}" method="post">
- {{ csrf() }}
- {{ errorlist(form) }}
-
- {{ content_editor(form.content) }}
-
- <div class="editor-actions">
- <input type="submit" class="btn-important" value="{{ _('Reply') }}" />
- <input type="submit" id="preview" name="preview" value="{{ _('Preview') }}"
- data-preview-url="{{ url('forums.post_preview_async') }}"
- data-preview-container-id="post-preview"
- data-preview-content-id="id_content" />
- </div>
- </form>
- </div>
- {% elif user.is_authenticated() and thread.is_locked %}
- <div id="thread-reply">
- <p id="thread-locked">{{ _('This thread has been locked. It is no longer possible to post new replies.') }}</p>
- </div>
- {% endif %}
- <div id="post-preview">
- {% if post_preview %}
- {% include "forums/includes/post_preview.html" %}
- {% endif %}
- </div>
-</article>
-{% endblock %}
View
135 apps/forums/templates/forums/posts.html
@@ -1,5 +1,130 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/posts-new.html" %}
-{% else %}
- {% extends "forums/posts-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from "layout/errorlist.html" import errorlist %}
+{% from "includes/common_macros.html" import content_editor, for_contributors_sidebar %}
+{# L10n: {t} is the title of the thread. {f} is the name of the forum. #}
+{% set title = _('{t} | {f} | Forums')|f(t=thread.title, f=forum.name) %}
+{% set crumbs = [(url('forums.forums'), _('Contributor Forums')),
+(url('forums.threads', forum.slug), forum.name),
+(None, thread.title)] %}
+{% set canonical_url = unlocalized_url('forums.posts', forum.slug, thread.id) %}
+{% if posts.number > 1 %}
+ {% set canonical_url = canonical_url|urlparams(page=posts.number) %}
+{% endif %}
+
+{% block above_main %}
+ <h1 id="forum-title">{{ forum.name }}</h1>
+{% endblock %}
+
+{% block content %}
+ <div class="grid_3">
+ <ul id="thread-actions" class="sidebar-nav">
+ {% if not thread.is_locked and
+ has_perm_or_owns('forums_forum.thread_edit_forum', thread, forum) %}
+ <li><a href="{{ url('forums.edit_thread', forum.slug, thread.id) }}">{{ _('Edit this thread') }}</a></li>
+ {% endif %}
+ {% if has_perm('forums_forum.thread_delete_forum', forum) %}
+ <li><a href="{{ url('forums.delete_thread', forum.slug, thread.id) }}">{{ _('Delete this thread') }}</a></li>
+ {% endif %}
+ {% if has_perm('forums_forum.thread_locked_forum', forum) %}
+ <li>
+ <form id="thread-lock-form" action="{{ url('forums.lock_thread', forum.slug, thread.id) }}" method="post">
+ {{ csrf() }}
+ </form>
+ <a data-type="submit" data-form="thread-lock-form">{% if thread.is_locked %}{{ _('Unlock this thread') }}{% else %}{{ _('Lock this thread') }}{% endif %}</a>
+ </li>
+ {% endif %}
+ {% if has_perm('forums_forum.thread_sticky_forum', forum) %}
+ <li>
+ <form id="thread-sticky-form" action="{{ url('forums.sticky_thread', forum.slug, thread.id) }}" method="post">
+ {{ csrf() }}
+ </form>
+ <a data-type="submit" data-form="thread-sticky-form">{% if thread.is_sticky %}{{ _('Unsticky this thread') }}{% else %}{{ _('Sticky this thread') }}{% endif %}</a>
+ </li>
+ {% endif %}
+ </ul>
+
+ {% if has_perm('forums_forum.thread_move_forum', forum) %}
+ <form id="move-thread-form" action="{{ url('forums.move_thread', forum.slug, thread.id) }}" method="post">
+ {{ csrf() }}
+ <select name="forum">
+ {% for f in forums %}
+ {% if has_perm('forums_forum.thread_move_forum', f) %}
+ <option value="{{ f.id }}" {% if f == forum %}selected="selected"{% endif %}>{{ f.name }}</option>
+ {% endif %}
+ {% endfor %}
+ </select>
+ <input type="submit" value="Move Thread" />
+ </form>
+ {% endif %}
+
+ {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
+ <br />
+ </div>
+
+ <article id="posts" class="grid_9">
+ <h1 class="nomargin">{{ thread.title }}</h1>
+ <ul class="cf" id="thread-meta">
+ {% if count %}<li>{{ count - 1 }} {{ _('Replies') }}</li>{% endif %}
+ {% if last_post %}<li>{{ _('Last reply by') }} {{ last_post.author }}</li>{% endif %}
+ {% if thread.is_sticky %}<li>{{ _('Sticky') }}</li>{% endif %}
+ {% if thread.is_locked %}<li>{{ _('Locked') }}</li>{% endif %}
+ </ul>
+ {% if user.is_authenticated() %}
+ <form action="{{ url('forums.watch_thread', forum_slug=forum.slug, thread_id=thread.id) }}" method="post">
+ {{ csrf() }}
+ {% if is_watching_thread %}
+ {% set watch = _('Stop watching this thread') %}
+ <input type="hidden" name="watch" value="no" />
+ {% else %}
+ {% set watch = _('Watch this thread') %}
+ <input type="hidden" name="watch" value="yes" />
+ {% endif %}
+ <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ MEDIA_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ </form>
+ {% endif %}
+
+ {% if posts %}
+ <ol class="posts">
+ {% for post in posts.object_list %}
+ <li class="cf" id="post-{{ post.id }}">
+ {% include "forums/includes/post.html" %}
+ </li>
+ {% endfor %}
+ </ol>
+
+ {{ posts|paginator }}
+
+ {% else %}
+ <p>{{ _('Oh, no! Looks like there are no posts!') }}</p>
+ {% endif %}
+
+ {% if user.is_authenticated() and not thread.is_locked and forum.allows_posting_by(user) %}
+ <form action="{{ url('forums.reply', forum.slug, thread.id)|urlparams(hash='post-reply') }}" method="post">
+ {{ csrf() }}
+ <h3 id="thread-reply-title">{{ _('Post a reply') }}</h3>
+ {{ errorlist(form) }}
+ <div id="thread-reply">
+ {{ content_editor(form.content) }}
+ </div>
+ <div class="editor-actions">
+ <button type="submit" class="btn btn-submit big">{{ _('Post Reply') }}</button>
+ <button type="submit" class="btn" id="preview" name="preview"
+ data-preview-url="{{ url('forums.post_preview_async') }}"
+ data-preview-container-id="post-preview"
+ data-preview-content-id="id_content">{{ _('Preview Reply') }}
+ </button>
+ </div>
+ </form>
+ {% elif user.is_authenticated() and thread.is_locked %}
+ <div id="thread-reply">
+ <p id="thread-locked">{{ _('This thread has been locked. It is no longer possible to post new replies.') }}</p>
+ </div>
+ {% endif %}
+ <div id="post-preview">
+ {% if post_preview %}
+ {% include "forums/includes/post_preview.html" %}
+ {% endif %}
+ </div>
+ </article>
+{% endblock %}
View
54 apps/forums/templates/forums/threads-new.html
@@ -1,54 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from 'includes/common_macros.html' import for_contributors_sidebar %}
-{% from "forums/includes/forum_macros-new.html" import thread_list with context %}
-{# L10n: {f} is the name of the forum. #}
-{% set title = _('{f} | Forums')|f(f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Contributor Forums')), (None, forum.name)] %}
-{% set styles = ('forums-new',) %}
-{% set canonical_url = unlocalized_url('forums.threads', forum.slug) %}
-{% if threads.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=threads.number) %}
-{% endif %}
-
-{% block content %}
- <div class="grid_3">
- {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
- <br />
- </div>
- <div class="grid_9">
- <article id="threads" class="content-box">
- <h1>{{ forum.name }}</h1>
- <div class="forum-actions">
- {% if not user.is_authenticated() or forum.allows_posting_by(user) %}
- <a id="new-thread" class="btn btn-submit" href="{{ url('forums.new_thread', forum_slug=forum.slug) }}">{{ _('Post a new thread') }}</a>
- {% endif %}
- {% if user.is_authenticated() %}
- <form action="{{ url('forums.watch_forum', forum_slug=forum.slug) }}" method="post">
- {{ csrf() }}
- {% if is_watching_forum %}
- {% set watch = _('Stop watching this forum') %}
- <input type="hidden" name="watch" value="no" />
- {% else %}
- {% set watch = _('Watch this forum') %}
- <input type="hidden" name="watch" value="yes" />
- {% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ MEDIA_URL }}img/blank.png" alt="" /> {{ watch }}</button>
- </form>
- {% endif %}
- </div>
- <ol class="threads-columns cf {% if not desc_toggle %}desc{% endif %}">
- <li class="type"><a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ _('Type') }}</a></li>
- <li class="title">{{ _('Title') }}</li>
- <li class="author{% if sort == 3 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=3, desc=desc_toggle) }}">{{ _('Author') }}</a></li>
- <li class="replies{% if sort == 4 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=4, desc=desc_toggle) }}">{{ _('Replies') }}</a></li>
- <li class="last-post{% if sort == 5 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=5, desc=desc_toggle) }}">{{ _('Last Post') }}</a></li>
- </ol>
- {% if threads.object_list %}
- {{ thread_list(threads, forum) }}
- {% else %}
- <p>{{ _('There are no threads. Maybe you should create some!') }}</p>
- {% endif %}
- </article>
- </div>
-{% endblock %}
View
48 apps/forums/templates/forums/threads-old.html
@@ -1,48 +0,0 @@
-{# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "forums/base.html" %}
-{% from "forums/includes/forum_macros.html" import thread_list with context %}
-{# L10n: {f} is the name of the forum. #}
-{% set title = _('{f} | Forums')|f(f=forum.name) %}
-{% set crumbs = [(url('forums.forums'), _('Forums')), (None, forum.name)] %}
-{% set canonical_url = unlocalized_url('forums.threads', forum.slug) %}
-{% if threads.number > 1 %}
- {% set canonical_url = canonical_url|urlparams(page=threads.number) %}
-{% endif %}
-
-{% block content %}
-<article id="threads" class="main">
- <h1>{{ forum.name }}</h1>
- <div class="badges">
- </div>
- <div class="forum-actions">
- {% if not user.is_authenticated() or forum.allows_posting_by(user) %}
- <a id="new-thread" class="btn btn-important" href="{{ url('forums.new_thread', forum_slug=forum.slug) }}">{{ _('Post a new thread') }}</a>
- {% endif %}
- {% if user.is_authenticated() %}
- <form action="{{ url('forums.watch_forum', forum_slug=forum.slug) }}" method="post">
- {{ csrf() }}
- {% if is_watching_forum %}
- {% set watch = _('Stop watching this forum') %}
- <input type="hidden" name="watch" value="no" />
- {% else %}
- {% set watch = _('Watch this forum') %}
- <input type="hidden" name="watch" value="yes" />
- {% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ MEDIA_URL }}img/forums/watch.png" alt="" /> {{ watch }}</button>
- </form>
- {% endif %}
- </div>
- <ol class="threads-columns {% if not desc_toggle %}desc{% endif %}">
- <li class="type"><a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ _('Type') }}</a></li>
- <li class="title">{{ _('Title') }}</li>
- <li class="author{% if sort == 3 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=3, desc=desc_toggle) }}">{{ _('Author') }}</a></li>
- <li class="replies{% if sort == 4 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=4, desc=desc_toggle) }}">{{ _('Replies') }}</a></li>
- <li class="last-post{% if sort == 5 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=5, desc=desc_toggle) }}">{{ _('Last Post') }}</a></li>
- </ol>
- {% if threads.object_list %}
- {{ thread_list(threads, forum) }}
- {% else %}
- <p>{{ _('There are no threads. Maybe you should create some!') }}</p>
- {% endif %}
-</article>
-{% endblock %}
View
58 apps/forums/templates/forums/threads.html
@@ -1,5 +1,53 @@
-{% if show_new_sumo(request) %}
- {% extends "forums/threads-new.html" %}
-{% else %}
- {% extends "forums/threads-old.html" %}
-{% endif %}
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "forums/base.html" %}
+{% from 'includes/common_macros.html' import for_contributors_sidebar %}
+{% from "forums/includes/forum_macros.html" import thread_list with context %}
+{# L10n: {f} is the name of the forum. #}
+{% set title = _('{f} | Forums')|f(f=forum.name) %}
+{% set crumbs = [(url('forums.forums'), _('Contributor Forums')), (None, forum.name)] %}
+{% set canonical_url = unlocalized_url('forums.threads', forum.slug) %}
+{% if threads.number > 1 %}
+ {% set canonical_url = canonical_url|urlparams(page=threads.number) %}
+{% endif %}
+
+{% block content %}
+ <div class="grid_3">
+ {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='forums') }}
+ <br />
+ </div>
+ <div class="grid_9">
+ <article id="threads" class="content-box">
+ <h1>{{ forum.name }}</h1>
+ <div class="forum-actions">
+ {% if not user.is_authenticated() or forum.allows_posting_by(user) %}
+ <a id="new-thread" class="btn btn-submit" href="{{ url('forums.new_thread', forum_slug=forum.slug) }}">{{ _('Post a new thread') }}</a>
+ {% endif %}
+ {% if user.is_authenticated() %}
+ <form action="{{ url('forums.watch_forum', forum_slug=forum.slug) }}" method="post">
+ {{ csrf() }}
+ {% if is_watching_forum %}
+ {% set watch = _('Stop watching this forum') %}
+ <input type="hidden" name="watch" value="no" />
+ {% else %}
+ {% set watch = _('Watch this forum') %}
+ <input type="hidden" name="watch" value="yes" />
+ {% endif %}
+ <button type="submit" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ MEDIA_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ </form>
+ {% endif %}
+ </div>
+ <ol class="threads-columns cf {% if not desc_toggle %}desc{% endif %}">
+ <li class="type"><a href="{{ url('forums.threads', forum_slug=forum.slug) }}">{{ _('Type') }}</a></li>
+ <li class="title">{{ _('Title') }}</li>
+ <li class="author{% if sort == 3 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=3, desc=desc_toggle) }}">{{ _('Author') }}</a></li>
+ <li class="replies{% if sort == 4 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=4, desc=desc_toggle) }}">{{ _('Replies') }}</a></li>
+ <li class="last-post{% if sort == 5 %} sort{% endif %}"><a href="{{ request.path|urlparams(sort=5, desc=desc_toggle) }}">{{ _('Last Post') }}</a></li>
+ </ol>
+ {% if threads.object_list %}
+ {{ thread_list(threads, forum) }}
+ {% else %}
+ <p>{{ _('There are no threads. Maybe you should create some!') }}</p>
+ {% endif %}
+ </article>
+ </div>
+{% endblock %}
View
9 apps/forums/views.py
@@ -17,7 +17,7 @@
from forums.feeds import ThreadsFeed, PostsFeed
from forums.forms import ReplyForm, NewThreadForm, EditThreadForm, EditPostForm
from forums.models import Forum, Thread, Post
-from sumo.helpers import urlparams, show_new_sumo
+from sumo.helpers import urlparams
from sumo.urlresolvers import reverse
from sumo.utils import paginate
from users.models import Setting
@@ -472,9 +472,6 @@ def post_preview_async(request):
statsd.incr('forums.preview')
post = Post(author=request.user, content=request.POST.get('content', ''))
post.author_post_count = 1
- if show_new_sumo(request):
- template = 'forums/includes/post_preview-new.html'
- else:
- template = 'forums/includes/post_preview.html'
- return jingo.render(request, template, {'post_preview': post})
+ return jingo.render(
+ request, 'forums/includes/post_preview.html', {'post_preview': post})
View
2  apps/kbforums/templates/kbforums/base.html
@@ -2,7 +2,7 @@
{% extends "base.html" %}
{% from "wiki/includes/sidebar_modules.html" import document_tools %}
{% from 'includes/common_macros.html' import for_contributors_sidebar %}
-{% set styles = ('forums-new',) %}
+{% set styles = ('forums',) %}
{% set scripts = ('forums',) %}
{% set meta = (('robots', 'noindex'),) %}
View
2  apps/landings/templates/landings/home.html
@@ -3,7 +3,7 @@
{% from 'products/includes/product_macros.html' import product_cards with context %}
{% from 'topics/includes/topic_macros.html' import hot_topics, help_topics with context %}
{% from 'includes/common_macros.html' import for_contributors %}
-{% set styles = ('home-new',) %}
+{% set styles = ('home',) %}
{% block content %}
<div class="grid_12">
View
3  apps/questions/templates/questions/base.html
@@ -1,8 +1,5 @@
{# vim: set ts=2 et sts=2 sw=2: #}
{% extends "base.html" %}
-{% if not for_contributors %}
- {% from 'includes/sidebar_modules.html' import for_contributors %}
-{% endif %}
{% if not styles %}
{% set styles = ('questions', 'jqueryui/jqueryui') %}
{% endif %}
View
2  apps/questions/views.py
@@ -47,7 +47,7 @@
from questions.question_config import products
from search.utils import locale_or_default, clean_excerpt
from search.es_utils import ESTimeoutError, ESMaxRetryError, ESException
-from sumo.helpers import urlparams, show_new_sumo
+from sumo.helpers import urlparams
from sumo.urlresolvers import reverse
from sumo.utils import paginate, simple_paginate, build_paged_url
from tags.utils import add_existing_tag
View
40 apps/search/templates/search/includes/macros.html
@@ -2,33 +2,17 @@
{% macro basic_search_form(primary=False) -%}
{# Must be imported with context #}
- {% if show_new_sumo(request) %}
- <div {% if primary %}id="basic-search"{% endif %} class="search-refine">
- <form class="search-form cf" role="search" method="get" action="search">
- <input type="hidden" name="esab" value="{% if waffle.flag('search-ab') %}a{% else %}b{% endif %}">
- {% for name, field in search_form.fields.items() if not name in ('q',) %}
- {% set list = request.GET.getlist(name) %}
- {% for value in list %}
- <input type="hidden" name="{{ name }}" value="{{ value }}" />
- {% endfor %}
+ <div {% if primary %}id="basic-search"{% endif %} class="search-refine">
+ <form class="search-form cf" role="search" method="get" action="search">
+ <input type="hidden" name="esab" value="{% if waffle.flag('search-ab') %}a{% else %}b{% endif %}">
+ {% for name, field in search_form.fields.items() if not name in ('q',) %}
+ {% set list = request.GET.getlist(name) %}
+ {% for value in list %}
+ <input type="hidden" name="{{ name }}" value="{{ value }}" />
{% endfor %}
- <input type="text" class="searchbox" value="{{ q }}" name="q">
- <button type="submit" class="btn btn-important big">{{ _('Search Mozilla Support') }}</button>
- </form>
- </div>
- {% else %}
- <div {% if primary %}id="basic-search"{% endif %} class="search-refine">
- <form role="search" method="get" action="search">
- <input type="hidden" name="esab" value="{% if waffle.flag('search-ab') %}a{% else %}b{% endif %}">
- {% for name, field in search_form.fields.items() if not name in ('q',) %}
- {% set list = request.GET.getlist(name) %}
- {% for value in list %}
- <input type="hidden" name="{{ name }}" value="{{ value }}" />
- {% endfor %}
- {% endfor %}
- <input type="text" class="search-query search-refine-query" value="{{ q }}" name="q">
- <input type="submit" class="search-refine-submit btn-large" value="{{ _('Search Mozilla Support') }}">
- </form>
- </div>
- {% endif %}
+ {% endfor %}
+ <input type="text" class="searchbox" value="{{ q }}" name="q">
+ <button type="submit" class="btn btn-important big">{{ _('Search Mozilla Support') }}</button>
+ </form>
+ </div>
{%- endmacro %}
View
14 apps/sumo/helpers.py
@@ -166,12 +166,7 @@ def breadcrumbs(context, items=list(), add_default=True):
c = {'breadcrumbs': crumbs}
- if show_new_sumo(context['request']):
- layout = 'layout/breadcrumbs.html'
- else:
- layout = 'layout/breadcrumbs-old.html'
-
- t = env.get_template(layout).render(c)
+ t = env.get_template('layout/breadcrumbs.html').render(c)
return jinja2.Markup(t)
@@ -363,13 +358,6 @@ def remove(list_, item):
return [i for i in list_ if i != item]
-@register.function
-def show_new_sumo(request):
- """Return True if the new IA should be shown to the user."""
- # Show it to everybody!!!! \o/
- return True
-
-
IDEVICE_USER_AGENTS = re.compile('iphone|ipad|ipod')
View
46 media/css/autocomplete.css
@@ -1,46 +0,0 @@
-/* autocomplete styles */
-.autocomplete-w1 {
- left: 0;
- margin: 8px 0 0 6px;
- position: absolute;
- top: 0;
-}
-
-.html-rtl .autocomplete-w1 {
- left: auto;
- margin: 8px 6px 0 0;
- right: 0;
-}
-
-.autocomplete {
- background: #fff;
- border: 1px solid #bbb;
- box-shadow: 2px 2px 4px rgba(0,0,0,.25), inset -1px -1px 1px rgba(0,0,0,.125), inset 1px 0 1px rgba(255,255,255,.25);
- -moz-box-shadow: 2px 2px 4px rgba(0,0,0,.25), inset -1px -1px 1px rgba(0,0,0,.125), inset 1px 0 1px rgba(255,255,255,.25);
- -webkit-box-shadow: 2px 2px 4px rgba(0,0,0,.25), inset -1px -1px 1px rgba(0,0,0,.125), inset 1px 0 1px rgba(255,255,255,.25);
- cursor: default;
- font-size: 15px;
- margin: -6px 6px 6px -6px;
- max-height: 350px;
- overflow: auto;
- text-align: left;
-}
-
-.html-rtl .autocomplete {
- margin: -6px -6px 6px 6px;
- text-align: right;
-}
-
-.autocomplete .selected {
- background: #f0f0f0;
-}
-
-.autocomplete div {
- padding: 2px 5px;
- white-space: nowrap;
-}
-
-.autocomplete strong {
- color: #3399ff;
- font-weight: normal;
-}
View
797 media/css/customercare.css
@@ -1,797 +0,0 @@
-/*
- * Customer Care CSS
- */
-
-#main,
-#main article.main {
- background: none;
- padding: 0;
-}
-
-#quick-links {
- margin-bottom: 118px;
-}
-
-.feature-contents {
- padding: 0 0 0 25px;
- width: 640px;
-}
-
-.feature-contents h1,
-.feature-contents h2 {
- line-height: 1em;
-}
-
-.feature-contents h1 {
- font-size: 46px;
- font-style: italic;
-}
-
-.feature-contents h1 strong {
- display: block;
- font-family: MetaBlack,"Trebuchet MS",sans-serif;
- font-size: 64px;
- font-style: normal;
- text-transform: uppercase;
-}
-
-.feature-contents h2 {
- font-size: 150%;
- line-height: 1.2em;
- margin: 15px 200px 0 0;
-}
-
-.progressbar {
- background: #DDD;
- background: -moz-linear-gradient(#DDD,#F8F8F8) repeat scroll 0 0 transparent;
- background: -webkit-gradient(linear,left top,left bottom,from(#DDD),to(#F8F8F8));
- border-radius: 12px;
- height: 25px;
- margin: 7px 0;
- position: relative;
-}
-
-.progressbar > div {
- background: #F09609;
- background: -moz-linear-gradient(#FFC900,#F09609) repeat scroll 0 0 transparent;
- background: -webkit-gradient(linear,left top,left bottom,from(#FFC900),to(#F09609));
- border-radius: 12px;
- color: #fff;
- float: left;
- font-size: 18px;
- font-weight: bold;
- height: 24px;
- padding: 1px 0 0 0;
- text-align: right;
-}
-
-.progressbar.complete > div {
- background: #489615;
- background: -moz-linear-gradient(#84C63C,#489615) repeat scroll 0 0 transparent;
- background: -webkit-gradient(linear,left top,left bottom,from(#84C63C),to(#489615));
- padding: 0;
-}
-
-.progressbar > div > span {
- padding: 0 15px 0 0;
-}
-
-#speech-bubbles {
- background: transparent url(../img/customercare/bubbles.png) no-repeat 0 25px;
- min-height: 100px;
- padding: 60px 0 15px 25px;
-}
-
-#speech-bubbles li {
- color: #fff;
- float: left;
- font-size: 20px;
- font-style: italic;
- margin: 0 0 0 25px;
- padding: 5px 0 0;
- width: 200px;
-}
-
-#speech-bubbles li strong {
- display: block;
- font-family: MetaBlack,"Trebuchet MS",sans-serif;
- font-size: 21px;
- font-style: normal;
- text-transform: uppercase;
-}
-
-#stats {
- color: #aaa;
- padding: 20px 40px 40px;
-}
-
-#stats strong {
- color: #282828;
-}
-
-#stats > span {
- float: right;
- margin: 0 12px;
-}
-
-#stats > p {
- padding: 0 12px;
-}
-
-#tweetcontainer {
- border: 1px solid #f5f5f5;
- clear: left;
- float: left;
- padding: 2px;
-}
-
-#tweetcontainer h2 {
- background: none;
- float: left;
- font-size: 20px;
- font-weight: bold;
- line-height: 3em;
- margin: 0px;
- padding: 0px;
-}
-
-#tweetcontainer #twitter-icon {
- float: left;
- padding: 4px;
-}
-
-#refresh-busy {
- display: none;
- float: right;
- height: 10px;
- margin: 17px 5px 0 0;
- padding: 6px 8px;
- width: 10px;
-}
-
-#infinite-scroll {
- text-align: center;
-}
-#scroll-busy {
- display: none;
- margin: 10px 0;
-}
-
-.avatar img {
- height: 48px;
- width: 48px;
-}
-
-.tweets-header {
- padding: 0 15px;
-}
-
-div.warning-box {
- margin: 10px 20px;
-}
-
-#tweets {
- margin: 0 10px;
-}
-
-#tweets ul {
- margin: 0px;
-}
-
-#tweets li {
- list-style-type: none;
-}
-
-#tweets div.tweet-contents {
- border-top: 1px solid #ccc;
- cursor: pointer;
- margin-bottom: 0px;
- overflow: auto;
- padding: 10px;
- width: 690px;
-}
-#tweets div.replies div.tweet-contents {
- padding-left: 70px;
- width: 630px;
-}
-#tweets div.alt {
- background: -moz-linear-gradient(top, #fff, #f5f5f5);
- background: -webkit-gradient(linear, center top, center bottom, from(#fff), to(#f5f5f5));
-}
-
-#tweets div.replies {
- clear: left;
- display: none;
-}
-
-#tweets div.tweet-contents:hover {
- background: -moz-linear-gradient(top, #fffffd, #fdefa6);
- background: -webkit-gradient(linear, center top, center bottom, from(#fff), to(#fdefa6));
- border-top: 1px solid #fef1ad;
-}
-
-#tweets li {
- position: relative;
- width: 710px;
-}
-
-#tweets li.hidden-reply {
- opacity: .4;
-}
-
-#tweets li img {
- border: solid 1px #cacccb;
- float: left;
- height: 48px;
- margin-right: 1em;
- padding: 0px;
- width: 48px;
-}
-
-#tweets li .twittername {
- color: #307fc1;
- font-size: 13px;
- font-weight: bold;
- line-height: 1.4em;
- text-decoration: none;
-}
-
-#tweets li time,
-#initial-tweet time {
- color: #afaba3;
- float: right;
- font-size: 12px;
- font-style: italic;
- font-weight: normal;
-}
-
-#tweets li time:hover,
-#initial-tweet time:hover {
- text-decoration: underline;
-}
-
-#tweets li .text {
- color: #69645b;
- font-size: 14px;
- font-weight: normal;
- margin: 0 0 0 63px;
- width: 550px;
-}
-
-#tweets .remove_tweet {
- display: none;
-}
-html.js #tweets li:hover .remove_tweet,
-#tweets li .remove_tweet.clicked {
- display: inline;
- position: absolute;
- right: 10px;
- bottom: 10px;
-}
-#tweets li .remove_tweet.clicked {
- padding-left: 20px;
- background: url('../img/customercare/spinner.gif') left top no-repeat;
-}
-
-#tweets li .reply_count,
-#tweets li .remove_tweet {
- clear: right;
- color: #447BC4;
- float: right;
- font-family: Verdana, sans-serif;
- font-size: 11px;
-}
-#tweets li .reply_count.you {
- font-weight: bold;
-}
-#tweets li a.reply_count {
- color: #0ba643;
-}
-#tweets li a.reply_count:before {
- content: '\25B6\A0'; /* rightarrow, space */
-}
-#tweets li a.reply_count.opened:before {
- content: '\25BC\A0'; /* downarrow, space */
-}
-#tweets li .reply_count:hover,
-#tweets li .remove_tweet:hover {
- text-decoration: underline;
-}
-#tweets li .remove_tweet:before {
- color: #e45d49;
- content: '\2716\A0'; /* big X, space */
- font-size: 110%;
-}
-
-.tweets-buttons {
- float: right;
- line-height: 4em;
- padding-right: 15px;
-}
-
-.tweet a, .tweet a:hover {
- color: #69645b;
- text-decoration: none;
-}
-
-.hidden {
- display: none;
-}
-
-/* reply page styling */
-
-#reply-container {
- background-color: #fff;
- font-family: Verdana, sans-serif;
- margin: 0 auto;
- text-align: left;
- top: 86px;
-}
-
-#reply-container,
-#reply-container #replies {
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
-}
-
-#initial-tweet img {
- border: 1px solid #bbb;
- float: left;
-}
-
-#initial-tweet .box {
- background: #fff;
- border: 1px solid #aaa;
- color: #69645b;
- display: block;
- font-size: 80%;
- margin-left: 70px;
- padding: 6px 9px 10px 9px;
- text-align: left;
-}
-
-#initial-tweet a.twittername {
- color: #2276bb;
- font-weight: bold;
- text-decoration: none;
-}
-
-#initial-tweet a.avatar {
- display: inline;
-}
-
-#initial-tweet .text {
- padding-top: 4px;
-}
-
-#initial-tweet #arrow {
- border: 0;
- left: 75px;
- position: absolute;
- top: 60px;
-}
-
-#reply-container h4 {
- color: #4b4740;
- font-family: Verdana, sans-serif;
- font-size: 125%;
- font-weight: normal;
- margin-bottom: 15px;
-}
-
-#reply-container #replies {
- background: #8fc1da;
- background: -moz-linear-gradient(center top, #8fc1da, #e5f1f7) repeat;
- background: -webkit-gradient(linear, center top, center bottom, from(#8fc1da), to(#e5f1f7));
- margin-top: 20px;
- padding: 15px 20px;
-}
-
-#reply-container h3.ui-accordion-header {
- background: #f0f0f0 url('../img/customercare/expander-closed.png') 8px 50% no-repeat;
- border: 1px solid #b2b2b2;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- font-family: Verdana, sans-serif;
- font-size: 12px;
- margin: 0 0 9px 0;
- padding: 4px 0 5px 24px;
-}
-
-#reply-container h3.ui-accordion-header a {
- color: #69645b;
- display: block;
-}
-
-#reply-container h3.ui-accordion-header a:hover {
- text-decoration: none;
-}
-
-#reply-container #replies ul {
- list-style-type: none;
- margin: 0 0 10px 24px;
-}
-
-#reply-container #replies li a {
- color: #0489b7;
- display: block;
- padding-bottom: 2px;
-}
-
-#reply-container #no-responses a {
- color: #447BC4;
-}
-
-#reply-container h3.ui-accordion-header.ui-state-default {
- background: #f0f0f0 url('../img/customercare/expander-closed.png') 8px 50% no-repeat;
-}
-
-#reply-container h3.ui-accordion-header.ui-state-active {
- background: #f0f0f0 url('../img/customercare/expander-open.png') 8px 50% no-repeat;
-}
-
-#reply-container h3.ui-accordion-header.ui-state-default a {
- color: #69645b;
- font-weight: normal;
-}
-
-#reply-container h3.ui-accordion-header.ui-state-active a {
- color: #69645b;
- font-weight: bold;
-}
-
-#accordion .ui-widget-content {
- background: none;
- border: none;
-}
-
-.topics .snippet {
- display: none;
-}
-
-#reply {
- padding-bottom: 34px;
-}
-#reply .desc {
- color: #69645B;
- font-size: 85%;
- margin-bottom: 10px;
- width: 340px;
-}
-
-#reply-message {
- background: #fff;
- border: 1px solid #aaa;
- height: 65px;
- font-size: .9em;
- padding: 10px 15px;
- width:325px;
-}
-
-#reply #reply-arrow {
- display: inline;
- left: 30px;
- position: relative;
- top: 5px;
-}
-
-#error-message,
-#submit-message {
- color: #4b4740;
- display: none;
- float: left;
- font-weight: bold;
- height: 21px;
- margin-top: 14px;
-}
-
-#submit-message {
- background: url('../img/customercare/reply-check.png') right top no-repeat;
- padding-right: 23px;
- padding-top: 3px;
-}
-
-#error-message {
- background: url('../img/customercare/notification-error.png') right 4px no-repeat;
- padding-right: 20px;
-}
-
-#reply .container {
- position: relative;
- top: -12px;
-}
-
-#reply .submitButton {
- background: -moz-linear-gradient(center top, #eed052 15px, #ebb04f 18px, #e79f30, #e0752b);
- /* color-stop percentages according to height */
- background: -webkit-gradient(linear, center top, center bottom, color-stop(.417, #eed052), color-stop(.5, #ebb04f), color-stop(.75, #e79f30), to(#e0752b));
- border-left: 1px solid #d4661a;
- border-right: 1px solid #d4661a;
- border-top: 1px solid #d19f7c;
- border-bottom: 1px solid #ba5c1c;
- border-radius: 6px;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- box-shadow: 0 0 5px #777;
- -moz-box-shadow: 0 0 5px #777;
- color: #b01a04;
- cursor: pointer;
- float: right;
- height: 36px;
- line-height: 36px;
- margin-top: 10px;
- text-align: center;
- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.6);
- width: 140px;
-}
-
-#submit-busy {
- display: none;
- height: 13px;
- padding-left: 5px;
- width: 13px;
-}
-
-#reply .submitButton.busy {
- background: -moz-linear-gradient(center top, #ccc 15px, #ccc 18px, #aaa, #aaa);
- background: -webkit-gradient(linear, center top, center bottom, color-stop(.417, #ccc), color-stop(.5, #ccc), color-stop(.75, #aaa), to(#aaa));
- border-color: #aaa;
- color: #666;
-}
-
-#reply .submitButton.busy #submit-busy {
- display: inline;
-}
-
-#reply .character-counter {
- color: #fff;
- float: right;
- font-weight: bold;
- font-size: 24px;
- position: relative;
- top: 33px;
- width: 50px;
-}
-
-.hrbreak {
- background: url('../img/customercare/hr-line.png') center 20px no-repeat;
- height: 50px;
-}
-/* end of reply page styling */
-
-.notice {
- background-color:#FFFFCC;
- border:2px solid orange;
- float: left;
- margin:1em 0;
- padding:1em;
- text-align:center;
-}
-
-.input-placeholder {
- color: #69645b;
-}
-
-.header-button,
-#twitter-logout input.header-button {
- background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
- background: -webkit-gradient(linear, center top, center bottom, from(#f9f9f9), to(#e3e3e3));
- border: 1px solid #BBBBBB;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- box-shadow: none;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- color: #000000;
- cursor: default;
- float: right;
- margin: 15px 5px 0 0;
- padding: 3px 8px;
- text-align: center;
- text-shadow: none;
-}
-
-.tweets-header select {
- margin: 15px 5px 0 0;
- float: right;
- padding: 4px 8px;
-}
-
-.header-button:hover,
-a.header-button:hover {
- color: #307FC1;
-}
-
-.header-button:visited {
- color: rgb(0, 81, 185);
-}
-
-a.header-button {
- color: #000;
- padding: 4px 8px;
-}
-
-#twitter-modal {
- color: #69645b;
- font-family: Verdana, sans-serif;
- text-align: left;
-}
-
-#twitter-modal .inner-container {
- background: #fff;
- border: 10px solid #9fcce1;
- font-size: 90%;
- padding: 20px 18px;
-}
-
-#twitter-modal h4 {
- color: #4b4740;
- font-family: Verdana, sans-serif;
- font-size: 135%;
- font-weight: bold;
- margin-bottom: 5px;
-}
-
-#twitter-modal p {
- margin: 0 0 10px 0;
-}
-
-#twitter-modal .inner-container > div,
-.btn-modal {
- height: 36px;
-}
-
-.btn-modal,
-.btn-modal:visited {
- background: -moz-linear-gradient(center top, #f1f1f1 15px, #eee 18px, #ddd, #ccc);
- background: -webkit-gradient(linear, center top, center bottom, color-stop(.417, #f1f1f1), color-stop(.5, #eee), color-stop(.75, #ddd), to(#ccc));
- border-radius: 6px;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- color: #5a5a5a;
- display: block;
- float: left;
- line-height: 35px;
- text-align: center;
- text-decoration: none;
- text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.6);
- width: 200px;
-}
-
-.btn-modal.register {
- margin: 0 0 0 14px;
-}
-
-.btn-modal.signin-twitter {
- float: none;
- margin: 15px auto;
- width: 300px;
-}
-
-.btn-modal .highlight,
-.btn-modal.signin-twitter,
-.btn-modal.signin-twitter:visited {
- color: #10a2c6;
-}
-
-/*----------------------------------
- AoA Sidebar
-----------------------------------*/
-
-#side-stats {
- padding: 10px;
-}
-
-#side-stats h1 {
- padding: 10px;
-}
-
-#side-stats .unavailable {
- color: #b41b00;
- margin-top: 10px;
- text-align: center;
-}
-
-#side-stats .bubble {
- background-color: #E6F0F9;
- -webkit-border-radius: 50px;
- -moz-border-radius: 50px;
- border-radius: 50px;
- margin-top: 10px;
- text-align: center;
-}
-
-#side-stats .speech {
- background: transparent url(../img/customercare/bubble.png) no-repeat 50px bottom;
- height: 20px;
- width: 100%;
-}
-
-#side-stats .bubble div {
- font-variant: small-caps;
-}
-
-#side-stats .perc,
-#side-stats .numbers {
- color: #669be1;
- font-family: MetaBlack,"Trebuchet MS",sans-serif;
- font-size: 20px;
- font-style: normal;
- font-weight: normal;
- padding: 10px 0 0;
-}
-
-#side-stats .perc strong,
-#side-stats .numbers strong {
- color: #666;
- font-family: Georgia, freeserif, serif;
- font-size: 28px;
- font-style: italic;
- font-weight: normal;
- text-align: center;
-}
-#side-stats .numbers {
- font-size: 13px;
-}
-#side-stats .numbers strong {
- display: block;
- font-size: 20px;
-}
-
-#side-stats .numbers .replies,
-#side-stats .numbers .tweets {
- text-align: center;
- width: 44%;
-}
-
-#side-stats .numbers .replies {
- float: left;
-}
-
-#side-stats .numbers .separator {
- color: #4B4742;
- float: left;
- font-family: Georgia, freeserif, serif;
- font-size: 20px;
- font-style: normal;
- font-weight: normal;
- margin-left: .25em;
-}
-
-#side-stats .numbers .tweets {
- float: right;
-}
-
-#side-stats select {
- font-family: Arial,Helvetica,sans-serif;
- margin: 10px 0 20px;
- text-align: center;
- width: 80%;
-}
-
-#side-stats .contribs {
- clear: both;
- padding: 10px;
- width: 160px;
-}
-
-#side-stats .avatar {
- margin: 2px;
- width: 32px;
-}
-
-#side-stats .contribs .contributors {
- display: none;
-}
-
-#side-stats .contribs .contributors:first-child {
- display: block;
-}
-
-#next-level {
- background: -moz-radial-gradient(center -40%, circle, rgba(255,255,255,1), rgba(255,255,255,0) 50%);
- background: -webkit-gradient(radial, center -40%, 0, center -40%, 175, from(rgba(255,255,255,1)), to(rgba(255,255,255,0)));
-}
View
563 media/css/forums.css
@@ -1,563 +0,0 @@
-/* Discussion forums CSS */
-ol.threads-columns,
-ol.threads,
-ol.forums-columns,
-ol.forums,
-ol.posts-columns,
-ol.posts {
- clear: both;
- list-style-type: none;
- margin: 0;
- padding: 0;
-}
-
-ol.forums-columns li,
-ol.threads-columns li,
-ol.posts-columns li {
- background-color: #f0f0f0;
- border-bottom: 2px solid #e4e4e4;
- color: #afaba3;
- float: left;
- font-family: Verdana, "Verdana Ref", sans-serif;
- font-size: 10px;