Merged all macros in one file.

20 files changed, 241 insertions, 244 deletions

diff --git a/askbot/skins/default/templates/avatar/add.html b/askbot/skins/default/templates/avatar/add.html
index c0e81e36..491efd0e 100644
--- a/askbot/skins/default/templates/avatar/add.html
+++ b/askbot/skins/default/templates/avatar/add.html
@@ -1,10 +1,10 @@
 {% extends "user_profile/user.html" %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 {% block profilesection %}{% trans %}add avatar{% endtrans %}{% endblock %}
 {% block usercontent %}
     <h2>{% trans %}Change avatar{% endtrans %}
     <p>{% trans %}Your current avatar: {% endtrans %}</p>
-    {{ user_macros.gravatar(user, 128) }}
+    {{ macros.gravatar(user, 128) }}
     {% if not avatars %}
         <p>{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}</p>
     {% endif %}
diff --git a/askbot/skins/default/templates/avatar/change.html b/askbot/skins/default/templates/avatar/change.html
index af9c7fcd..5af33945 100644
--- a/askbot/skins/default/templates/avatar/change.html
+++ b/askbot/skins/default/templates/avatar/change.html
@@ -1,11 +1,11 @@
 {% extends "user_profile/user.html" %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 {% block profilesection %}
     {% trans %}change avatar{% endtrans %}
 {% endblock %}
 {% block usercontent %}
     <p>{% trans %}Your current avatar: {% endtrans %}<br/>
-    {{ user_macros.gravatar(user, 128) }}
+    {{ macros.gravatar(user, 128) }}
     </p>
     {% if not avatars %}
         <p>{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}</p>
diff --git a/askbot/skins/default/templates/badge.html b/askbot/skins/default/templates/badge.html
index 306d8d1e..cf79df9b 100644
--- a/askbot/skins/default/templates/badge.html
+++ b/askbot/skins/default/templates/badge.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 <!-- template badge.html -->
 {% block title %}{% spaceless %}{% trans name=badge.name %}{{name}}{% endtrans %} - {% trans %}Badge{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
@@ -16,7 +16,7 @@
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
         {% for recipient in badge_recipients %}
         <p style="width:180px;float:left"><a href="{{ recipient.get_absolute_url() }}">{{ recipient.username }}</a> 
-        {{ user_macros.user_score_and_badge_summary(recipient) }}
+        {{ macros.user_score_and_badge_summary(recipient) }}
         </p>
         {% endfor %}
     </div>
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
index 9e7066f7..5d00f19d 100644
--- a/askbot/skins/default/templates/blocks/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
@@ -1,6 +1,5 @@
 <!-- template header.html -->
-{% import "macros/utils_macros.html" as utils_macros %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 <div id="header">
     <div class="content-wrapper">
         
diff --git a/askbot/skins/default/templates/blocks/paginator.html b/askbot/skins/default/templates/blocks/paginator.html
index af4f335f..d633f9df 100644
--- a/askbot/skins/default/templates/blocks/paginator.html
+++ b/askbot/skins/default/templates/blocks/paginator.html
@@ -1,4 +1,4 @@
 <!-- paginator.html -->
-{% import "macros/utils_macros.html" as utils_macros %}
-{{ utils_macros.paginator(paginator_context)}}
+{% import "macros/macros.html" as macros %}
+{{ macros.paginator(paginator_context)}}
 <!-- end paginator.html -->
diff --git a/askbot/skins/default/templates/macros/macros.html b/askbot/skins/default/templates/macros/macros.html
index 06754656..c13595f4 100644
--- a/askbot/skins/default/templates/macros/macros.html
+++ b/askbot/skins/default/templates/macros/macros.html
@@ -1,4 +1,3 @@
-{% from "macros/user_macros.html" import user_country_flag, gravatar, user_score_and_badge_summary, user_website_link %}
 {%- macro share(site = None, site_label = None, icon = False) -%}
     <a class="{{ site }}-share{% if icon == True %} icon{% endif %}"
         title="{% trans %}Share this question on {{site}}{% endtrans %}"
@@ -427,3 +426,210 @@ for the purposes of the AJAX comment editor #}
 {%- macro answer_classes(answer, question) -%}
 answer {% if answer.accepted %}accepted-answer{% endif %} {% if answer.author_id==question.author_id %} answered-by-owner{% endif %} {% if answer.deleted %}deleted{% endif -%}
 {%- endmacro -%}
+
+{%- macro user_score_and_badge_summary(user) -%}
+  {%include "widgets/user_long_score_and_badge_summary.html"%}
+{%- endmacro -%}
+
+{%- macro follow_toggle(follow, name, alias, id) -%}
+    {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
+    <div 
+        class="follow-toggle" 
+        id="follow-{{ name }}-{{ id }}"
+    >
+        {% if follow %}
+        <div class="follow">{% trans %}follow {{alias}}{% endtrans %}</div>
+        {% else %}
+        <div class="unfollow">
+          <div class="unfollow-red">{% trans %}unfollow {{alias}}{% endtrans %}</div>
+          <div class="unfollow-green">{% trans %}following {{alias}}{% endtrans %}</div>
+        </div>
+        {% endif %}
+    </div>
+{%- endmacro -%}
+
+{%- macro follow_user_toggle(visitor = None, subject = None) -%}
+    {% if visitor.is_anonymous() %}
+        {{ follow_toggle(True, 'user', subject.username, subject.id) }}
+    {% else %}
+        {% if visitor != subject %}
+            {% if visitor.is_following(subject) %}
+                {{ follow_toggle(False, 'user', subject.username, subject.id) }}
+            {% else %}
+                {{ follow_toggle(True, 'user', subject.username, subject.id) }}
+            {% endif %}
+        {% endif %}
+    {% endif %}
+{%- endmacro -%}
+
+{%- macro user_long_score_and_badge_summary(user) -%}
+  {% include "widgets/user_long_score_and_badge_summary.html" %}
+{%- endmacro -%}
+
+{%- macro user_country_flag(user) -%}
+    {% if user.country and user.show_country %}
+        <img class="flag" 
+            src="{{ ('/images/flags/' ~ user.country.code|lower ~ '.gif')|media }}"
+            alt="{% trans 
+                    country=user.country.name 
+                    %}flag of {{country}}{% 
+                endtrans %}"
+            title="{% trans 
+                    country=user.country.name, 
+                    person=user.username %}{{person}} is from {{country}}{%
+                 endtrans %}"
+        />
+    {% endif %}
+{%- endmacro -%}
+
+{%- macro user_country_name_and_flag(user) -%}
+    {% if user.country and user.show_country %}
+        {{ user.country.name }}
+        {{ user_country_flag(user) }}
+    {% endif %}
+{%- endmacro -%}
+
+{%- macro user_full_location(user) -%}
+    {% if user.location %}
+        {{ user.location }},
+    {% endif %}
+    {{ user_country_name_and_flag(user) }}
+{%- endmacro -%}
+
+{%- macro user_list(users, profile_section = None) -%}
+{% include "widgets/user_list.html"%}
+{%- endmacro -%}
+
+{#todo: rename this to avatar #}
+{%- macro gravatar(user, size) -%}
+{% spaceless %}
+<a style="text-decoration:none"
+    href="{{ user.get_absolute_url() }}"
+><img class="gravatar" 
+    width="{{size}}" height="{{size}}"
+    src="{{ user.get_avatar_url(size) }}"
+    title="{{user.username}}" 
+    alt="{% trans username=user.username %}{{username}} gravatar image{% endtrans %}" 
+/></a>
+{% endspaceless %}
+{%- endmacro -%}
+
+{%- macro user_website_link(user, max_display_length=25) -%}
+    {% if user.website %}
+        <a 
+            href="{{user.website}}"
+            title="{% trans username=user.username|escape, url=user.website %}{{username}}'s website is {{url}}{% endtrans %}"
+            {% if user.can_have_strong_url() == False %}
+            rel="nofollow"
+            {% endif %}
+        >
+        {{user.website|truncate(length=max_display_length, killwords=True, end='...')}}
+        </a>
+    {% endif %}
+{%- endmacro -%}
+
+{%- macro paginator(p, position='left') -%}{# p is paginator context dictionary #}
+{% spaceless %}
+    {% if p.is_paginated %}
+        <div class="paginator" style="float:{{position}}">
+        {% if p.has_previous %}
+            <span class="prev"><a href="{{p.base_url}}page={{ p.previous }}{{ p.extend_url }}" title="{% trans %}previous{% endtrans %}">
+        &laquo; {% trans %}previous{% endtrans %}</a></span>
+        {% endif %}
+        {% if not p.in_leading_range %}
+            {% for num in p.pages_outside_trailing_range %}
+                <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" >{{ num }}</a></span>
+            {% endfor %}
+        ...
+        {% endif %}
+         
+        {% for num in p.page_numbers %}
+          {% if num == p.page and p.pages != 1%}
+            <span class="curr" title="{% trans %}current page{% endtrans %}">{{ num }}</span>
+          {% else %}
+            <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" title="{% trans %}page number {{num}}{% endtrans %}">{{ num }}</a></span>
+          {% endif %}
+        {% endfor %}
+         
+        {% if not p.in_trailing_range %}
+            ...
+            {% for num in p.pages_outside_leading_range|reverse %}
+                <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" title="{% trans %}page number {{ num }}{% endtrans %}">{{ num }}</a></span>
+            {% endfor %}
+        {% endif %}
+        {% if p.has_next %}
+            <span class="next"><a href="{{p.base_url}}page={{ p.next }}{{ p.extend_url }}" title="{% trans %}next page{% endtrans %}">{% trans %}next page{% endtrans %} &raquo;</a></span>
+        {% endif %}
+        </div>
+    {% endif %}
+{% endspaceless %}
+{%- endmacro -%}
+
+{%- macro pagesize_switch(p, position='left') -%}{# p is paginator context #}
+{% spaceless %}
+{% if p.is_paginated %}
+    <div class="paginator" style="float:{{position}}">
+        <span class="text">{% trans %}posts per page{% endtrans %}</span>
+        {% if p.page_size == 10 %}
+            <span class="curr">10</span>
+        {% else %}
+            <span class="page"><a href="{{p.base_url}}page_size=10">10</a></span>
+        {% endif %}
+        
+        {% if p.page_size == 30 %}
+            <span class="curr">30</span>
+        {% else %}
+            <span class="page"><a href="{{p.base_url}}page_size=30">30</a></span>
+        {% endif %}
+        
+        {% if p.page_size == 50 %}
+            <span class="curr">50</span>
+        {% else %}
+            <span class="page"><a href="{{p.base_url}}page_size=50">50</a></span>
+        {% endif %}
+    </div> 
+{% endif %}
+{% endspaceless %}
+{%- endmacro -%}
+
+{%- macro inbox_link(user) -%}
+    {% if user.new_response_count > 0 or user.seen_response_count > 0 %}
+    <a id='ab-responses' href="{{user.get_absolute_url()}}?sort=inbox&section=forum">
+        <img 
+            alt="{% trans username=user.username %}responses for {{username}}{% endtrans %}"
+            {% if user.new_response_count > 0 %}
+                src="{{ "/images/mail-envelope-full.png"|media }}"
+                title="{% trans response_count=user.new_response_count %}you have a new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}"
+            {% elif user.seen_response_count > 0 %}
+                src="{{ "/images/mail-envelope-empty.png"|media }}"
+                title="{% trans %}no new responses yet{% endtrans %}"
+            {% endif %}
+        />
+    </a>
+    {% endif %}
+{%- endmacro -%}
+
+{%- macro moderation_items_link(user, moderation_items) -%}
+    {% if moderation_items %}
+        <a id="ab-responses"
+            href="{{user.get_absolute_url()}}?sort=inbox&section=flags"
+        >
+        {% if moderation_items['new_count'] > 0 %}
+            <img src="{{'/images/dialog-warning.png'|media}}"
+            {% if moderation_items['seen_count'] > 0 %}
+                alt="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
+                title="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
+            {% else %}
+                alt="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
+                title="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
+            {% endif %}
+            />
+        {% elif moderation_items['seen_count'] > 0 %}
+            <img src={{'/images/dialog-warning-off.png'|media}} 
+                alt="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}" 
+                title="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}" 
+            />
+        {% endif %}
+        </a>
+    {% endif %}
+{%- endmacro -%}
diff --git a/askbot/skins/default/templates/macros/user_macros.html b/askbot/skins/default/templates/macros/user_macros.html
deleted file mode 100644
index 97c16b1a..00000000
--- a/askbot/skins/default/templates/macros/user_macros.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{%- macro user_score_and_badge_summary(user) -%}
-  {%include "widgets/user_long_score_and_badge_summary.html"%}
-{%- endmacro -%}
-
-{%- macro follow_toggle(follow, name, alias, id) -%}
-    {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
-    <div 
-        class="follow-toggle" 
-        id="follow-{{ name }}-{{ id }}"
-    >
-        {% if follow %}
-        <div class="follow">{% trans %}follow {{alias}}{% endtrans %}</div>
-        {% else %}
-        <div class="unfollow">
-          <div class="unfollow-red">{% trans %}unfollow {{alias}}{% endtrans %}</div>
-          <div class="unfollow-green">{% trans %}following {{alias}}{% endtrans %}</div>
-        </div>
-        {% endif %}
-    </div>
-{%- endmacro -%}
-
-{%- macro follow_user_toggle(visitor = None, subject = None) -%}
-    {% if visitor.is_anonymous() %}
-        {{ follow_toggle(True, 'user', subject.username, subject.id) }}
-    {% else %}
-        {% if visitor != subject %}
-            {% if visitor.is_following(subject) %}
-                {{ follow_toggle(False, 'user', subject.username, subject.id) }}
-            {% else %}
-                {{ follow_toggle(True, 'user', subject.username, subject.id) }}
-            {% endif %}
-        {% endif %}
-    {% endif %}
-{%- endmacro -%}
-
-{%- macro user_long_score_and_badge_summary(user) -%}
-  {% include "widgets/user_long_score_and_badge_summary.html" %}
-{%- endmacro -%}
-
-{%- macro user_country_flag(user) -%}
-    {% if user.country and user.show_country %}
-        <img class="flag" 
-            src="{{ ('/images/flags/' ~ user.country.code|lower ~ '.gif')|media }}"
-            alt="{% trans 
-                    country=user.country.name 
-                    %}flag of {{country}}{% 
-                endtrans %}"
-            title="{% trans 
-                    country=user.country.name, 
-                    person=user.username %}{{person}} is from {{country}}{%
-                 endtrans %}"
-        />
-    {% endif %}
-{%- endmacro -%}
-
-{%- macro user_country_name_and_flag(user) -%}
-    {% if user.country and user.show_country %}
-        {{ user.country.name }}
-        {{ user_country_flag(user) }}
-    {% endif %}
-{%- endmacro -%}
-
-{%- macro user_full_location(user) -%}
-    {% if user.location %}
-        {{ user.location }},
-    {% endif %}
-    {{ user_country_name_and_flag(user) }}
-{%- endmacro -%}
-
-{%- macro user_list(users, profile_section = None) -%}
-{% include "widgets/user_list.html"%}
-{%- endmacro -%}
-
-{#todo: rename this to avatar #}
-{%- macro gravatar(user, size) -%}
-{% spaceless %}
-<a style="text-decoration:none"
-    href="{{ user.get_absolute_url() }}"
-><img class="gravatar" 
-    width="{{size}}" height="{{size}}"
-    src="{{ user.get_avatar_url(size) }}"
-    title="{{user.username}}" 
-    alt="{% trans username=user.username %}{{username}} gravatar image{% endtrans %}" 
-/></a>
-{% endspaceless %}
-{%- endmacro -%}
-
-{%- macro user_website_link(user, max_display_length=25) -%}
-    {% if user.website %}
-        <a 
-            href="{{user.website}}"
-            title="{% trans username=user.username|escape, url=user.website %}{{username}}'s website is {{url}}{% endtrans %}"
-            {% if user.can_have_strong_url() == False %}
-            rel="nofollow"
-            {% endif %}
-        >
-        {{user.website|truncate(length=max_display_length, killwords=True, end='...')}}
-        </a>
-    {% endif %}
-{%- endmacro -%}
diff --git a/askbot/skins/default/templates/macros/utils_macros.html b/askbot/skins/default/templates/macros/utils_macros.html
deleted file mode 100644
index c4634d2f..00000000
--- a/askbot/skins/default/templates/macros/utils_macros.html
+++ /dev/null
@@ -1,105 +0,0 @@
-{%- macro paginator(p, position='left') -%}{# p is paginator context dictionary #}
-{% spaceless %}
-    {% if p.is_paginated %}
-        <div class="paginator" style="float:{{position}}">
-        {% if p.has_previous %}
-            <span class="prev"><a href="{{p.base_url}}page={{ p.previous }}{{ p.extend_url }}" title="{% trans %}previous{% endtrans %}">
-        &laquo; {% trans %}previous{% endtrans %}</a></span>
-        {% endif %}
-        {% if not p.in_leading_range %}
-            {% for num in p.pages_outside_trailing_range %}
-                <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" >{{ num }}</a></span>
-            {% endfor %}
-        ...
-        {% endif %}
-         
-        {% for num in p.page_numbers %}
-          {% if num == p.page and p.pages != 1%}
-            <span class="curr" title="{% trans %}current page{% endtrans %}">{{ num }}</span>
-          {% else %}
-            <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" title="{% trans %}page number {{num}}{% endtrans %}">{{ num }}</a></span>
-          {% endif %}
-        {% endfor %}
-         
-        {% if not p.in_trailing_range %}
-            ...
-            {% for num in p.pages_outside_leading_range|reverse %}
-                <span class="page"><a href="{{p.base_url}}page={{ num }}{{ p.extend_url }}" title="{% trans %}page number {{ num }}{% endtrans %}">{{ num }}</a></span>
-            {% endfor %}
-        {% endif %}
-        {% if p.has_next %}
-            <span class="next"><a href="{{p.base_url}}page={{ p.next }}{{ p.extend_url }}" title="{% trans %}next page{% endtrans %}">{% trans %}next page{% endtrans %} &raquo;</a></span>
-        {% endif %}
-        </div>
-    {% endif %}
-{% endspaceless %}
-{%- endmacro -%}
-
-{%- macro pagesize_switch(p, position='left') -%}{# p is paginator context #}
-{% spaceless %}
-{% if p.is_paginated %}
-    <div class="paginator" style="float:{{position}}">
-        <span class="text">{% trans %}posts per page{% endtrans %}</span>
-        {% if p.page_size == 10 %}
-            <span class="curr">10</span>
-        {% else %}
-            <span class="page"><a href="{{p.base_url}}page_size=10">10</a></span>
-        {% endif %}
-        
-        {% if p.page_size == 30 %}
-            <span class="curr">30</span>
-        {% else %}
-            <span class="page"><a href="{{p.base_url}}page_size=30">30</a></span>
-        {% endif %}
-        
-        {% if p.page_size == 50 %}
-            <span class="curr">50</span>
-        {% else %}
-            <span class="page"><a href="{{p.base_url}}page_size=50">50</a></span>
-        {% endif %}
-    </div> 
-{% endif %}
-{% endspaceless %}
-{%- endmacro -%}
-
-{%- macro inbox_link(user) -%}
-    {% if user.new_response_count > 0 or user.seen_response_count > 0 %}
-    <a id='ab-responses' href="{{user.get_absolute_url()}}?sort=inbox&section=forum">
-        <img 
-            alt="{% trans username=user.username %}responses for {{username}}{% endtrans %}"
-            {% if user.new_response_count > 0 %}
-                src="{{ "/images/mail-envelope-full.png"|media }}"
-                title="{% trans response_count=user.new_response_count %}you have a new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}"
-            {% elif user.seen_response_count > 0 %}
-                src="{{ "/images/mail-envelope-empty.png"|media }}"
-                title="{% trans %}no new responses yet{% endtrans %}"
-            {% endif %}
-        />
-    </a>
-    {% endif %}
-{%- endmacro -%}
-
-{%- macro moderation_items_link(user, moderation_items) -%}
-    {% if moderation_items %}
-        <a id="ab-responses"
-            href="{{user.get_absolute_url()}}?sort=inbox&section=flags"
-        >
-        {% if moderation_items['new_count'] > 0 %}
-            <img src="{{'/images/dialog-warning.png'|media}}"
-            {% if moderation_items['seen_count'] > 0 %}
-                alt="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
-                title="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
-            {% else %}
-                alt="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
-                title="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
-            {% endif %}
-            />
-        {% elif moderation_items['seen_count'] > 0 %}
-            <img src={{'/images/dialog-warning-off.png'|media}} 
-                alt="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}" 
-                title="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}" 
-            />
-        {% endif %}
-        </a>
-    {% endif %}
-{%- endmacro -%}
diff --git a/askbot/skins/default/templates/main_page/paginator.html b/askbot/skins/default/templates/main_page/paginator.html
index b9ef1694..e556e422 100644
--- a/askbot/skins/default/templates/main_page/paginator.html
+++ b/askbot/skins/default/templates/main_page/paginator.html
@@ -1,8 +1,8 @@
-{% import "macros/utils_macros.html" as utils_macros %}
+{% import "macros/macros.html" as macros %}
 {% if questions_count > 10 %}{# todo: remove magic number #}
     <div id="pager" class="pager">
-        {{ utils_macros.paginator(context|setup_paginator, position='left') }}
-        {{ utils_macros.pagesize_switch(context, position='right') }}
+        {{ macros.paginator(context|setup_paginator, position='left') }}
+        {{ macros.pagesize_switch(context, position='right') }}
         <div class="clean"></div>
     </div>
 {% endif %}
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
index 7187e84c..b7722b02 100644
--- a/askbot/skins/default/templates/main_page/sidebar.html
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -1,5 +1,4 @@
 {% import "macros/macros.html" as macros %}
-{% import "macros/user_macros.html" as user_macros %}
 
 {{ settings.SIDEBAR_MAIN_HEADER }}
 
diff --git a/askbot/skins/default/templates/question/content.html b/askbot/skins/default/templates/question/content.html
index 132a9a11..8fdeb1d8 100644
--- a/askbot/skins/default/templates/question/content.html
+++ b/askbot/skins/default/templates/question/content.html
@@ -1,16 +1,15 @@
 {% import "macros/macros.html" as macros %}
-{% import "macros/utils_macros.html" as utils_macros %}
 {% include "question/question_card.html" %}
 {% if question.closed %}
     {% include "question/closed_question_info.html" %}
 {% endif %}
 {% if answers %}
     {% include "question/answer_tab_bar.html" %}
-    {{ utils_macros.paginator(paginator_context) }}
+    {{ macros.paginator(paginator_context) }}
     {% for answer in answers %}
         {% include "question/answer_card.html" %}
     {% endfor %}
-    {{ utils_macros.paginator(paginator_context) }}
+    {{ macros.paginator(paginator_context) }}
 {% else %}
     {% include "question/sharing_prompt_phrase.html" %}
 {% endif %}
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 43235e23..aa1e55d5 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -1,6 +1,5 @@
 {% extends "two_column_body.html" %}
 {% import "macros/macros.html" as macros %}
-{% import "macros/utils_macros.html" as utils_macros%}
 <!-- tags.html -->
 {% block title %}{% spaceless %}{% trans %}Tag list{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
@@ -48,7 +47,7 @@
             {% endfor %}
         </ul>
         <div class="pager">
-            {{utils_macros.paginator(paginator_context)}}
+            {{macros.paginator(paginator_context)}}
         </div>
     {% endif %}
 {% else %}
diff --git a/askbot/skins/default/templates/user_profile/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html
index 12432cd8..f4b1e6ab 100644
--- a/askbot/skins/default/templates/user_profile/user_edit.html
+++ b/askbot/skins/default/templates/user_profile/user_edit.html
@@ -1,5 +1,5 @@
 {% extends "one_column_body.html" %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit user profile{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
@@ -10,7 +10,7 @@
     <form name="" action="{% url edit_user request.user.id %}" method="post">{% csrf_token %}
         <div id="left" style="float:left;width:180px">
             {% if request.user.email %}
-                {{ user_macros.gravatar(request.user, 128) }}
+                {{ macros.gravatar(request.user, 128) }}
             {% else %}
                 <img src="{{"/images/nophoto.png"|media}}">
             {% endif %}
diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html
index bb77f406..c1b35ebc 100644
--- a/askbot/skins/default/templates/user_profile/user_inbox.html
+++ b/askbot/skins/default/templates/user_profile/user_inbox.html
@@ -1,5 +1,5 @@
 {% extends "user_profile/user.html" %}
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_responses.html -->
 {#
 This template accepts a list of response list
@@ -65,7 +65,7 @@ inbox_section - forum|flags
                 <div id="re_{{response.id}}" class="re{% if response.is_new %} new highlight{% else %} seen{% endif %}">
                 {% if inbox_section == 'forum' %}<input type="checkbox" />{% endif %}
                 <div class="face">
-                {{ user_macros.gravatar(response.user, 48) }}
+                {{ macros.gravatar(response.user, 48) }}
                 </div>
                 <a style="font-size:12px" href="{{ response.user.get_absolute_url() }}">{{ response.user.username }}</a>
                 <a style="text-decoration:none;" href="{{ response.response_url }}">
@@ -79,7 +79,7 @@ inbox_section - forum|flags
                 <div id="re_{{nested_response.id}}" class="re{% if nested_response.is_new %} new highlight{% else %} seen{% endif %}">
                 {% if inbox_section == 'forum' %}<input type="checkbox" />{% endif %}
                 <div class="face">
-                {{ user_macros.gravatar(nested_response.user, 48) }}
+                {{ macros.gravatar(nested_response.user, 48) }}
                 </div>
                 <a style="font-size:12px" href="{{ nested_response.user.get_absolute_url() }}">{{ nested_response.user.username }}</a>
                 <a style="text-decoration:none;" href="{{ nested_response.response_url }}">
diff --git a/askbot/skins/default/templates/user_profile/user_info.html b/askbot/skins/default/templates/user_profile/user_info.html
index 980b209c..34450632 100644
--- a/askbot/skins/default/templates/user_profile/user_info.html
+++ b/askbot/skins/default/templates/user_profile/user_info.html
@@ -1,10 +1,10 @@
 <!-- user_info.html -->
-{% import "macros/user_macros.html" as user_macros %}
+{% import "macros/macros.html" as macros %}
 <table class="user-info-table">
     <tr>
         <td style="vertical-align:top;text-align:center;">
             <div class='avatar'>
-                {{ user_macros.gravatar(view_user, 128) }}
+                {{ macros.gravatar(view_user, 128) }}
                 {% if request.user == view_user %}
                     <p><a 
                         {% if support_custom_avatars %}
@@ -24,7 +24,7 @@
             <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
             <p><b style="color:#777;">{% trans %}reputation{% endtrans %}</b></p>
             {% if user_follow_feature_on %}
-                {{ user_macros.follow_user_toggle(visitor = request.user, subject = view_user) }}
+                {{ macros.follow_user_toggle(visitor = request.user, subject = view_user) }}
             {% endif %}
         </td>
         <td width="360" style="padding-left:5px;vertical-align: top;">
@@ -67,13 +67,13 @@
                 {% if view_user.website %}
                 <tr>
                     <td>{% trans %}user website{% endtrans %}</td>
-                    <td>{{ user_macros.user_website_link(view_user, max_display_length = 30) }}</td>
+                    <td>{{ macros.user_website_link(view_user, max_display_length = 30) }}</td>
                 </tr>
                 {% endif  %}
                 {% if view_user.location or view_user.country %}
                 <tr>
                     <td>{% trans %}location{% endtrans %}</td>
-                    <td>{{ user_macros.user_full_location(view_user) }}</td>
+                    <td>{{ macros.user_full_location(view_user) }}</td>
                 </tr>
                 {% endif %}
                 {% if view_user.date_of_birth%}
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 2604297f..0bb512ff 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -1,6 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros/user_macros.html" as user_macros %}
-{% import "macros/utils_macros.html" as utils_macros %}
+{% import "macros/macros.html" as macros %}
 <!-- users.html -->
 {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
@@ -41,9 +40,9 @@
         <span>{% trans %}Nothing found.{% endtrans %}</span>
     {% endif %}
 </p>
-{{ user_macros.user_list(users.object_list) }}
+{{ macros.user_list(users.object_list) }}
 <div class="pager">
-    {{ utils_macros.paginator(paginator_context) }}
+    {{ macros.paginator(paginator_context) }}
 </div>              
 {% endblock %}
 {% block endjs %}
diff --git a/askbot/skins/default/templates/widgets/contributors.html b/askbot/skins/default/templates/widgets/contributors.html
index 22418f3f..14651f80 100644
--- a/askbot/skins/default/templates/widgets/contributors.html
+++ b/askbot/skins/default/templates/widgets/contributors.html
@@ -3,7 +3,7 @@
   <h2 class="contributorback">{% trans %}Contributors{% endtrans %}</h2>
   {% spaceless %}
   {% for person in contributors %}
-    {{ user_macros.gravatar(person,48) }}
+    {{ macros.gravatar(person,48) }}
   {% endfor %}
   {% endspaceless %}
   </div>
diff --git a/askbot/skins/default/templates/widgets/question_summary.html b/askbot/skins/default/templates/widgets/question_summary.html
index 7af9e572..51ce7f23 100644
--- a/askbot/skins/default/templates/widgets/question_summary.html
+++ b/askbot/skins/default/templates/widgets/question_summary.html
@@ -1,3 +1,4 @@
+{% from "macros/macros.html" import user_country_flag, tag_list_widget %}
 <div class="short-summary{% if extra_class %} {{extra_class}}{% endif %}" id="question-{{question.id}}">
     <div class="counts">
         <div class="views
diff --git a/askbot/skins/default/templates/widgets/user_list.html b/askbot/skins/default/templates/widgets/user_list.html
index 1b6150f8..78662b93 100644
--- a/askbot/skins/default/templates/widgets/user_list.html
+++ b/askbot/skins/default/templates/widgets/user_list.html
@@ -1,4 +1,4 @@
-{%from "macros/user_macros.html" import gravatar %}
+{%from "macros/macros.html" import gravatar %}
 <div class="userList">
     <table class="list-table">
         <tr>
diff --git a/askbot/skins/default/templates/widgets/user_navigation.html b/askbot/skins/default/templates/widgets/user_navigation.html
index 537b615d..2324291d 100644
--- a/askbot/skins/default/templates/widgets/user_navigation.html
+++ b/askbot/skins/default/templates/widgets/user_navigation.html
@@ -1,9 +1,9 @@
 {% if request.user.is_authenticated() %}
     <a href="{{ request.user.get_absolute_url() }}">{{ request.user.username }}</a> 
     <span class="user-info">
-    {{ utils_macros.inbox_link(request.user) }}
-    {{ utils_macros.moderation_items_link(request.user, moderation_items) }}
-    ({{ user_macros.user_long_score_and_badge_summary(user) }})
+    {{ macros.inbox_link(request.user) }}
+    {{ macros.moderation_items_link(request.user, moderation_items) }}
+    ({{ macros.user_long_score_and_badge_summary(user) }})
     </span>
     <a href="{{ settings.LOGOUT_URL }}?next={{ settings.LOGOUT_REDIRECT_URL }}">{% trans %}logout{% endtrans %}</a>
 {% else %}