Moved all the main_page/sidebar.html code into widgets, now

main_page/sidebar.html is just a layout container.

4 files changed, 34 insertions, 32 deletions

diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
index 57267ea3..aca8256f 100644
--- a/askbot/skins/default/templates/main_page/sidebar.html
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -3,44 +3,15 @@
 {{ settings.SIDEBAR_MAIN_HEADER }}
 
 {% if contributors and settings.SIDEBAR_MAIN_SHOW_AVATARS %}
-    {% cache 600 "contributors" contributors search_tags scope sort query context.page context.page_size language_code %}
-    <div id="contrib-users" class="box">
-    <h2 class="contributorback">{% trans %}Contributors{% endtrans %}</h2>
-    {% spaceless %}
-        {% for person in contributors %}
-            {{ macros.gravatar(person,48) }}
-        {% endfor %}
-    {% endspaceless %}
-    </div>
-    {% endcache %}
+   {% include "widgets/contributors_widget.html" %}
 {% endif %}
 
 {% if request.user.is_authenticated() and settings.SIDEBAR_MAIN_SHOW_TAG_SELECTOR %} 
-   {% include "blocks/tag_selector.html" %}
+   {% include "widgets/tag_selector.html" %}
 {% endif %}
 
 {% if tags and settings.SIDEBAR_MAIN_SHOW_TAGS %}
-    {% cache 0 "tags" tags search_tags scope sort query context.page context.page_size language_code %}
-    <div class="box">
-        <h2>{% trans %}Related tags{% endtrans %}</h2>
-        {% if tag_list_type == 'list' %}
-        <ul id="related-tags" class="tags">
-            {% for tag in tags %}
-                <li>
-                    {{ macros.tag_widget(
-                        tag.name,
-                        html_tag = 'div',
-                        extra_content = '<span class="tag-number">&#215; ' ~
-                            tag.local_used_count|intcomma ~ '</span>'
-                    )}}
-                </li>
-            {% endfor %}
-        </ul>
-        {% else %}
-            {{ macros.tag_cloud(tags = tags, font_sizes = font_size) }}
-        {% endif %}
-    </div>
-    {% endcache %}
+   {% include "widgets/tag_widget.html" %}
 {% endif %}
 
 {{ settings.SIDEBAR_MAIN_FOOTER }}
diff --git a/askbot/skins/default/templates/widgets/contributors_widget.html b/askbot/skins/default/templates/widgets/contributors_widget.html
new file mode 100644
index 00000000..14651f80
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/contributors_widget.html
@@ -0,0 +1,10 @@
+{% cache 600 "contributors" contributors search_tags scope sort query context.page context.page_size language_code %}
+  <div id="contrib-users" class="box">
+  <h2 class="contributorback">{% trans %}Contributors{% endtrans %}</h2>
+  {% spaceless %}
+  {% for person in contributors %}
+    {{ macros.gravatar(person,48) }}
+  {% endfor %}
+  {% endspaceless %}
+  </div>
+{% endcache %}
diff --git a/askbot/skins/default/templates/blocks/tag_selector.html b/askbot/skins/default/templates/widgets/tag_selector.html
index be456ad1..be456ad1 100644
--- a/askbot/skins/default/templates/blocks/tag_selector.html
+++ b/askbot/skins/default/templates/widgets/tag_selector.html
diff --git a/askbot/skins/default/templates/widgets/tag_widget.html b/askbot/skins/default/templates/widgets/tag_widget.html
new file mode 100644
index 00000000..34ea698e
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/tag_widget.html
@@ -0,0 +1,21 @@
+{% cache 0 "tags" tags search_tags scope sort query context.page context.page_size language_code %}
+  <div class="box">
+    <h2>{% trans %}Related tags{% endtrans %}</h2>
+    {% if tag_list_type == 'list' %}
+      <ul id="related-tags" class="tags">
+        {% for tag in tags %}
+        <li>
+        {{ macros.tag_widget(
+              tag.name,
+              html_tag = 'div',
+              extra_content = '<span class="tag-number">&#215; ' ~
+              tag.local_used_count|intcomma ~ '</span>'
+        )}}
+        </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      {{ macros.tag_cloud(tags = tags, font_sizes = font_size) }}
+    {% endif %}
+  </div>
+{% endcache %}