Permalink
Browse files

Remove more of the old theme files.

  • Loading branch information...
1 parent ba9dd9f commit 500893e6c3ac3ffa023135a2765e0ba21907c4f7 @rlr rlr committed Oct 11, 2012
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
@@ -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',) %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
Oops, something went wrong.

0 comments on commit 500893e

Please sign in to comment.