From 6d068cbd5a4feb6e398607e3003140dd7d287a42 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <adolfo.fitoria@gmail.com>
Date: Mon, 17 Oct 2011 17:01:06 -0300
Subject: Block migration complete

---
 askbot/skins/default/templates/answer_edit.html    |  2 +-
 askbot/skins/default/templates/ask.html            |  4 +-
 askbot/skins/default/templates/base.html           | 10 +--
 askbot/skins/default/templates/blocks/README       |  2 -
 .../skins/default/templates/blocks/ask_form.html   | 46 ----------
 .../default/templates/blocks/bottom_scripts.html   | 97 ----------------------
 .../default/templates/blocks/editor_data.html      | 10 ---
 askbot/skins/default/templates/blocks/footer.html  | 61 --------------
 askbot/skins/default/templates/blocks/header.html  | 17 ----
 .../templates/blocks/mandatory_tags_js.html        | 25 ------
 .../skins/default/templates/blocks/paginator.html  |  4 -
 .../default/templates/blocks/secondary_header.html | 12 ---
 .../default/templates/blocks/system_messages.html  |  8 --
 .../default/templates/meta/bottom_scripts.html     | 97 ++++++++++++++++++++++
 .../skins/default/templates/meta/editor_data.html  | 10 +++
 .../default/templates/meta/mandatory_tags_js.html  | 25 ++++++
 .../default/templates/question/javascript.html     |  2 +-
 askbot/skins/default/templates/question_edit.html  |  4 +-
 .../skins/default/templates/widgets/ask_form.html  | 46 ++++++++++
 askbot/skins/default/templates/widgets/footer.html | 61 ++++++++++++++
 askbot/skins/default/templates/widgets/header.html | 17 ++++
 .../default/templates/widgets/search_bar.html      |  2 +-
 .../templates/widgets/secondary_header.html        | 12 +++
 .../default/templates/widgets/system_messages.html |  8 ++
 24 files changed, 288 insertions(+), 294 deletions(-)
 delete mode 100644 askbot/skins/default/templates/blocks/README
 delete mode 100644 askbot/skins/default/templates/blocks/ask_form.html
 delete mode 100644 askbot/skins/default/templates/blocks/bottom_scripts.html
 delete mode 100644 askbot/skins/default/templates/blocks/editor_data.html
 delete mode 100644 askbot/skins/default/templates/blocks/footer.html
 delete mode 100644 askbot/skins/default/templates/blocks/header.html
 delete mode 100644 askbot/skins/default/templates/blocks/mandatory_tags_js.html
 delete mode 100644 askbot/skins/default/templates/blocks/paginator.html
 delete mode 100644 askbot/skins/default/templates/blocks/secondary_header.html
 delete mode 100644 askbot/skins/default/templates/blocks/system_messages.html
 create mode 100644 askbot/skins/default/templates/meta/bottom_scripts.html
 create mode 100644 askbot/skins/default/templates/meta/editor_data.html
 create mode 100644 askbot/skins/default/templates/meta/mandatory_tags_js.html
 create mode 100644 askbot/skins/default/templates/widgets/ask_form.html
 create mode 100644 askbot/skins/default/templates/widgets/footer.html
 create mode 100644 askbot/skins/default/templates/widgets/header.html
 create mode 100644 askbot/skins/default/templates/widgets/secondary_header.html
 create mode 100644 askbot/skins/default/templates/widgets/system_messages.html

diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index 0ab5f641..168ba784 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -33,7 +33,7 @@
 {% endblock %}
 
 {% block endjs %}
-    {% include "blocks/editor_data.html" %}
+    {% include "meta/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 6eb02b64..07bd8424 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -20,9 +20,9 @@
         var minSearchWordLength = {{settings.MIN_SEARCH_WORD_LENGTH}};
     </script>
     <script type='text/javascript' src='{{"/js/live_search.js"|media}}'></script>
-    {% include "blocks/editor_data.html" %}
+    {% include "meta/editor_data.html" %}
     {% if mandatory_tags %}
-        {% include "blocks/mandatory_tags_js.html" %}
+        {% include "meta/mandatory_tags_js.html" %}
     {% endif %}
     <script type='text/javascript'>
         askbot['urls']['api_get_questions'] = '{% url api_get_questions %}';
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 54b63420..f84e031d 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -15,21 +15,21 @@
     </head>
     {% endspaceless %}
     <body class="{% block body_class %}{% endblock %}{% if page_class %} {{page_class}}{% endif %}">
-        {% include "blocks/system_messages.html" %}
+        {% include "widgets/system_messages.html" %}
         {% include "custom_header.html" ignore missing %}
-        {% include "blocks/header.html" %} {# Logo, user tool navigation and meta navitation #}
-        {% include "blocks/secondary_header.html" %} {# Scope selector, search input and ask button #}
+        {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
+        {% include "widgets/secondary_header.html" %} {# Scope selector, search input and ask button #}
         <div class="content-wrapper">
             {% block body %}
             {% endblock %}
         </div>
         {% if settings.FOOTER_MODE == 'default' %}
-            {% include "blocks/footer.html" %}
+            {% include "widgets/footer.html" %}
         {% elif settings.FOOTER_MODE == 'customize' %}
             {{ settings.CUSTOM_FOOTER }}
         {% endif %}
         {% include "custom_footer.html" ignore missing %}
-        {% include "blocks/bottom_scripts.html" %}
+        {% include "meta/bottom_scripts.html" %}
         {% block endjs %}
         {% endblock %}
         <script type="text/javascript">
diff --git a/askbot/skins/default/templates/blocks/README b/askbot/skins/default/templates/blocks/README
deleted file mode 100644
index 88537d0a..00000000
--- a/askbot/skins/default/templates/blocks/README
+++ /dev/null
@@ -1,2 +0,0 @@
-this directory should contain block templates that
-are included within other templates
diff --git a/askbot/skins/default/templates/blocks/ask_form.html b/askbot/skins/default/templates/blocks/ask_form.html
deleted file mode 100644
index 606aef78..00000000
--- a/askbot/skins/default/templates/blocks/ask_form.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% import "macros.html" as macros %}
-<form id="fmask" action="" method="post" >{% csrf_token %}
-    <div class="form-item">
-        <div id="askFormBar">
-            {% if not request.user.is_authenticated() %}
-                <p>{% trans %}login to post question info{% endtrans %}</p>
-            {% else %}
-                {% if settings.EMAIL_VALIDATION %}
-                    {% if not request.user.email_isvalid %}
-                            {% trans email=request.user.email %}must have valid {{email}} to post, 
-                            see {{email_validation_faq_url}}
-                            {% endtrans %}
-                    {% endif %}
-                {% endif %}
-            {% endif %}
-            <input id="id_title" class="questionTitleInput" name="title" autocomplete="off"
-                value="{% if form.initial.title %}{{form.initial.title}}{% endif %}"/>
-            <span class="form-error">{{ form.title.errors }}</span>
-        </div>
-        <div class="title-desc">
-            {{ form.title.help_text }}
-        </div>
-    </div>
-    <div id='question-list'></div>
-    {{
-        macros.edit_post(
-            form,
-            post_type = 'question',
-            edit_title = False,
-            mandatory_tags = mandatory_tags
-        )
-    }}
-    {% if not request.user.is_authenticated() %}
-    <input type="submit" name="post_anon" value="{% trans %}Login/signup to post your question{% endtrans %}" class="submit" />
-    {% else %}
-    <input type="submit" name="post" value="{% trans %}Ask your question{% endtrans %}" class="submit" />
-    {% endif %}
-    <div class="question-options">
-        {% if settings.WIKI_ON %}
-            {{ macros.checkbox_in_div(form.wiki) }}
-        {% endif %}
-        {% if settings.ALLOW_ASK_ANONYMOUSLY %}
-            {{ macros.checkbox_in_div(form.ask_anonymously) }}
-        {% endif %}
-    </div>
-</form>
diff --git a/askbot/skins/default/templates/blocks/bottom_scripts.html b/askbot/skins/default/templates/blocks/bottom_scripts.html
deleted file mode 100644
index 1f63b468..00000000
--- a/askbot/skins/default/templates/blocks/bottom_scripts.html
+++ /dev/null
@@ -1,97 +0,0 @@
-{# most, if not all javascripts should go here
-   this template is included at the very bottow of the
-   main template "base.html"
-#}
-<div id="no-javascript">
-  <noscript class="noscript">
-    {% trans app_name = settings.APP_SHORT_NAME %}Please note: {{app_name}} requires javascript to work properly, please enable javascript in your browser, <a href="{{noscript_url}}">here is how</a>{% endtrans %}
-  </noscript>
-</div>
-<script type="text/javascript">
-    var i18nLang = '{{settings.LANGUAGE_CODE}}';
-    var scriptUrl = '/{{settings.ASKBOT_URL}}'
-    var askbotSkin = '{{settings.ASKBOT_DEFAULT_SKIN}}';
-    var enableMathJax = {% if settings.ENABLE_MATHJAX %}true{% else %}false{% endif %};
-    {% if request.user.is_authenticated() %}
-        askbot['data']['userIsAuthenticated'] = true;
-        askbot['data']['userId'] = {{request.user.id}};
-        askbot['data']['userIsAdminOrMod'] = {% if 
-                                                request.user.is_administrator()
-                                                or request.user.is_moderator()
-                                            %}true{% else %}false{% endif %};
-    {% else %}
-        askbot['data']['userIsAuthenticated'] = false;
-    {% endif %}
-    askbot['urls']['mark_read_message'] = '{% url "read_message" %}';
-    askbot['urls']['get_tags_by_wildcard'] = '{% url "get_tags_by_wildcard" %}';
-    askbot['urls']['get_tag_list'] = '{% url "get_tag_list" %}';
-    askbot['urls']['follow_user'] = scriptUrl + 'followit/follow/user/{{'{{'}}userId{{'}}'}}/';
-    askbot['urls']['unfollow_user'] = scriptUrl + 'followit/unfollow/user/{{'{{'}}userId{{'}}'}}/';
-    askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}';
-</script>
-<script 
-    type="text/javascript"
-    {% if settings.DEBUG %}
-        src="{{"/js/jquery-1.4.3.js"|media}}"
-    {% else %}
-        src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"
-    {% endif %}
-></script>
-<script type='text/javascript' src="{{"/js/i18n.js"|media }}"></script>
-<script type='text/javascript' src="{{"/js/jquery.i18n.js"|media }}"></script>
-<script type='text/javascript' src="{% url "askbot_jsi18n" %}"></script>
-<script type='text/javascript' src="{{"/js/utils.js"|media }}"></script>
-<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'>
-{% if settings.ENABLE_MATHJAX %}
-    <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js">
-        MathJax.Hub.Config({
-            extensions: ["tex2jax.js"],
-            jax: ["input/TeX","output/HTML-CSS"],
-            tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
-        });
-    </script>
-{% endif %}
-<script type="text/javascript">
-{% if active_tab != "tags" and active_tab != "users" %}
-{# start asking question with title from search query #}
-    $(document).ready(function(){
-        $('#nav_ask').click(
-            function(){
-                var starting_title = $('#keywords').attr('value');
-                var new_url = $(this).attr('href') + '?title=' + encodeURIComponent(starting_title);
-                window.location.href = new_url;
-                return false;
-            }
-        );
-        //{# focus input on the search bar endcomment #}
-        {% if active_tab != "ask" %}
-            $('#keywords').focus();
-        {% else %}
-            $('#id_title').focus();
-        {% endif %}
-        animateHashes();
-    });
-{% endif %}
-{% if user_messages %}
-    $('#validate_email_alert').click(function(){notify.close(true)})
-    notify.show();
-{% endif %}
-</script>
-{% if settings.USE_CUSTOM_JS %}
-<script 
-    src="{% url "custom_js"%}?{{ settings.MEDIA_RESOURCE_REVISION }}"
-    type="text/javascript"
-></script>
-{% endif %}
-{% if settings.GOOGLE_ANALYTICS_KEY %}
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-    try {
-    var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
-    pageTracker._trackPageview();
-    } catch(err) {}
-</script>
-{% endif %}
diff --git a/askbot/skins/default/templates/blocks/editor_data.html b/askbot/skins/default/templates/blocks/editor_data.html
deleted file mode 100644
index 79ed96fb..00000000
--- a/askbot/skins/default/templates/blocks/editor_data.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/javascript">
-    {# data necessary for the post editor, goes into endjs block #}
-    askbot['settings']['maxTagLength'] = {{settings.MAX_TAG_LENGTH}};
-                            'each tag must be shorter than %(max_chars)d characters',
-    askbot['messages']['maxTagLength'] = '{% trans max_chars = settings.MAX_TAG_LENGTH %}each tag must be shorter that {{max_chars}} character{% pluralize %}each tag must be shorter than {{max_chars}} characters{% endtrans %}';
-    askbot['settings']['maxTagsPerPost'] = {{settings.MAX_TAGS_PER_POST}};
-    askbot['messages']['maxTagsPerPost'] = '{% trans tag_count = settings.MAX_TAGS_PER_POST %}please use {{tag_count}} tag{% pluralize %}please use {{tag_count}} tags or less{% endtrans %}';
-    askbot['messages']['tagLimits'] = '{% trans tag_count=settings.MAX_TAGS_PER_POST, max_chars=settings.MAX_TAG_LENGTH %}please use up to {{tag_count}} tags, less than {{max_chars}} characters each{% endtrans %}'; 
-    askbot['urls']['upload'] = '{% url "upload" %}';
-</script>
diff --git a/askbot/skins/default/templates/blocks/footer.html b/askbot/skins/default/templates/blocks/footer.html
deleted file mode 100644
index 14f18786..00000000
--- a/askbot/skins/default/templates/blocks/footer.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- template footer.html -->
-<div id="ground">
-    <div class="content-wrapper">
-        {% if settings.USE_LICENSE %}{# could be factored out into separate template #}
-            {% if settings.LICENSE_USE_URL %}
-            <div class="copyright">
-                {% if settings.LICENSE_USE_LOGO %}
-                <a href="{{ settings.LICENSE_URL}}">
-                        <img
-                            class="license-logo"
-                            src="{{settings.LICENSE_LOGO_URL|media }}"
-                            title="{{settings.LICENSE_ACRONYM}}"
-                            alt="{{settings.LICENSE_ACRONYM}}"
-                        />
-                </a>
-                {% endif %}
-                {{settings.APP_COPYRIGHT}} {% trans 
-                    license_title=settings.LICENSE_TITLE,
-                    license_url=settings.LICENSE_URL
-                %}Content on this site is licensed under a <a href="{{license_url}}">{{license_title}}</a> license.{% endtrans %}
-
-            </div>
-            {% else %}
-            <div class="copyright">
-                {% if settings.LICENSE_USE_LOGO %}
-                <img 
-                    class="license-logo"
-                    src="{{settings.LICENSE_LOGO_URL|media }}"
-                    title="{{settings.LICENSE_ACRONYM}}"
-                    alt="{{settings.LICENSE_ACRONYM}}"
-                />
-                {% endif %}
-                {{settings.APP_COPYRIGHT}} {% trans license=settings.LICENSE_TITLE %}Content on this site is licensed under a {{license}}{% endtrans %}
-            </div>
-            {% endif %}
-        {% endif %}
-        <div class="footer-links" >
-            <a href="{% url about %}">{% trans %}about{% endtrans %}</a><span class="link-separator"> |</span>
-            <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a><span class="link-separator"> |</span>
-            <a href="{% url privacy %}">{% trans %}privacy policy{% endtrans %}</a><span class="link-separator"> |</span>
-            {% spaceless %}
-            <a href=
-                        {% if settings.FEEDBACK_SITE_URL %}
-                            "{{settings.FEEDBACK_SITE_URL}}"
-                            target="_blank">
-                        {% else %}
-                            "{% url feedback %}?next={{request.path}}">
-                        {% endif %}
-                        {% trans %}give feedback{% endtrans %}
-                    </a>
-                    {% endspaceless %}
-        </div>
-        <div class="powered-link">
-            <a href="http://askbot.org" target="_blank">
-                Powered by Askbot version {{settings.ASKBOT_VERSION}}
-            </a>
-        </div>
-        <div class="clean"></div>
-    </div>
-</div>
-<!-- end template footer.html -->
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
deleted file mode 100644
index ad0ae4a2..00000000
--- a/askbot/skins/default/templates/blocks/header.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- template header.html -->
-{% import "macros.html" as macros %}
-<div id="header">
-    <div class="content-wrapper">
-        
-        <div id="userToolsNav">
-            {% include "widgets/user_navigation.html" %}
-            {{settings.CUSTOM_HEADER}}
-        </div>
-            {% include "widgets/logo.html" %}
-        <div id="metaNav">
-            {% include "widgets/meta_nav.html" %}
-        </div>
-        <div class="clean"></div>
-    </div>
-</div>
-<!-- end template header.html -->
diff --git a/askbot/skins/default/templates/blocks/mandatory_tags_js.html b/askbot/skins/default/templates/blocks/mandatory_tags_js.html
deleted file mode 100644
index f04a6345..00000000
--- a/askbot/skins/default/templates/blocks/mandatory_tags_js.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<script type="text/javascript">
-    $(document).ready(function(){
-        var fake_tag = new Tag();
-        $('ul.tags .tag').each(function(idx, elem){
-            var tag_input = $('input#id_tags');
-            var callback = function(){
-                var new_tag = fake_tag.decodeTagName($(elem).html());
-                if (/\*$/.test(new_tag)){//strip the asterisk
-                    new_tag = new_tag.substring(0, new_tag.length - 1);
-                }
-                if ($.trim(tag_input.val()) !== ''){
-                    var entered_tags = tag_input.val().split(/\s+/);
-                } else {
-                    var entered_tags = [];
-                }
-                if ($.inArray(new_tag, entered_tags) === -1){
-                    entered_tags.push(new_tag);
-                    tag_input.val(entered_tags.join(' '));
-                    tag_input.focus();
-                }
-            };
-            setupButtonEventHandlers($(elem), callback);
-        });
-    });
-</script>
diff --git a/askbot/skins/default/templates/blocks/paginator.html b/askbot/skins/default/templates/blocks/paginator.html
deleted file mode 100644
index 9782407f..00000000
--- a/askbot/skins/default/templates/blocks/paginator.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- paginator.html -->
-{% import "macros.html" as macros %}
-{{ macros.paginator(paginator_context)}}
-<!-- end paginator.html -->
diff --git a/askbot/skins/default/templates/blocks/secondary_header.html b/askbot/skins/default/templates/blocks/secondary_header.html
deleted file mode 100644
index caf190bc..00000000
--- a/askbot/skins/default/templates/blocks/secondary_header.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- template secondary_header.html -->
-<div id="secondaryHeader">
-    <div class="content-wrapper">
-        <a id="homeButton" href="{% url questions %}"></a>
-        <div id="scopeWrapper">
-            {% include "widgets/scope_nav.html" %}            
-            {% include "widgets/search_bar.html" %} {# include search form widget #}
-        </div>
-        {% include "widgets/ask_button.html" %}            
-        <div class="clean"></div>
-    </div>
-</div>
diff --git a/askbot/skins/default/templates/blocks/system_messages.html b/askbot/skins/default/templates/blocks/system_messages.html
deleted file mode 100644
index 6b803846..00000000
--- a/askbot/skins/default/templates/blocks/system_messages.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="notify" style="display:none">
-    {% if user_messages %}
-        {% for message in user_messages %}
-              <p>{{ message }}</p>
-        {% endfor %}
-    {% endif %}
-    <a id="closeNotify" onclick="notify.close(true)"></a>
-</div>
diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
new file mode 100644
index 00000000..1f63b468
--- /dev/null
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -0,0 +1,97 @@
+{# most, if not all javascripts should go here
+   this template is included at the very bottow of the
+   main template "base.html"
+#}
+<div id="no-javascript">
+  <noscript class="noscript">
+    {% trans app_name = settings.APP_SHORT_NAME %}Please note: {{app_name}} requires javascript to work properly, please enable javascript in your browser, <a href="{{noscript_url}}">here is how</a>{% endtrans %}
+  </noscript>
+</div>
+<script type="text/javascript">
+    var i18nLang = '{{settings.LANGUAGE_CODE}}';
+    var scriptUrl = '/{{settings.ASKBOT_URL}}'
+    var askbotSkin = '{{settings.ASKBOT_DEFAULT_SKIN}}';
+    var enableMathJax = {% if settings.ENABLE_MATHJAX %}true{% else %}false{% endif %};
+    {% if request.user.is_authenticated() %}
+        askbot['data']['userIsAuthenticated'] = true;
+        askbot['data']['userId'] = {{request.user.id}};
+        askbot['data']['userIsAdminOrMod'] = {% if 
+                                                request.user.is_administrator()
+                                                or request.user.is_moderator()
+                                            %}true{% else %}false{% endif %};
+    {% else %}
+        askbot['data']['userIsAuthenticated'] = false;
+    {% endif %}
+    askbot['urls']['mark_read_message'] = '{% url "read_message" %}';
+    askbot['urls']['get_tags_by_wildcard'] = '{% url "get_tags_by_wildcard" %}';
+    askbot['urls']['get_tag_list'] = '{% url "get_tag_list" %}';
+    askbot['urls']['follow_user'] = scriptUrl + 'followit/follow/user/{{'{{'}}userId{{'}}'}}/';
+    askbot['urls']['unfollow_user'] = scriptUrl + 'followit/unfollow/user/{{'{{'}}userId{{'}}'}}/';
+    askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}';
+</script>
+<script 
+    type="text/javascript"
+    {% if settings.DEBUG %}
+        src="{{"/js/jquery-1.4.3.js"|media}}"
+    {% else %}
+        src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"
+    {% endif %}
+></script>
+<script type='text/javascript' src="{{"/js/i18n.js"|media }}"></script>
+<script type='text/javascript' src="{{"/js/jquery.i18n.js"|media }}"></script>
+<script type='text/javascript' src="{% url "askbot_jsi18n" %}"></script>
+<script type='text/javascript' src="{{"/js/utils.js"|media }}"></script>
+<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'>
+{% if settings.ENABLE_MATHJAX %}
+    <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js">
+        MathJax.Hub.Config({
+            extensions: ["tex2jax.js"],
+            jax: ["input/TeX","output/HTML-CSS"],
+            tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
+        });
+    </script>
+{% endif %}
+<script type="text/javascript">
+{% if active_tab != "tags" and active_tab != "users" %}
+{# start asking question with title from search query #}
+    $(document).ready(function(){
+        $('#nav_ask').click(
+            function(){
+                var starting_title = $('#keywords').attr('value');
+                var new_url = $(this).attr('href') + '?title=' + encodeURIComponent(starting_title);
+                window.location.href = new_url;
+                return false;
+            }
+        );
+        //{# focus input on the search bar endcomment #}
+        {% if active_tab != "ask" %}
+            $('#keywords').focus();
+        {% else %}
+            $('#id_title').focus();
+        {% endif %}
+        animateHashes();
+    });
+{% endif %}
+{% if user_messages %}
+    $('#validate_email_alert').click(function(){notify.close(true)})
+    notify.show();
+{% endif %}
+</script>
+{% if settings.USE_CUSTOM_JS %}
+<script 
+    src="{% url "custom_js"%}?{{ settings.MEDIA_RESOURCE_REVISION }}"
+    type="text/javascript"
+></script>
+{% endif %}
+{% if settings.GOOGLE_ANALYTICS_KEY %}
+<script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+    var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
+    pageTracker._trackPageview();
+    } catch(err) {}
+</script>
+{% endif %}
diff --git a/askbot/skins/default/templates/meta/editor_data.html b/askbot/skins/default/templates/meta/editor_data.html
new file mode 100644
index 00000000..79ed96fb
--- /dev/null
+++ b/askbot/skins/default/templates/meta/editor_data.html
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+    {# data necessary for the post editor, goes into endjs block #}
+    askbot['settings']['maxTagLength'] = {{settings.MAX_TAG_LENGTH}};
+                            'each tag must be shorter than %(max_chars)d characters',
+    askbot['messages']['maxTagLength'] = '{% trans max_chars = settings.MAX_TAG_LENGTH %}each tag must be shorter that {{max_chars}} character{% pluralize %}each tag must be shorter than {{max_chars}} characters{% endtrans %}';
+    askbot['settings']['maxTagsPerPost'] = {{settings.MAX_TAGS_PER_POST}};
+    askbot['messages']['maxTagsPerPost'] = '{% trans tag_count = settings.MAX_TAGS_PER_POST %}please use {{tag_count}} tag{% pluralize %}please use {{tag_count}} tags or less{% endtrans %}';
+    askbot['messages']['tagLimits'] = '{% trans tag_count=settings.MAX_TAGS_PER_POST, max_chars=settings.MAX_TAG_LENGTH %}please use up to {{tag_count}} tags, less than {{max_chars}} characters each{% endtrans %}'; 
+    askbot['urls']['upload'] = '{% url "upload" %}';
+</script>
diff --git a/askbot/skins/default/templates/meta/mandatory_tags_js.html b/askbot/skins/default/templates/meta/mandatory_tags_js.html
new file mode 100644
index 00000000..f04a6345
--- /dev/null
+++ b/askbot/skins/default/templates/meta/mandatory_tags_js.html
@@ -0,0 +1,25 @@
+<script type="text/javascript">
+    $(document).ready(function(){
+        var fake_tag = new Tag();
+        $('ul.tags .tag').each(function(idx, elem){
+            var tag_input = $('input#id_tags');
+            var callback = function(){
+                var new_tag = fake_tag.decodeTagName($(elem).html());
+                if (/\*$/.test(new_tag)){//strip the asterisk
+                    new_tag = new_tag.substring(0, new_tag.length - 1);
+                }
+                if ($.trim(tag_input.val()) !== ''){
+                    var entered_tags = tag_input.val().split(/\s+/);
+                } else {
+                    var entered_tags = [];
+                }
+                if ($.inArray(new_tag, entered_tags) === -1){
+                    entered_tags.push(new_tag);
+                    tag_input.val(entered_tags.join(' '));
+                    tag_input.focus();
+                }
+            };
+            setupButtonEventHandlers($(elem), callback);
+        });
+    });
+</script>
diff --git a/askbot/skins/default/templates/question/javascript.html b/askbot/skins/default/templates/question/javascript.html
index 1e4e47ab..552155de 100644
--- a/askbot/skins/default/templates/question/javascript.html
+++ b/askbot/skins/default/templates/question/javascript.html
@@ -92,4 +92,4 @@
         setupFormValidation($("#fmanswer"), CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
     }
 </script>
-{% include "blocks/editor_data.html" %}
+{% include "meta/editor_data.html" %}
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index e039e33a..3cdcd8bb 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -43,10 +43,10 @@
 {% endblock %}
 
 {% block endjs %}
-    {% include "blocks/editor_data.html" %}
+    {% include "meta/editor_data.html" %}
     <script type='text/javascript' src='{{"/js/editor.js"|media }}'></script>
     {% if mandatory_tags %}
-        {% include "blocks/mandatory_tags_js.html" %}
+        {% include "meta/mandatory_tags_js.html" %}
     {% endif %}
     <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/widgets/ask_form.html b/askbot/skins/default/templates/widgets/ask_form.html
new file mode 100644
index 00000000..606aef78
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/ask_form.html
@@ -0,0 +1,46 @@
+{% import "macros.html" as macros %}
+<form id="fmask" action="" method="post" >{% csrf_token %}
+    <div class="form-item">
+        <div id="askFormBar">
+            {% if not request.user.is_authenticated() %}
+                <p>{% trans %}login to post question info{% endtrans %}</p>
+            {% else %}
+                {% if settings.EMAIL_VALIDATION %}
+                    {% if not request.user.email_isvalid %}
+                            {% trans email=request.user.email %}must have valid {{email}} to post, 
+                            see {{email_validation_faq_url}}
+                            {% endtrans %}
+                    {% endif %}
+                {% endif %}
+            {% endif %}
+            <input id="id_title" class="questionTitleInput" name="title" autocomplete="off"
+                value="{% if form.initial.title %}{{form.initial.title}}{% endif %}"/>
+            <span class="form-error">{{ form.title.errors }}</span>
+        </div>
+        <div class="title-desc">
+            {{ form.title.help_text }}
+        </div>
+    </div>
+    <div id='question-list'></div>
+    {{
+        macros.edit_post(
+            form,
+            post_type = 'question',
+            edit_title = False,
+            mandatory_tags = mandatory_tags
+        )
+    }}
+    {% if not request.user.is_authenticated() %}
+    <input type="submit" name="post_anon" value="{% trans %}Login/signup to post your question{% endtrans %}" class="submit" />
+    {% else %}
+    <input type="submit" name="post" value="{% trans %}Ask your question{% endtrans %}" class="submit" />
+    {% endif %}
+    <div class="question-options">
+        {% if settings.WIKI_ON %}
+            {{ macros.checkbox_in_div(form.wiki) }}
+        {% endif %}
+        {% if settings.ALLOW_ASK_ANONYMOUSLY %}
+            {{ macros.checkbox_in_div(form.ask_anonymously) }}
+        {% endif %}
+    </div>
+</form>
diff --git a/askbot/skins/default/templates/widgets/footer.html b/askbot/skins/default/templates/widgets/footer.html
new file mode 100644
index 00000000..14f18786
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/footer.html
@@ -0,0 +1,61 @@
+<!-- template footer.html -->
+<div id="ground">
+    <div class="content-wrapper">
+        {% if settings.USE_LICENSE %}{# could be factored out into separate template #}
+            {% if settings.LICENSE_USE_URL %}
+            <div class="copyright">
+                {% if settings.LICENSE_USE_LOGO %}
+                <a href="{{ settings.LICENSE_URL}}">
+                        <img
+                            class="license-logo"
+                            src="{{settings.LICENSE_LOGO_URL|media }}"
+                            title="{{settings.LICENSE_ACRONYM}}"
+                            alt="{{settings.LICENSE_ACRONYM}}"
+                        />
+                </a>
+                {% endif %}
+                {{settings.APP_COPYRIGHT}} {% trans 
+                    license_title=settings.LICENSE_TITLE,
+                    license_url=settings.LICENSE_URL
+                %}Content on this site is licensed under a <a href="{{license_url}}">{{license_title}}</a> license.{% endtrans %}
+
+            </div>
+            {% else %}
+            <div class="copyright">
+                {% if settings.LICENSE_USE_LOGO %}
+                <img 
+                    class="license-logo"
+                    src="{{settings.LICENSE_LOGO_URL|media }}"
+                    title="{{settings.LICENSE_ACRONYM}}"
+                    alt="{{settings.LICENSE_ACRONYM}}"
+                />
+                {% endif %}
+                {{settings.APP_COPYRIGHT}} {% trans license=settings.LICENSE_TITLE %}Content on this site is licensed under a {{license}}{% endtrans %}
+            </div>
+            {% endif %}
+        {% endif %}
+        <div class="footer-links" >
+            <a href="{% url about %}">{% trans %}about{% endtrans %}</a><span class="link-separator"> |</span>
+            <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a><span class="link-separator"> |</span>
+            <a href="{% url privacy %}">{% trans %}privacy policy{% endtrans %}</a><span class="link-separator"> |</span>
+            {% spaceless %}
+            <a href=
+                        {% if settings.FEEDBACK_SITE_URL %}
+                            "{{settings.FEEDBACK_SITE_URL}}"
+                            target="_blank">
+                        {% else %}
+                            "{% url feedback %}?next={{request.path}}">
+                        {% endif %}
+                        {% trans %}give feedback{% endtrans %}
+                    </a>
+                    {% endspaceless %}
+        </div>
+        <div class="powered-link">
+            <a href="http://askbot.org" target="_blank">
+                Powered by Askbot version {{settings.ASKBOT_VERSION}}
+            </a>
+        </div>
+        <div class="clean"></div>
+    </div>
+</div>
+<!-- end template footer.html -->
diff --git a/askbot/skins/default/templates/widgets/header.html b/askbot/skins/default/templates/widgets/header.html
new file mode 100644
index 00000000..ad0ae4a2
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/header.html
@@ -0,0 +1,17 @@
+<!-- template header.html -->
+{% import "macros.html" as macros %}
+<div id="header">
+    <div class="content-wrapper">
+        
+        <div id="userToolsNav">
+            {% include "widgets/user_navigation.html" %}
+            {{settings.CUSTOM_HEADER}}
+        </div>
+            {% include "widgets/logo.html" %}
+        <div id="metaNav">
+            {% include "widgets/meta_nav.html" %}
+        </div>
+        <div class="clean"></div>
+    </div>
+</div>
+<!-- end template header.html -->
diff --git a/askbot/skins/default/templates/widgets/search_bar.html b/askbot/skins/default/templates/widgets/search_bar.html
index 55917fbc..0d4c66a9 100644
--- a/askbot/skins/default/templates/widgets/search_bar.html
+++ b/askbot/skins/default/templates/widgets/search_bar.html
@@ -44,5 +44,5 @@
 </div>
 {% endspaceless %}
 {% else %}
-    {% include "blocks/ask_form.html" %}
+    {% include "widgets/ask_form.html" %}
 {% endif %}
diff --git a/askbot/skins/default/templates/widgets/secondary_header.html b/askbot/skins/default/templates/widgets/secondary_header.html
new file mode 100644
index 00000000..caf190bc
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/secondary_header.html
@@ -0,0 +1,12 @@
+<!-- template secondary_header.html -->
+<div id="secondaryHeader">
+    <div class="content-wrapper">
+        <a id="homeButton" href="{% url questions %}"></a>
+        <div id="scopeWrapper">
+            {% include "widgets/scope_nav.html" %}            
+            {% include "widgets/search_bar.html" %} {# include search form widget #}
+        </div>
+        {% include "widgets/ask_button.html" %}            
+        <div class="clean"></div>
+    </div>
+</div>
diff --git a/askbot/skins/default/templates/widgets/system_messages.html b/askbot/skins/default/templates/widgets/system_messages.html
new file mode 100644
index 00000000..6b803846
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/system_messages.html
@@ -0,0 +1,8 @@
+<div class="notify" style="display:none">
+    {% if user_messages %}
+        {% for message in user_messages %}
+              <p>{{ message }}</p>
+        {% endfor %}
+    {% endif %}
+    <a id="closeNotify" onclick="notify.close(true)"></a>
+</div>
-- 
cgit v1.2.3-1-g7c22