34 files changed, 49 insertions, 104 deletions
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index ab2f2aac..1054b9db 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -28,11 +28,11 @@
 {% endblock %}
 
 {% block sidebar %}
-    {% include "answer_edit_tips.html" %}
+    {% include "blocks/answer_edit_tips.html" %}
 {% endblock %}
 
 {% block endjs %}
-    {% include "editor_data.html" %}
+    {% include "blocks/editor_data.html" %}
     <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 0bdb5ed1..43287c11 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -6,7 +6,7 @@
 {% endblock %}
 {# main contents of ask form is in the template input_bar #}
 {% block sidebar %}
-{% include "question_edit_tips.html" %}
+{% include "blocks/question_edit_tips.html" %}
 {% endblock %}
 {% block endjs %}
     <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
@@ -14,7 +14,7 @@
     <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
-    {% include "editor_data.html" %}
+    {% include "blocks/editor_data.html" %}
     <script type='text/javascript'>
         {% if settings.ENABLE_MATHJAX or settings.MARKUP_CODE_FRIENDLY %}
             var codeFriendlyMarkdown = true;
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 1af581b3..80545b88 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -4,7 +4,6 @@
     {% spaceless %}
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title>
-        {#% include "blocks/head.html" %#}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% block meta_description %}
         <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
@@ -44,23 +43,17 @@
     </head>
     {% endspaceless %}
     <body{% if page_class %} class="{{page_class}}"{% endif %}>
-        {#% include "blocks/forum_body.html" %#}
-        <div class="notify" style="display:none">
-            {% if user_messages %}
-                {% for message in user_messages %}
-                      <p class="darkred">{{ message }}</p>
-                {% endfor %}
-            {% endif %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
-        </div>
-        {% include "header.html" %}
+        {% include "blocks/system_messages.html" %}
+        {% include "custom_header.html" ignore missing %}
+        {% include "blocks/header.html" %}
         {% block body %}
         {% endblock %}
         {% if settings.FOOTER_MODE == 'default' %}
-            {% include "footer.html" %}
+            {% include "blocks/footer.html" %}
         {% elif settings.FOOTER_MODE == 'customize' %}
             {{ settings.CUSTOM_FOOTER }}
         {% endif %}
+        {% include "custom_footer.html" ignore missing %}
         {% include "blocks/bottom_scripts.html" %}
         {% block endjs %}
         {% endblock %}
diff --git a/askbot/skins/default/templates/answer_edit_tips.html b/askbot/skins/default/templates/blocks/answer_edit_tips.html
index 5e9f689a..5e9f689a 100644
--- a/askbot/skins/default/templates/answer_edit_tips.html
+++ b/askbot/skins/default/templates/blocks/answer_edit_tips.html
diff --git a/askbot/skins/default/templates/ask_form.html b/askbot/skins/default/templates/blocks/ask_form.html
index ff7fea0d..ff7fea0d 100644
--- a/askbot/skins/default/templates/ask_form.html
+++ b/askbot/skins/default/templates/blocks/ask_form.html
diff --git a/askbot/skins/default/templates/editor_data.html b/askbot/skins/default/templates/blocks/editor_data.html
index 79ed96fb..79ed96fb 100644
--- a/askbot/skins/default/templates/editor_data.html
+++ b/askbot/skins/default/templates/blocks/editor_data.html
diff --git a/askbot/skins/default/templates/footer.html b/askbot/skins/default/templates/blocks/footer.html
index 03f27460..03f27460 100644
--- a/askbot/skins/default/templates/footer.html
+++ b/askbot/skins/default/templates/blocks/footer.html
diff --git a/askbot/skins/default/templates/header.html b/askbot/skins/default/templates/blocks/header.html
index 917e3a4f..917e3a4f 100644
--- a/askbot/skins/default/templates/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
diff --git a/askbot/skins/default/templates/input_bar.html b/askbot/skins/default/templates/blocks/input_bar.html
index c3453955..a7be193e 100644
--- a/askbot/skins/default/templates/input_bar.html
+++ b/askbot/skins/default/templates/blocks/input_bar.html
@@ -41,5 +41,5 @@
 </div>
 {% endspaceless %}
 {% else %}
-    {% include "ask_form.html" %}
+    {% include "blocks/ask_form.html" %}
 {% endif %}
diff --git a/askbot/skins/default/templates/question_edit_tips.html b/askbot/skins/default/templates/blocks/question_edit_tips.html
index 2c239115..2c239115 100644
--- a/askbot/skins/default/templates/question_edit_tips.html
+++ b/askbot/skins/default/templates/blocks/question_edit_tips.html
diff --git a/askbot/skins/default/templates/blocks/system_messages.html b/askbot/skins/default/templates/blocks/system_messages.html
new file mode 100644
index 00000000..18ba03d7
--- /dev/null
+++ b/askbot/skins/default/templates/blocks/system_messages.html
@@ -0,0 +1,8 @@
+<div class="notify" style="display:none">
+    {% if user_messages %}
+        {% for message in user_messages %}
+              <p class="darkred">{{ message }}</p>
+        {% endfor %}
+    {% endif %}
+    <a id="close-notify" onclick="notify.close(true)">&times;</a>
+</div>
diff --git a/askbot/skins/default/templates/tag_selector.html b/askbot/skins/default/templates/blocks/tag_selector.html
index 6f6b8dc6..6f6b8dc6 100644
--- a/askbot/skins/default/templates/tag_selector.html
+++ b/askbot/skins/default/templates/blocks/tag_selector.html
diff --git a/askbot/skins/default/templates/html.list b/askbot/skins/default/templates/html.list
deleted file mode 100644
index 1f2c46c8..00000000
--- a/askbot/skins/default/templates/html.list
+++ /dev/null
@@ -1,56 +0,0 @@
-==TODO==
-yadis.xrdf - inline into .py file
-signup_with_password.html - create password protected account - a variation of complete.html
-
-==not used yet, but are linked to in code==
-confirm_email.txt - new user greeting - not used yet
-email_validation.txt - not used now
-changeemail.html - used only is EMAIL_VALIDATION == True, but the setting is disabled now
-
-==done==
-authopenid/signin.html - main signin template
-authopenid/complete.html - main registration template
-404.html
-500.html
-question_retag.html
-paginator.html
-user_responses.html
-users_questions.html
-users.html
-user_favorites.html
-user_recent.html
-user_info.html
-user_reputation.html
-user_moderate.html
-user_votes.html
-user_stats.html
-user_email_subscriptions.html
-user_edit.html
-tags.html
-revisions.html
-reopen.html
-question_edit.html
-privacy.html
-tag_selector..html
-questions..html
-ask_form..html
-base..html
-footer..html
-header..html
-input_bar..html
-answer_edit_tips.html
-answer_edit.html
-ask.html
-badges.html
-base_content.html
-close.html
-edit_user_email_feeds_form.html
-user.html
-user_tabs.html
-faq.html
-feedback.html
-instant_notification.html
-macros.html
-question_edit_tips.html
-question.html
-
diff --git a/askbot/skins/default/templates/one_column_body.html b/askbot/skins/default/templates/one_column_body.html
index f920a1ed..65253890 100644
--- a/askbot/skins/default/templates/one_column_body.html
+++ b/askbot/skins/default/templates/one_column_body.html
@@ -3,7 +3,7 @@
 <div id="wrapper">
     <div id="room">
         <div id="CAFull">
-            {% include "input_bar.html" %}
+            {% include "blocks/input_bar.html" %}
             {% block content%}
             {% endblock%}
         </div>
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index e0bd062f..f11dc3d5 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -473,5 +473,5 @@
             setupFormValidation($("#fmanswer"), CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
         }
     </script>
-    {% include "editor_data.html" %}
+    {% include "blocks/editor_data.html" %}
 {% endblock %}
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index ef2ecb82..5e52a334 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -33,11 +33,11 @@
 {% endblock %}
 
 {% block sidebar %}
-{% include "question_edit_tips.html" %}
+{% include "blocks/question_edit_tips.html" %}
 {% endblock %}
 
 {% block endjs %}
-    {% include "editor_data.html" %}
+    {% include "blocks/editor_data.html" %}
     <script type='text/javascript' src='{{"/js/editor.js"|media }}'></script>
     <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html
index a0439819..5e47ed0f 100644
--- a/askbot/skins/default/templates/questions.html
+++ b/askbot/skins/default/templates/questions.html
@@ -207,7 +207,7 @@
     {% endif %}
 
     {% if request.user.is_authenticated() %} 
-       {% include "tag_selector.html" %}
+       {% include "blocks/tag_selector.html" %}
     {% endif %}
 
     {% if tags %}
diff --git a/askbot/skins/default/templates/two_column_body.html b/askbot/skins/default/templates/two_column_body.html
index f13d0f5d..05139888 100644
--- a/askbot/skins/default/templates/two_column_body.html
+++ b/askbot/skins/default/templates/two_column_body.html
@@ -3,7 +3,7 @@
 <div id="wrapper">
     <div id="room">
         <div id="CALeft">
-        {% include "input_bar.html" %}
+        {% include "blocks/input_bar.html" %}
         {% block content%}
         {% endblock%}
         </div>
diff --git a/askbot/skins/default/templates/paginator.html b/askbot/skins/default/templates/unused/paginator.html
index 9782407f..9782407f 100644
--- a/askbot/skins/default/templates/paginator.html
+++ b/askbot/skins/default/templates/unused/paginator.html
diff --git a/askbot/skins/default/templates/user.html b/askbot/skins/default/templates/user_profile/user.html
index 1d0881a2..da368300 100644
--- a/askbot/skins/default/templates/user.html
+++ b/askbot/skins/default/templates/user_profile/user.html
@@ -15,7 +15,7 @@
             </a>
             {% endspaceless %}
         </div>
-        {% include "user_tabs.html" %}
+        {% include "user_profile/user_tabs.html" %}
         {% block usercontent %}
         {% endblock %}
     </div>
diff --git a/askbot/skins/default/templates/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html
index ecdc8809..ecdc8809 100644
--- a/askbot/skins/default/templates/user_edit.html
+++ b/askbot/skins/default/templates/user_profile/user_edit.html
diff --git a/askbot/skins/default/templates/user_email_subscriptions.html b/askbot/skins/default/templates/user_profile/user_email_subscriptions.html
index c14834a3..3081ccae 100644
--- a/askbot/skins/default/templates/user_email_subscriptions.html
+++ b/askbot/skins/default/templates/user_profile/user_email_subscriptions.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_email_subscriptions.html -->
 {% block usercontent %}
     <h2>{% trans %}Email subscription settings{% endtrans %}</h2>
diff --git a/askbot/skins/default/templates/user_favorites.html b/askbot/skins/default/templates/user_profile/user_favorites.html
index c346bbb6..a59d6d60 100644
--- a/askbot/skins/default/templates/user_favorites.html
+++ b/askbot/skins/default/templates/user_profile/user_favorites.html
@@ -1,6 +1,6 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_favorites.html -->
 {% block usercontent %}
-{% include "users_questions.html" %}
+{% include "user_profile/users_questions.html" %}
 {% endblock %}
 <!-- end user_favorites.html -->
diff --git a/askbot/skins/default/templates/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html
index 0904a302..ac8f509a 100644
--- a/askbot/skins/default/templates/user_inbox.html
+++ b/askbot/skins/default/templates/user_profile/user_inbox.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 {% import "macros.html" as macros %}
 <!-- user_responses.html -->
 {#
diff --git a/askbot/skins/default/templates/user_info.html b/askbot/skins/default/templates/user_profile/user_info.html
index 7c8d4eac..7c8d4eac 100644
--- a/askbot/skins/default/templates/user_info.html
+++ b/askbot/skins/default/templates/user_profile/user_info.html
diff --git a/askbot/skins/default/templates/user_moderate.html b/askbot/skins/default/templates/user_profile/user_moderate.html
index 75ea970e..789ce2cb 100644
--- a/askbot/skins/default/templates/user_moderate.html
+++ b/askbot/skins/default/templates/user_profile/user_moderate.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_moderate.html -->
 {% block usercontent %}
 {% if request.user != view_user %}
diff --git a/askbot/skins/default/templates/user_recent.html b/askbot/skins/default/templates/user_profile/user_recent.html
index 39dc4bea..00197a41 100644
--- a/askbot/skins/default/templates/user_recent.html
+++ b/askbot/skins/default/templates/user_profile/user_recent.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_recent.html -->
 {% block usercontent %}
         <div style="padding-top:5px;font-size:13px;">
diff --git a/askbot/skins/default/templates/user_reputation.html b/askbot/skins/default/templates/user_profile/user_reputation.html
index dd9d341d..be888d7b 100644
--- a/askbot/skins/default/templates/user_reputation.html
+++ b/askbot/skins/default/templates/user_profile/user_reputation.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_reputation.html -->
 {% block usercontent %}
         <div class="karma-summary">
diff --git a/askbot/skins/default/templates/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html
index 6c96d94d..5d6a8add 100644
--- a/askbot/skins/default/templates/user_stats.html
+++ b/askbot/skins/default/templates/user_profile/user_stats.html
@@ -1,12 +1,12 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_stats.html -->
     {% block usercontent %}
-        {% include "user_info.html" %}
+        {% include "user_profile/user_info.html" %}
         <a name="questions"></a>
         {% spaceless %}
             <h2>{% trans counter=questions|length %}<span class="count">{{counter}}</span> Question{% pluralize %}<span class="count">{{counter}}</span> Questions{% endtrans %}</h2>
         {% endspaceless %}
-    {% include "users_questions.html" %}
+    {% include "user_profile/users_questions.html" %}
         <a name="answers"></a>
         {% spaceless %}
             <h2 style="clear:both;">{% trans counter=answered_questions|length %}<span class="count">{{counter}}</span> Answer{% pluralize %}<span class="count">{{counter}}</span> Answers{% endtrans %}</h2>
diff --git a/askbot/skins/default/templates/user_tabs.html b/askbot/skins/default/templates/user_profile/user_tabs.html
index bf63ae77..bf63ae77 100644
--- a/askbot/skins/default/templates/user_tabs.html
+++ b/askbot/skins/default/templates/user_profile/user_tabs.html
diff --git a/askbot/skins/default/templates/user_votes.html b/askbot/skins/default/templates/user_profile/user_votes.html
index 33f6f1fe..fdf5c2e8 100644
--- a/askbot/skins/default/templates/user_votes.html
+++ b/askbot/skins/default/templates/user_profile/user_votes.html
@@ -1,4 +1,4 @@
-{% extends "user.html" %}
+{% extends "user_profile/user.html" %}
 <!-- user_votes.html -->
 {% block usercontent %}
         <div style="padding-top:5px;font-size:13px;">
diff --git a/askbot/skins/default/templates/users_questions.html b/askbot/skins/default/templates/user_profile/users_questions.html
index aaec21b7..aaec21b7 100644
--- a/askbot/skins/default/templates/users_questions.html
+++ b/askbot/skins/default/templates/user_profile/users_questions.html
diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py
index 1c794f7c..cd1b6735 100644
--- a/askbot/tests/page_load_tests.py
+++ b/askbot/tests/page_load_tests.py
@@ -252,13 +252,13 @@ class PageLoadTests(PageLoadTestCase):
             'user_profile', 
             kwargs={'id': 2, 'slug': name_slug},
             data={'sort':'stats'}, 
-            template='user_stats.html'
+            template='user_profile/user_stats.html'
         )
         self.try_url(
             'user_profile', 
             kwargs={'id': 2, 'slug': name_slug},
             data={'sort':'recent'}, 
-            template='user_recent.html'
+            template='user_profile/user_recent.html'
         )
         self.try_url(
             'user_profile', 
@@ -271,7 +271,7 @@ class PageLoadTests(PageLoadTestCase):
             'user_profile', 
             kwargs={'id': 2, 'slug': name_slug},
             data={'sort':'reputation'}, 
-            template='user_reputation.html'
+            template='user_profile/user_reputation.html'
         )
         self.try_url(
             'user_profile', 
@@ -284,7 +284,7 @@ class PageLoadTests(PageLoadTestCase):
             'user_profile', 
             kwargs={'id': 2, 'slug': name_slug},
             data={'sort':'favorites'}, 
-            template='user_favorites.html'
+            template='user_profile/user_favorites.html'
         )
         self.try_url(
             'user_profile', 
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 03877974..169da811 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -225,7 +225,7 @@ def user_moderate(request, subject):
         'user_status_changed': user_status_changed
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_moderate.html')
+    template = ENV.get_template('user_profile/user_moderate.html')
     return HttpResponse(template.render(context))
 
 #non-view function
@@ -277,7 +277,7 @@ def edit_user(request, id):
         'gravatar_faq_url' : reverse('faq') + '#gravatar',
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_edit.html')
+    template = ENV.get_template('user_profile/user_edit.html')
     return HttpResponse(template.render(context))
 
 def user_stats(request, user):
@@ -391,7 +391,7 @@ def user_stats(request, user):
         'total_awards' : total_awards,
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_stats.html')
+    template = ENV.get_template('user_profile/user_stats.html')
     return HttpResponse(template.render(context))
 
 def user_recent(request, user):
@@ -664,7 +664,7 @@ def user_recent(request, user):
         'activities' : activities[:const.USER_VIEW_DATA_SIZE]
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_recent.html')
+    template = ENV.get_template('user_profile/user_recent.html')
     return HttpResponse(template.render(context))
 
 @owner_or_moderator_required
@@ -732,7 +732,7 @@ def user_responses(request, user):
         'responses' : response_list,
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_inbox.html')
+    template = ENV.get_template('user_profile/user_inbox.html')
     return HttpResponse(template.render(context))
 
 @owner_or_moderator_required
@@ -797,7 +797,7 @@ def user_votes(request, user):
         'votes' : votes[:const.USER_VIEW_DATA_SIZE]
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_votes.html')
+    template = ENV.get_template('user_profile/user_votes.html')
     return HttpResponse(template.render(context))
 
 def user_reputation(request, user):
@@ -837,7 +837,7 @@ def user_reputation(request, user):
         'reps': reps
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_reputation.html')
+    template = ENV.get_template('user_profile/user_reputation.html')
     return HttpResponse(template.render(context))
 
 def user_favorites(request, user):
@@ -866,7 +866,7 @@ def user_favorites(request, user):
         'view_user' : user
     }
     context = RequestContext(request, data)
-    template = ENV.get_template('user_favorites.html')
+    template = ENV.get_template('user_profile/user_favorites.html')
     return HttpResponse(template.render(context))
 
 @owner_or_moderator_required
@@ -897,7 +897,7 @@ def user_email_subscriptions(request, user):
         tag_filter_form = forms.TagFilterSelectionForm(instance=user)
         action_status = None
 
-    template = ENV.get_template('user_email_subscriptions.html')
+    template = ENV.get_template('user_profile/user_email_subscriptions.html')
     data = {
         'active_tab': 'users',
         'tab_name': 'email_subscriptions',