From a9f3f44c5ffc355df7831eed29b08e0dd2b398fc Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 6 Jan 2013 09:41:00 +0100 Subject: refactored head away from templates Conflicts: templates/generic_page.html templates/index.html templates/page.html --- templates/page.html | 59 +++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 34 deletions(-) (limited to 'templates/page.html') diff --git a/templates/page.html b/templates/page.html index 2f3de358..a7c6a300 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,34 +1,25 @@ - - - - - - {% if config.url_favicon %}{% endif %} - {{ title }} - - {% if config.default_stylesheet.1 != '' %}{% endif %} - {% if not nojavascript %} - - {% if not config.additional_javascript_compile %} - {% for javascript in config.additional_javascript %}{% endfor %} - {% endif %} - {% endif %} - - - {% if pm %}

You have an unread PM{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.

{% endif %} -

- {% if subtitle %} - {{ subtitle }} - {% endif %} - {% if mod and not hide_dashboard_link %}

{% trans %}Return to dashboard{% endtrans %}

{% endif %} -

- {{ body }} -

- - - + + + + + {% include 'header.html' %} + {{ title }} + + + {% if pm %}

You have an unread PM{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.

{% endif %} +

+ {% if subtitle %} + {{ subtitle }} + {% endif %} + {% if mod and not hide_dashboard_link %}

{% trans %}Return to dashboard{% endtrans %}

{% endif %} +

+ {{ body }} +

+ + + -- cgit v1.3