Moved avatar

Deleted macros folder moved into a single file
moved one and two column_body
moved authopenid

43 files changed, 32 insertions, 32 deletions

diff --git a/askbot/skins/default/templates/macros/authopenid_macros.html b/askbot/skins/common/templates/authopenid/authopenid_macros.html
index 477d277c..477d277c 100644
--- a/askbot/skins/default/templates/macros/authopenid_macros.html
+++ b/askbot/skins/common/templates/authopenid/authopenid_macros.html
diff --git a/askbot/skins/default/templates/authopenid/changeemail.html b/askbot/skins/common/templates/authopenid/changeemail.html
index 1316a048..1316a048 100644
--- a/askbot/skins/default/templates/authopenid/changeemail.html
+++ b/askbot/skins/common/templates/authopenid/changeemail.html
diff --git a/askbot/skins/default/templates/authopenid/complete.html b/askbot/skins/common/templates/authopenid/complete.html
index 969a173f..969a173f 100644
--- a/askbot/skins/default/templates/authopenid/complete.html
+++ b/askbot/skins/common/templates/authopenid/complete.html
diff --git a/askbot/skins/default/templates/authopenid/confirm_email.txt b/askbot/skins/common/templates/authopenid/confirm_email.txt
index 1a0f4e63..1a0f4e63 100644
--- a/askbot/skins/default/templates/authopenid/confirm_email.txt
+++ b/askbot/skins/common/templates/authopenid/confirm_email.txt
diff --git a/askbot/skins/default/templates/authopenid/email_validation.txt b/askbot/skins/common/templates/authopenid/email_validation.txt
index 9c5baa8a..9c5baa8a 100644
--- a/askbot/skins/default/templates/authopenid/email_validation.txt
+++ b/askbot/skins/common/templates/authopenid/email_validation.txt
diff --git a/askbot/skins/default/templates/authopenid/logout.html b/askbot/skins/common/templates/authopenid/logout.html
index a07b78d1..a07b78d1 100644
--- a/askbot/skins/default/templates/authopenid/logout.html
+++ b/askbot/skins/common/templates/authopenid/logout.html
diff --git a/askbot/skins/default/templates/authopenid/providers_javascript.html b/askbot/skins/common/templates/authopenid/providers_javascript.html
index 0fe72eb3..0fe72eb3 100644
--- a/askbot/skins/default/templates/authopenid/providers_javascript.html
+++ b/askbot/skins/common/templates/authopenid/providers_javascript.html
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html
index 554fcd3c..f10d0cd0 100644
--- a/askbot/skins/default/templates/authopenid/signin.html
+++ b/askbot/skins/common/templates/authopenid/signin.html
@@ -1,5 +1,5 @@
 {% extends "two_column_body.html" %}

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

+{% import "authopenid/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/common/templates/authopenid/signup_with_password.html
index 5009cb2c..43571c20 100644
--- a/askbot/skins/default/templates/authopenid/signup_with_password.html
+++ b/askbot/skins/common/templates/authopenid/signup_with_password.html
@@ -1,5 +1,5 @@
 {% extends "one_column_body.html" %}
-{% import "macros/authopenid_macros.html" as login_macros %}
+{% import "authopenid/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/avatar/add.html b/askbot/skins/common/templates/avatar/add.html
index 491efd0e..68a188ef 100644
--- a/askbot/skins/default/templates/avatar/add.html
+++ b/askbot/skins/common/templates/avatar/add.html
@@ -1,5 +1,5 @@
 {% extends "user_profile/user.html" %}
-{% import "macros/macros.html" as macros %}
+{% import "macros.html" as macros %}
 {% block profilesection %}{% trans %}add avatar{% endtrans %}{% endblock %}
 {% block usercontent %}
     <h2>{% trans %}Change avatar{% endtrans %}
diff --git a/askbot/skins/default/templates/avatar/change.html b/askbot/skins/common/templates/avatar/change.html
index 5af33945..7921a662 100644
--- a/askbot/skins/default/templates/avatar/change.html
+++ b/askbot/skins/common/templates/avatar/change.html
@@ -1,5 +1,5 @@
 {% extends "user_profile/user.html" %}
-{% import "macros/macros.html" as macros %}
+{% import "macros.html" as macros %}
 {% block profilesection %}
     {% trans %}change avatar{% endtrans %}
 {% endblock %}
diff --git a/askbot/skins/default/templates/avatar/confirm_delete.html b/askbot/skins/common/templates/avatar/confirm_delete.html
index ee3d10d7..ee3d10d7 100644
--- a/askbot/skins/default/templates/avatar/confirm_delete.html
+++ b/askbot/skins/common/templates/avatar/confirm_delete.html
diff --git a/askbot/skins/default/templates/one_column_body.html b/askbot/skins/common/templates/one_column_body.html
index 852f8fe5..852f8fe5 100644
--- a/askbot/skins/default/templates/one_column_body.html
+++ b/askbot/skins/common/templates/one_column_body.html
diff --git a/askbot/skins/default/templates/two_column_body.html b/askbot/skins/common/templates/two_column_body.html
index 4c3193be..4c3193be 100644
--- a/askbot/skins/default/templates/two_column_body.html
+++ b/askbot/skins/common/templates/two_column_body.html
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index fbab0bc9..e8cbc7ae 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/macros.html" as macros %}
+{% import "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 eaf840bb..9aaa7e8c 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/macros.html" as macros %}
+{% import "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/badge.html b/askbot/skins/default/templates/badge.html
index cf79df9b..ee7f5360 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/macros.html" as macros %}
+{% import "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 802228f3..606aef78 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/macros.html" as macros %}
+{% import "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 5d00f19d..ad0ae4a2 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/macros.html" as macros %}
+{% import "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 d633f9df..9782407f 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/macros.html" as macros %}
+{% import "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.html
index c13595f4..c13595f4 100644
--- a/askbot/skins/default/templates/macros/macros.html
+++ b/askbot/skins/default/templates/macros.html
diff --git a/askbot/skins/default/templates/main_page/content.html b/askbot/skins/default/templates/main_page/content.html
index 521b1e6a..9b00e63b 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/macros.html" as macros %}
+{% import "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 49ba93da..baca27b9 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/macros.html" as macros %}
+{% import "macros.html" as macros %}
 {% if questions_count > 0 %}
     <div style="clear:both">
         <h1 id="questionCount" 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 e556e422..b7fd9501 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/macros.html" as macros %}
+{% import "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 b7722b02..c89d62f4 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/macros.html" as macros %}
+{% import "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 302b0ed4..49e12204 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/macros.html" as macros %}
+{% import "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/content.html b/askbot/skins/default/templates/question/content.html
index 8fdeb1d8..a2589628 100644
--- a/askbot/skins/default/templates/question/content.html
+++ b/askbot/skins/default/templates/question/content.html
@@ -1,4 +1,4 @@
-{% import "macros/macros.html" as macros %}
+{% import "macros.html" as macros %}
 {% include "question/question_card.html" %}
 {% if question.closed %}
     {% include "question/closed_question_info.html" %}
diff --git a/askbot/skins/default/templates/question/sidebar.html b/askbot/skins/default/templates/question/sidebar.html
index 4b9de05d..3923f06c 100644
--- a/askbot/skins/default/templates/question/sidebar.html
+++ b/askbot/skins/default/templates/question/sidebar.html
@@ -1,4 +1,4 @@
-{% import "macros/macros.html" as macros %}
+{% import "macros.html" as macros %}
 {{ settings.SIDEBAR_QUESTION_HEADER }}
 <div class="boxC vote-buttons">
     <h2 id="questionTools">{% trans %}Question tools{% endtrans %}</h2>
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index 77a20e70..feee2521 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/macros.html" as macros %}
+{% import "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 be27f5de..883dc3aa 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/macros.html" as macros %}
+            {% import "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 c9d147e9..0c10e6d4 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/macros.html" as macros %}
+{% import "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 3a2b9fac..b436fb84 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/macros.html" as macros %}
+{% import "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 aa1e55d5..7d9026af 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/macros.html" as macros %}
+{% import "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 f4b1e6ab..1e2fa2d6 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/macros.html" as macros %}
+{% import "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 c1b35ebc..e7e3dbfe 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/macros.html" as macros %}
+{% import "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 34450632..36b782e5 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/macros.html" as macros %}
+{% import "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 35452a2b..1fd2e06a 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/macros.html" as macros %}
+{% import "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 94a1c17b..d9002d30 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/macros.html" as macros %}
+{% import "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 edb13e39..41809a62 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/macros.html" as macros %}
+{% import "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 0bb512ff..1d7d02dd 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/macros.html" as macros %}
+{% import "macros.html" as macros %}
 <!-- users.html -->
 {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/widgets/question_summary.html b/askbot/skins/default/templates/widgets/question_summary.html
index 51ce7f23..9c527140 100644
--- a/askbot/skins/default/templates/widgets/question_summary.html
+++ b/askbot/skins/default/templates/widgets/question_summary.html
@@ -1,4 +1,4 @@
-{% from "macros/macros.html" import user_country_flag, tag_list_widget %}
+{% from "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/tag_selector.html b/askbot/skins/default/templates/widgets/tag_selector.html
index 3346f61b..42939a5a 100644
--- a/askbot/skins/default/templates/widgets/tag_selector.html
+++ b/askbot/skins/default/templates/widgets/tag_selector.html
@@ -1,5 +1,5 @@
 {# todo - maybe disable navigation from ignored tags here when "hide" is on - with js? #}
-{% import "macros/macros.html" as macros %}
+{% import "macros.html" as macros %}
 <div id="tagSelector" class="box">
     <h2>{% trans %}Interesting tags{% endtrans %}</h2>
     {{ 
diff --git a/askbot/skins/default/templates/widgets/user_list.html b/askbot/skins/default/templates/widgets/user_list.html
index 78662b93..7874946b 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/macros.html" import gravatar %}
+{%from "macros.html" import gravatar %}
 <div class="userList">
     <table class="list-table">
         <tr>