Som macros now use widgets

7 files changed, 185 insertions, 178 deletions

diff --git a/askbot/skins/default/templates/macros/macros.html b/askbot/skins/default/templates/macros/macros.html
index 15b6bf67..06754656 100644
--- a/askbot/skins/default/templates/macros/macros.html
+++ b/askbot/skins/default/templates/macros/macros.html
@@ -228,62 +228,7 @@ poor design of the data or methods on data objects #}
 {%- endmacro -%}
 
 {%- macro question_summary(question, extra_class=None) -%}
-      <div class="short-summary{% if extra_class %} {{extra_class}}{% endif %}" id="question-{{question.id}}">
-        <div class="counts">
-            <div class="views
-                 {% if question.view_count == 0 -%}
-                    no-views
-                 {% else -%}
-                    some-views
-                 {%- endif -%}">
-                 <span class="item-count">{{question.view_count|humanize_counter}}</span>
-                <div>
-                {% trans cnt=question.view_count %}view{% pluralize %}views{% endtrans %}
-                </div>
-            </div>
-            <div class="answers
-                    {% if question.answer_count == 0 -%}
-                        no-answers
-                    {% else -%}
-                        {%- if question.answer_accepted -%}
-                            accepted
-                        {%- else -%}
-                            some-answers
-                        {%- endif -%}
-                    {%- endif -%}"> 
-                <span 
-                    class="item-count"
-                >{{question.answer_count|humanize_counter}}{% if question.answer_accepted%}{% endif %}</span>
-                <div>
-                {% trans cnt=question.answer_count %}answer{% pluralize %}answers{% endtrans %}
-                </div>
-            </div>
-            <div class="votes 
-                        {% if question.score == 0 -%}
-                            no-votes
-                        {% else -%}
-                            some-votes
-                        {%- endif -%}">
-                <span class="item-count">{{question.score|humanize_counter}}</span>
-                <div>
-                {% trans cnt=question.score %}vote{% pluralize %}votes{% endtrans %}
-                </div>
-            </div>
-            
-            <div style="clear:both"></div>
-            <div class="userinfo">
-                <span class="relativetime" title="{{question.last_activity_at}}">{{ question.last_activity_at|diff_date }}</span>
-                {% if question.is_anonymous %}
-                    <span class="anonymous">{{ question.last_activity_by.get_anonymous_name() }}</span>
-                {% else %}
-                    <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}">{{question.last_activity_by.username}}</a>{{ user_country_flag(question.last_activity_by) }}
-                {#{user_score_and_badge_summary(question.last_activity_by)}#}
-                {% endif %}
-            </div>
-        </div>
-        <h2><a title="{{question.summary|escape}}" href="{{ question.get_absolute_url() }}">{{question.get_question_title()|escape}}</a></h2>
-        {{ tag_list_widget(question.get_tag_names()) }}
-    </div>
+{%include "widgets/question_summary.html" %}
 {%- endmacro -%}
 
 {%- macro comment_votes(comment = None) -%}
@@ -463,67 +408,7 @@ for the purposes of the AJAX comment editor #}
                 edit_title = False
             )
 -%}
-    {% if edit_title %}
-        <div class="form-item">
-            <label for="id_title" ><strong>{{ post_form.title.label_tag() }}:</strong></label> <span class="form-error"></span><br/>
-            {{ post_form.title }} {{ post_form.title.errors }}
-            <div class="title-desc">
-                {{ post_form.title.help_text }}
-            </div>
-        </div>
-    {% endif %}
-    <div id="wmd-button-bar" class="wmd-panel"></div>
-    <div class="form-item">
-        {{ post_form.text }}{# this element is resizable and will be wrapped by js #}
-        <label for="editor" class="form-error">{{ post_form.text.errors }}</label>
-    </div>
-    {# need label element for resizable input, b/c form validation won't find span #}
-    {% if post_type == 'question' %}
-        <div class="form-item">
-            {% if mandatory_tags  %}
-                <label for="id_tags">
-                    <strong>{% trans %}tags{% endtrans %},</strong>
-                    {% trans %}one of these is required{% endtrans %}
-                </label>
-                {{
-                    tag_list_widget(
-                        mandatory_tags,
-                        make_links = False,
-                        css_class = 'clearfix'
-                    )
-                }}
-            {% else %}
-                <label for="id_tags">
-                    <strong>{% trans %}tags{% endtrans %}:</strong>
-                    {% trans %}(required){% endtrans %}
-                </label>
-            {% endif %}
-            <span class="form-error">{{ post_form.tags.errors }}</span><br/>
-            {{ post_form.tags }}
-            <div class="title-desc">
-                {{ post_form.tags.help_text }}
-            </div>
-        </div>
-    {% endif %}
-    {% if 'summary' in post_form['fields'] %}
-        <div class="form-item">
-            <strong>{{ post_form.summary.label_tag() }}</strong> <br/>
-            {{ post_form.summary }}
-            <div class="title-desc">
-                {{ post_form.summary.help_text }}
-            </div>
-            <div class="form-error" >{{ post_form.summary.errors }}</div>
-        </div>
-    {% endif %}
-    <div class="preview-toggle">
-        <span 
-            id="pre-collapse" 
-            title="{% trans %}Toggle the real time Markdown editor preview{% endtrans %}"
-        >
-            [{% trans %}hide preview{% endtrans %}]
-        </span>
-    </div>
-    <div id="previewer" class="wmd-preview"></div>
+{%include "widgets/edit_post.html" %}
 {%- endmacro -%}
 
 {%- macro tag_autocomplete_js(id = '#id_tags') -%}
diff --git a/askbot/skins/default/templates/macros/user_macros.html b/askbot/skins/default/templates/macros/user_macros.html
index 1321afc5..97c16b1a 100644
--- a/askbot/skins/default/templates/macros/user_macros.html
+++ b/askbot/skins/default/templates/macros/user_macros.html
@@ -1,23 +1,5 @@
 {%- macro user_score_and_badge_summary(user) -%}
-    <span class="reputation-score"
-          title="{{user.get_karma_summary}}"
-    >{{user.reputation}}</span>
-    {% if user.gold or user.silver or user.bronze %}
-    <span title="{{user.get_badge_summary}}">
-        {% if user.gold %}
-        <span class='badge1'>&#9679;</span>
-        <span class="badgecount">{{user.gold}}</span>
-        {% endif %}
-        {% if user.silver %}
-        <span class='badge2'>&#9679;</span>
-        <span class="badgecount">{{user.silver}}</span>
-        {% endif %}
-        {% if user.bronze %}
-        <span class='badge3'>&#9679;</span>
-        <span class="badgecount">{{user.bronze}}</span>
-        {% endif %}
-    </span>
-    {% endif %}
+  {%include "widgets/user_long_score_and_badge_summary.html"%}
 {%- endmacro -%}
 
 {%- macro follow_toggle(follow, name, alias, id) -%}
@@ -52,27 +34,7 @@
 {%- endmacro -%}
 
 {%- macro user_long_score_and_badge_summary(user) -%}
-    <a class="user-micro-info" 
-       href="{{user.get_absolute_url()}}?sort=reputation"
-    >{% trans %}karma:{% endtrans %} {{user.reputation}}</a>
-    {%- if user.gold or user.silver or user.bronze %}
-    <a class="user-micro-info"
-       href="{{user.get_absolute_url()}}#badges"
-    ><span title="{{user.get_badge_summary}}">{% trans %}badges:{% endtrans %}
-        {% if user.gold %}
-        <span class='badge1'>&#9679;</span>
-        <span class="badgecount">{{user.gold}}</span>
-        {% endif %}
-        {% if user.silver %}
-        <span class='badge2'>&#9679;</span>
-        <span class="badgecount">{{user.silver}}</span>
-        {% endif %}
-        {% if user.bronze %}
-        <span class='badge3'>&#9679;</span>
-        <span class="badgecount">{{user.bronze}}</span>
-        {%- endif -%}
-    </span></a>
-    {%- endif -%}
+  {% include "widgets/user_long_score_and_badge_summary.html" %}
 {%- endmacro -%}
 
 {%- macro user_country_flag(user) -%}
@@ -106,27 +68,7 @@
 {%- endmacro -%}
 
 {%- macro user_list(users, profile_section = None) -%}
-<div class="userList">
-    <table class="list-table">
-        <tr>
-            <td class="list-td">
-                {% for user in users %}
-                <div class="user">
-                    <ul>
-                            <li class="thumb">{{ gravatar(user, 32) }}</li>
-                            <li><a href="{% url user_profile user.id, user.username|slugify %}{% if profile_section %}?sort={{profile_section}}{% endif %}">{{user.username}}</a>{{ user_country_flag(user) }}</li>
-                            <li>{{ user_score_and_badge_summary(user) }}</li>
-                        </ul>
-                </div>
-                    {% if loop.index is divisibleby 7 %}
-            </td>
-            <td>
-                    {% endif %}
-                {% endfor %}
-            </td>
-        </tr>   
-    </table>
-</div>
+{% include "widgets/user_list.html"%}
 {%- endmacro -%}
 
 {#todo: rename this to avatar #}
diff --git a/askbot/skins/default/templates/widgets/edit_post.html b/askbot/skins/default/templates/widgets/edit_post.html
new file mode 100644
index 00000000..16970a78
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/edit_post.html
@@ -0,0 +1,61 @@
+{% if edit_title %}
+    <div class="form-item">
+        <label for="id_title" ><strong>{{ post_form.title.label_tag() }}:</strong></label> <span class="form-error"></span><br/>
+        {{ post_form.title }} {{ post_form.title.errors }}
+        <div class="title-desc">
+            {{ post_form.title.help_text }}
+        </div>
+    </div>
+{% endif %}
+<div id="wmd-button-bar" class="wmd-panel"></div>
+<div class="form-item">
+    {{ post_form.text }}{# this element is resizable and will be wrapped by js #}
+    <label for="editor" class="form-error">{{ post_form.text.errors }}</label>
+</div>
+{# need label element for resizable input, b/c form validation won't find span #}
+{% if post_type == 'question' %}
+    <div class="form-item">
+        {% if mandatory_tags  %}
+            <label for="id_tags">
+                <strong>{% trans %}tags{% endtrans %},</strong>
+                {% trans %}one of these is required{% endtrans %}
+            </label>
+            {{
+                tag_list_widget(
+                    mandatory_tags,
+                    make_links = False,
+                    css_class = 'clearfix'
+                )
+            }}
+        {% else %}
+            <label for="id_tags">
+                <strong>{% trans %}tags{% endtrans %}:</strong>
+                {% trans %}(required){% endtrans %}
+            </label>
+        {% endif %}
+        <span class="form-error">{{ post_form.tags.errors }}</span><br/>
+        {{ post_form.tags }}
+        <div class="title-desc">
+            {{ post_form.tags.help_text }}
+        </div>
+    </div>
+{% endif %}
+{% if 'summary' in post_form['fields'] %}
+    <div class="form-item">
+        <strong>{{ post_form.summary.label_tag() }}</strong> <br/>
+        {{ post_form.summary }}
+        <div class="title-desc">
+            {{ post_form.summary.help_text }}
+        </div>
+        <div class="form-error" >{{ post_form.summary.errors }}</div>
+    </div>
+{% endif %}
+<div class="preview-toggle">
+    <span 
+        id="pre-collapse" 
+        title="{% trans %}Toggle the real time Markdown editor preview{% endtrans %}"
+    >
+        [{% trans %}hide preview{% endtrans %}]
+    </span>
+</div>
+<div id="previewer" class="wmd-preview"></div>
diff --git a/askbot/skins/default/templates/widgets/question_summary.html b/askbot/skins/default/templates/widgets/question_summary.html
new file mode 100644
index 00000000..7af9e572
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/question_summary.html
@@ -0,0 +1,57 @@
+<div class="short-summary{% if extra_class %} {{extra_class}}{% endif %}" id="question-{{question.id}}">
+    <div class="counts">
+        <div class="views
+             {% if question.view_count == 0 -%}
+                no-views
+             {% else -%}
+                some-views
+             {%- endif -%}">
+             <span class="item-count">{{question.view_count|humanize_counter}}</span>
+            <div>
+            {% trans cnt=question.view_count %}view{% pluralize %}views{% endtrans %}
+            </div>
+        </div>
+        <div class="answers
+                {% if question.answer_count == 0 -%}
+                    no-answers
+                {% else -%}
+                    {%- if question.answer_accepted -%}
+                        accepted
+                    {%- else -%}
+                        some-answers
+                    {%- endif -%}
+                {%- endif -%}"> 
+            <span 
+                class="item-count"
+            >{{question.answer_count|humanize_counter}}{% if question.answer_accepted%}{% endif %}</span>
+            <div>
+            {% trans cnt=question.answer_count %}answer{% pluralize %}answers{% endtrans %}
+            </div>
+        </div>
+        <div class="votes 
+                    {% if question.score == 0 -%}
+                        no-votes
+                    {% else -%}
+                        some-votes
+                    {%- endif -%}">
+            <span class="item-count">{{question.score|humanize_counter}}</span>
+            <div>
+            {% trans cnt=question.score %}vote{% pluralize %}votes{% endtrans %}
+            </div>
+        </div>
+        
+        <div style="clear:both"></div>
+        <div class="userinfo">
+            <span class="relativetime" title="{{question.last_activity_at}}">{{ question.last_activity_at|diff_date }}</span>
+            {% if question.is_anonymous %}
+                <span class="anonymous">{{ question.last_activity_by.get_anonymous_name() }}</span>
+            {% else %}
+                <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}">{{question.last_activity_by.username}}</a>{{ user_country_flag(question.last_activity_by) }}
+            {#{user_score_and_badge_summary(question.last_activity_by)}#}
+            {% endif %}
+        </div>
+    </div>
+    <h2><a title="{{question.summary|escape}}" href="{{ question.get_absolute_url() }}">{{question.get_question_title()|escape}}</a></h2>
+    {{ tag_list_widget(question.get_tag_names()) }}
+</div>
+
diff --git a/askbot/skins/default/templates/widgets/user_list.html b/askbot/skins/default/templates/widgets/user_list.html
new file mode 100644
index 00000000..1b6150f8
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/user_list.html
@@ -0,0 +1,22 @@
+{%from "macros/user_macros.html" import gravatar %}
+<div class="userList">
+    <table class="list-table">
+        <tr>
+            <td class="list-td">
+                {% for user in users %}
+                <div class="user">
+                    <ul>
+                            <li class="thumb">{{ gravatar(user, 32) }}</li>
+                            <li><a href="{% url user_profile user.id, user.username|slugify %}{% if profile_section %}?sort={{profile_section}}{% endif %}">{{user.username}}</a>{{ user_country_flag(user) }}</li>
+                            <li>{{ user_score_and_badge_summary(user) }}</li>
+                        </ul>
+                </div>
+                    {% if loop.index is divisibleby 7 %}
+            </td>
+            <td>
+                    {% endif %}
+                {% endfor %}
+            </td>
+        </tr>   
+    </table>
+</div>
diff --git a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html
new file mode 100644
index 00000000..121ae48f
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html
@@ -0,0 +1,21 @@
+<a class="user-micro-info" 
+       href="{{user.get_absolute_url()}}?sort=reputation"
+>{% trans %}karma:{% endtrans %} {{user.reputation}}</a>
+{%- if user.gold or user.silver or user.bronze %}
+<a class="user-micro-info"
+   href="{{user.get_absolute_url()}}#badges"
+><span title="{{user.get_badge_summary}}">{% trans %}badges:{% endtrans %}
+    {% if user.gold %}
+    <span class='badge1'>&#9679;</span>
+    <span class="badgecount">{{user.gold}}</span>
+    {% endif %}
+    {% if user.silver %}
+    <span class='badge2'>&#9679;</span>
+    <span class="badgecount">{{user.silver}}</span>
+    {% endif %}
+    {% if user.bronze %}
+    <span class='badge3'>&#9679;</span>
+    <span class="badgecount">{{user.bronze}}</span>
+    {%- endif -%}
+</span></a>
+{%- endif -%}
diff --git a/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html
new file mode 100644
index 00000000..2f55b202
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html
@@ -0,0 +1,19 @@
+<span class="reputation-score"
+          title="{{user.get_karma_summary}}"
+>{{user.reputation}}</span>
+{% if user.gold or user.silver or user.bronze %}
+<span title="{{user.get_badge_summary}}">
+    {% if user.gold %}
+    <span class='badge1'>&#9679;</span>
+    <span class="badgecount">{{user.gold}}</span>
+    {% endif %}
+    {% if user.silver %}
+    <span class='badge2'>&#9679;</span>
+    <span class="badgecount">{{user.silver}}</span>
+    {% endif %}
+    {% if user.bronze %}
+    <span class='badge3'>&#9679;</span>
+    <span class="badgecount">{{user.bronze}}</span>
+    {% endif %}
+</span>
+{% endif %}