moved macros to macros folder

28 files changed, 26 insertions, 26 deletions

diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index e8cbc7ae..fbab0bc9 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- template answer_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit answer{% endtrans %}{% endspaceless %}{% endblock %}
 {% block forestyle %}
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 9aaa7e8c..eaf840bb 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- template ask.html -->
 {% block title %}{% spaceless %}{% trans %}Ask a question{% endtrans %}{% endspaceless %}{% endblock %}
 {% block forestyle %}
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html
index 49c447a1..554fcd3c 100644
--- a/askbot/skins/default/templates/authopenid/signin.html
+++ b/askbot/skins/default/templates/authopenid/signin.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}

-{% import "authopenid/macros.html" as login_macros %}

+{% import "macros/authopenid_macros.html" as login_macros %}

 <!-- signin.html -->

 {% block title %}{% spaceless %}{% trans %}User login{% endtrans %}{% endspaceless %}{% endblock %}

 {% block forestyle %}

diff --git a/askbot/skins/default/templates/authopenid/signup_with_password.html b/askbot/skins/default/templates/authopenid/signup_with_password.html
index 047ff076..5009cb2c 100644
--- a/askbot/skins/default/templates/authopenid/signup_with_password.html
+++ b/askbot/skins/default/templates/authopenid/signup_with_password.html
@@ -1,5 +1,5 @@
 {% extends "one_column_body.html" %}
-{% import "authopenid/macros.html" as login_macros %}
+{% import "macros/authopenid_macros.html" as login_macros %}
 <!--signup.html-->
 {% block title %}{% spaceless %}{% trans %}Signup{% endtrans %}{% endspaceless %}{% endblock %}
 {% block forestyle %}
diff --git a/askbot/skins/default/templates/badge.html b/askbot/skins/default/templates/badge.html
index ee7f5360..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.html" as 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 %}
diff --git a/askbot/skins/default/templates/blocks/ask_form.html b/askbot/skins/default/templates/blocks/ask_form.html
index 606aef78..802228f3 100644
--- a/askbot/skins/default/templates/blocks/ask_form.html
+++ b/askbot/skins/default/templates/blocks/ask_form.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <form id="fmask" action="" method="post" >{% csrf_token %}
     <div class="form-item">
         <div id="askFormBar">
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
index 340b9ef2..09d87344 100644
--- a/askbot/skins/default/templates/blocks/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
@@ -1,5 +1,5 @@
 <!-- template header.html -->
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <div id="header">
     <div class="content-wrapper">
         {% if settings.SHOW_LOGO %}
diff --git a/askbot/skins/default/templates/blocks/paginator.html b/askbot/skins/default/templates/blocks/paginator.html
index 9782407f..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.html" as macros %}
+{% import "macros/macros.html" as macros %}
 {{ macros.paginator(paginator_context)}}
 <!-- end paginator.html -->
diff --git a/askbot/skins/default/templates/authopenid/macros.html b/askbot/skins/default/templates/macros/authopenid_macros.html
index 477d277c..477d277c 100644
--- a/askbot/skins/default/templates/authopenid/macros.html
+++ b/askbot/skins/default/templates/macros/authopenid_macros.html
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros/macros.html
index 282553e4..282553e4 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros/macros.html
diff --git a/askbot/skins/default/templates/main_page/content.html b/askbot/skins/default/templates/main_page/content.html
index 72128cdc..e2edcfd6 100644
--- a/askbot/skins/default/templates/main_page/content.html
+++ b/askbot/skins/default/templates/main_page/content.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <div id="question-list">
 {% cache 0 "questions" questions search_tags scope sort query context.page context.page_size language_code %}
     {% for question in questions.object_list %}
diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html
index 62d67ebb..94b249ba 100644
--- a/askbot/skins/default/templates/main_page/headline.html
+++ b/askbot/skins/default/templates/main_page/headline.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 {% if questions_count > 0 %}
     <div style="clear:both">
         <h1 id="question-count" class="search-result-summary">
diff --git a/askbot/skins/default/templates/main_page/paginator.html b/askbot/skins/default/templates/main_page/paginator.html
index 4a77060f..643d9242 100644
--- a/askbot/skins/default/templates/main_page/paginator.html
+++ b/askbot/skins/default/templates/main_page/paginator.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 {% if questions_count > 10 %}{# todo: remove magic number #}
     <div id="pager" class="pager">
         {{ macros.paginator(context|setup_paginator, position='left') }}
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
index aca8256f..34f3f422 100644
--- a/askbot/skins/default/templates/main_page/sidebar.html
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 
 {{ settings.SIDEBAR_MAIN_HEADER }}
 
diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html
index 49e12204..302b0ed4 100644
--- a/askbot/skins/default/templates/main_page/tab_bar.html
+++ b/askbot/skins/default/templates/main_page/tab_bar.html
@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 {% cache 0 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
 <div class="tabBar">
     <div id="sort_tabs" class="tabsA">
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 282b47b4..4631bd0f 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- question.html -->
 {% block title %}{% spaceless %}{{ question.get_question_title() }}{% endspaceless %}{% endblock %}
 {% block meta_description %}
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index feee2521..77a20e70 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- question_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit question{% endtrans %}{% endspaceless %}{% endblock %}
 {% block forestyle %}
diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html
index 883dc3aa..be27f5de 100644
--- a/askbot/skins/default/templates/question_retag.html
+++ b/askbot/skins/default/templates/question_retag.html
@@ -44,7 +44,7 @@
     <script type="text/javascript">
         $().ready(function(){
             $("#nav_questions").attr('className',"on");
-            {% import "macros.html" as macros %}
+            {% import "macros/macros.html" as macros %}
             {{ macros.tag_autocomplete_js(id = '#id_tags') }}
             $("#fmretag").validate({
                rules: {
diff --git a/askbot/skins/default/templates/revisions.html b/askbot/skins/default/templates/revisions.html
index 0c10e6d4..c9d147e9 100644
--- a/askbot/skins/default/templates/revisions.html
+++ b/askbot/skins/default/templates/revisions.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- revisions.html -->
 {% block title %}{% spaceless %}{% trans %}Revision history{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/subscribe_for_tags.html b/askbot/skins/default/templates/subscribe_for_tags.html
index b436fb84..3a2b9fac 100644
--- a/askbot/skins/default/templates/subscribe_for_tags.html
+++ b/askbot/skins/default/templates/subscribe_for_tags.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 {% block title %}{% trans %}Subscribe for tags{% endtrans %}{% endblock %}
 {% block content %}
 <h1>{% trans %}Subscribe for tags{% endtrans %}</h1>
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 7d9026af..aa1e55d5 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- tags.html -->
 {% block title %}{% spaceless %}{% trans %}Tag list{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/user_profile/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html
index 1e2fa2d6..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.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit user profile{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html
index e7e3dbfe..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.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_responses.html -->
 {#
 This template accepts a list of response list
diff --git a/askbot/skins/default/templates/user_profile/user_info.html b/askbot/skins/default/templates/user_profile/user_info.html
index 36b782e5..34450632 100644
--- a/askbot/skins/default/templates/user_profile/user_info.html
+++ b/askbot/skins/default/templates/user_profile/user_info.html
@@ -1,5 +1,5 @@
 <!-- user_info.html -->
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <table class="user-info-table">
     <tr>
         <td style="vertical-align:top;text-align:center;">
diff --git a/askbot/skins/default/templates/user_profile/user_network.html b/askbot/skins/default/templates/user_profile/user_network.html
index 1fd2e06a..35452a2b 100644
--- a/askbot/skins/default/templates/user_profile/user_network.html
+++ b/askbot/skins/default/templates/user_profile/user_network.html
@@ -1,5 +1,5 @@
 {% extends "user_profile/user.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_network.html -->
 {% block profileseciton %}
     {% trans %}network{% endtrans %}
diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html
index d9002d30..94a1c17b 100644
--- a/askbot/skins/default/templates/user_profile/user_stats.html
+++ b/askbot/skins/default/templates/user_profile/user_stats.html
@@ -1,5 +1,5 @@
 {% extends "user_profile/user.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- user_stats.html -->
 {% block profilesection %}
     {% trans %}overview{% endtrans %}
diff --git a/askbot/skins/default/templates/user_profile/users_questions.html b/askbot/skins/default/templates/user_profile/users_questions.html
index 41809a62..edb13e39 100644
--- a/askbot/skins/default/templates/user_profile/users_questions.html
+++ b/askbot/skins/default/templates/user_profile/users_questions.html
@@ -1,5 +1,5 @@
 <!-- users_questions.html -->
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <div class="user-stats-table">
     {% for question in questions %}
     {{macros.question_summary(question, extra_class='narrow')}}
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 1d7d02dd..0bb512ff 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}
-{% import "macros.html" as macros %}
+{% import "macros/macros.html" as macros %}
 <!-- users.html -->
 {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}