diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-17 16:28:06 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-17 16:28:06 -0300 |
| commit | 0484811614b97a5309831f578e03028a171cd91e (patch) | |
| tree | 482e182a653d3cdd293f23535f8aec34040217e6 | |
| parent | ef03f89ebd8d3428d4032d227e22f6aff8bf8cae (diff) | |
| download | askbot-0484811614b97a5309831f578e03028a171cd91e.tar.gz askbot-0484811614b97a5309831f578e03028a171cd91e.tar.bz2 askbot-0484811614b97a5309831f578e03028a171cd91e.zip | |
rename html_head to meta, moved some blocks into widgets
10 files changed, 6 insertions, 20 deletions
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html index e8cbc7ae..0ab5f641 100644 --- a/askbot/skins/default/templates/answer_edit.html +++ b/askbot/skins/default/templates/answer_edit.html @@ -29,7 +29,7 @@ {% endblock %} {% block sidebar %} - {% include "blocks/answer_edit_tips.html" %} + {% include "widgets/answer_edit_tips.html" %} {% endblock %} {% block endjs %} diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html index 9aaa7e8c..6eb02b64 100644 --- a/askbot/skins/default/templates/ask.html +++ b/askbot/skins/default/templates/ask.html @@ -7,7 +7,7 @@ {% endblock %} {# main contents of ask form is in the template input_bar #} {% block sidebar %} -{% include "blocks/question_edit_tips.html" %} +{% include "widgets/question_edit_tips.html" %} {% endblock %} {% block endjs %} <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script> diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 3336e77f..54b63420 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -4,11 +4,11 @@ {% spaceless %} <head> <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title> - {% include "html_head/meta.html" %} + {% include "meta/html_head_meta.html" %} <link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" /> - {% include "html_head/stylesheets.html" %} + {% include "meta/html_head_stylesheets.html" %} {% block forestyle %}{% endblock %} - {% include "html_head/javascript.html" %} + {% include "meta/html_head_javascript.html" %} {% if settings.USE_CUSTOM_HTML_HEAD %} {{ settings.CUSTOM_HTML_HEAD }} {% endif %} diff --git a/askbot/skins/default/templates/blocks/forum_body.html b/askbot/skins/default/templates/blocks/forum_body.html deleted file mode 100644 index c36b48cd..00000000 --- a/askbot/skins/default/templates/blocks/forum_body.html +++ /dev/null @@ -1,14 +0,0 @@ -<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)">×</a> -</div> -{% include "header.html" %} -{% block body %} -{% endblock %} -{% if settings.SHOW_FOOTER %} - {% include "footer.html" %} -{% endif %} diff --git a/askbot/skins/default/templates/html_head/javascript.html b/askbot/skins/default/templates/meta/html_head_javascript.html index f960d11d..f960d11d 100644 --- a/askbot/skins/default/templates/html_head/javascript.html +++ b/askbot/skins/default/templates/meta/html_head_javascript.html diff --git a/askbot/skins/default/templates/html_head/meta.html b/askbot/skins/default/templates/meta/html_head_meta.html index 352ffb53..352ffb53 100644 --- a/askbot/skins/default/templates/html_head/meta.html +++ b/askbot/skins/default/templates/meta/html_head_meta.html diff --git a/askbot/skins/default/templates/html_head/stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html index 9d5aebad..9d5aebad 100644 --- a/askbot/skins/default/templates/html_head/stylesheets.html +++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html index feee2521..e039e33a 100644 --- a/askbot/skins/default/templates/question_edit.html +++ b/askbot/skins/default/templates/question_edit.html @@ -39,7 +39,7 @@ {% endblock %} {% block sidebar %} -{% include "blocks/question_edit_tips.html" %} +{% include "widgets/question_edit_tips.html" %} {% endblock %} {% block endjs %} diff --git a/askbot/skins/default/templates/blocks/answer_edit_tips.html b/askbot/skins/default/templates/widgets/answer_edit_tips.html index 23e4df53..23e4df53 100644 --- a/askbot/skins/default/templates/blocks/answer_edit_tips.html +++ b/askbot/skins/default/templates/widgets/answer_edit_tips.html diff --git a/askbot/skins/default/templates/blocks/question_edit_tips.html b/askbot/skins/default/templates/widgets/question_edit_tips.html index 83c36840..83c36840 100644 --- a/askbot/skins/default/templates/blocks/question_edit_tips.html +++ b/askbot/skins/default/templates/widgets/question_edit_tips.html |