From a4bd5575bbf702ff52fe393d13f39bc7e3f99b80 Mon Sep 17 00:00:00 2001
From: Ricky Rosario <rickyrosario@gmail.com>
Date: Fri, 4 Jun 2010 14:34:44 -0400
Subject: [PATCH] created forums css bundle and a forums/base.html to include
 it (bug 568015)

---
 apps/forums/templates/forums/base.html                  | 4 ++++
 apps/forums/templates/forums/confirm_post_delete.html   | 2 +-
 apps/forums/templates/forums/confirm_thread_delete.html | 2 +-
 apps/forums/templates/forums/edit_post.html             | 3 +--
 apps/forums/templates/forums/edit_thread.html           | 3 +--
 apps/forums/templates/forums/forums.html                | 2 +-
 apps/forums/templates/forums/new_thread.html            | 3 +--
 apps/forums/templates/forums/posts.html                 | 3 +--
 apps/forums/templates/forums/threads.html               | 2 +-
 settings.py                                             | 2 ++
 10 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 apps/forums/templates/forums/base.html

diff --git a/apps/forums/templates/forums/base.html b/apps/forums/templates/forums/base.html
new file mode 100644
index 000000000..4c2e1eff6
--- /dev/null
+++ b/apps/forums/templates/forums/base.html
@@ -0,0 +1,4 @@
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% extends "common/base.html" %}
+{% set styles = ('forums',) %}
+{% set scripts = ('forums',) %}
\ No newline at end of file
diff --git a/apps/forums/templates/forums/confirm_post_delete.html b/apps/forums/templates/forums/confirm_post_delete.html
index 2a213ef0a..18abe4f2e 100644
--- a/apps/forums/templates/forums/confirm_post_delete.html
+++ b/apps/forums/templates/forums/confirm_post_delete.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {# L10n: {t} is the title of the thread. {f} if the name of the forum. #}
 {% set title = _('Delete Post | {t} | {f} | Forums')|f(t=thread.title, f=forum.name) %}
 {% set crumbs = [(url('forums.forums'), _('Forums')),
diff --git a/apps/forums/templates/forums/confirm_thread_delete.html b/apps/forums/templates/forums/confirm_thread_delete.html
index 62db8d047..64647f819 100644
--- a/apps/forums/templates/forums/confirm_thread_delete.html
+++ b/apps/forums/templates/forums/confirm_thread_delete.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {# L10n: {t} is the title of the thread. {f} if the name of the forum. #}
 {% set title = _('Delete Thread | {t} | {f} | Forums')|f(t=thread.title, f=forum.name) %}
 {% set crumbs = [(url('forums.forums'), _('Forums')),
diff --git a/apps/forums/templates/forums/edit_post.html b/apps/forums/templates/forums/edit_post.html
index 6474602d4..7caf292c9 100644
--- a/apps/forums/templates/forums/edit_post.html
+++ b/apps/forums/templates/forums/edit_post.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
 {# L10n: {f} if the name of the forum, {t} if the name of the thread. #}
 {% set title = _('Editing a post | {t} | {f} | Forums')|f(t=thread.title,f=forum.name) %}
@@ -7,7 +7,6 @@
                  (url('forums.threads', forum.slug), forum.name),
                  (url('forums.posts', forum.slug, thread.id), thread.title),
                  (None, _('Edit a post'))] %}
-{% set scripts = ('forums',) %}
 
 {% block content %}
   <h2>{{ _('Edit a post') }}</h2>
diff --git a/apps/forums/templates/forums/edit_thread.html b/apps/forums/templates/forums/edit_thread.html
index d19a5bb3e..7f766f7d8 100644
--- a/apps/forums/templates/forums/edit_thread.html
+++ b/apps/forums/templates/forums/edit_thread.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% 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) %}
@@ -7,7 +7,6 @@
                  (url('forums.threads', forum.slug), forum.name),
                  (url('forums.posts', forum.slug, thread.id), thread.title),
                  (None, _('Edit thread'))] %}
-{% set scripts = ('forums',) %}
 
 {% block content %}
   <h2>{{ _('Edit thread "{t}"')|f(t=thread.title) }}</h2>
diff --git a/apps/forums/templates/forums/forums.html b/apps/forums/templates/forums/forums.html
index 3a1075930..a584f8c0b 100644
--- a/apps/forums/templates/forums/forums.html
+++ b/apps/forums/templates/forums/forums.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {% set title = _('Forums') %}
 {% set crumbs = [(None, title)] %}
 
diff --git a/apps/forums/templates/forums/new_thread.html b/apps/forums/templates/forums/new_thread.html
index 2c7eeb63f..219c16ee0 100644
--- a/apps/forums/templates/forums/new_thread.html
+++ b/apps/forums/templates/forums/new_thread.html
@@ -1,12 +1,11 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
 {# 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'))] %}
-{% set scripts = ('forums',) %}
 
 {% block content %}
   <h2>{{ _('Create a new thread') }}</h2>
diff --git a/apps/forums/templates/forums/posts.html b/apps/forums/templates/forums/posts.html
index 1f764f03f..232a5c81d 100644
--- a/apps/forums/templates/forums/posts.html
+++ b/apps/forums/templates/forums/posts.html
@@ -1,12 +1,11 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
 {# 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 scripts = ('forums',) %}
 
 {% block content %}
   <h2>{{ thread.title }}</h2>
diff --git a/apps/forums/templates/forums/threads.html b/apps/forums/templates/forums/threads.html
index be150b657..afd4d70f1 100644
--- a/apps/forums/templates/forums/threads.html
+++ b/apps/forums/templates/forums/threads.html
@@ -1,5 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
-{% extends "common/base.html" %}
+{% extends "forums/base.html" %}
 {# 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)] %}
diff --git a/settings.py b/settings.py
index bb5ece13f..8d2b601d9 100644
--- a/settings.py
+++ b/settings.py
@@ -226,6 +226,8 @@ MINIFY_BUNDLES = {
         'common': (
             'css/main.css',
             'css/sidebar.css',
+        ),
+        'forums': (
             'css/forums.css',
         ),
         'search': (