diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-17 17:01:06 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-17 17:01:06 -0300 |
| commit | 6d068cbd5a4feb6e398607e3003140dd7d287a42 (patch) | |
| tree | 5bd09e1565685f1b23a2d1267a545e3f8ff00087 | |
| parent | 0484811614b97a5309831f578e03028a171cd91e (diff) | |
| download | askbot-6d068cbd5a4feb6e398607e3003140dd7d287a42.tar.gz askbot-6d068cbd5a4feb6e398607e3003140dd7d287a42.tar.bz2 askbot-6d068cbd5a4feb6e398607e3003140dd7d287a42.zip | |
Block migration complete
16 files changed, 12 insertions, 18 deletions
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/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/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html index 1f63b468..1f63b468 100644 --- a/askbot/skins/default/templates/blocks/bottom_scripts.html +++ b/askbot/skins/default/templates/meta/bottom_scripts.html diff --git a/askbot/skins/default/templates/blocks/editor_data.html b/askbot/skins/default/templates/meta/editor_data.html index 79ed96fb..79ed96fb 100644 --- a/askbot/skins/default/templates/blocks/editor_data.html +++ b/askbot/skins/default/templates/meta/editor_data.html diff --git a/askbot/skins/default/templates/blocks/mandatory_tags_js.html b/askbot/skins/default/templates/meta/mandatory_tags_js.html index f04a6345..f04a6345 100644 --- a/askbot/skins/default/templates/blocks/mandatory_tags_js.html +++ b/askbot/skins/default/templates/meta/mandatory_tags_js.html 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/blocks/ask_form.html b/askbot/skins/default/templates/widgets/ask_form.html index 606aef78..606aef78 100644 --- a/askbot/skins/default/templates/blocks/ask_form.html +++ b/askbot/skins/default/templates/widgets/ask_form.html diff --git a/askbot/skins/default/templates/blocks/footer.html b/askbot/skins/default/templates/widgets/footer.html index 14f18786..14f18786 100644 --- a/askbot/skins/default/templates/blocks/footer.html +++ b/askbot/skins/default/templates/widgets/footer.html diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/widgets/header.html index ad0ae4a2..ad0ae4a2 100644 --- a/askbot/skins/default/templates/blocks/header.html +++ b/askbot/skins/default/templates/widgets/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/blocks/secondary_header.html b/askbot/skins/default/templates/widgets/secondary_header.html index caf190bc..caf190bc 100644 --- a/askbot/skins/default/templates/blocks/secondary_header.html +++ b/askbot/skins/default/templates/widgets/secondary_header.html diff --git a/askbot/skins/default/templates/blocks/system_messages.html b/askbot/skins/default/templates/widgets/system_messages.html index 6b803846..6b803846 100644 --- a/askbot/skins/default/templates/blocks/system_messages.html +++ b/askbot/skins/default/templates/widgets/system_messages.html |