diff --git a/templates/base.html b/templates/base.html index 7d209c1d5..f2bfe2b96 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,70 +4,129 @@ - - {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} - - {% block head_content %} - - - - + + {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} + + {% block head_content %} + + + + + - {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} - + {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} + - - - {% endblock %} + + + {% endblock %} -
- ... header ... -
-
+
+ + {# Navigation #} + {% block navigation %} + + {% endblock navigation %} + + {# Header #} + {% block main_header %} +
+
+ +
+

{{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }}

+

{% trans 'Sistema de Apoio ao Processo Legislativo' %}

+
+
+
+ {% endblock main_header %} - + {# Main content #} {% block content_container %} - {# FIXME: row class is not for that: replace it keeping the layout (notice width) #} -
+
+
- {# Feedback messages #} - {% for message in messages %} -
- {{ message|safe }} - × -
- {% endfor %} + {# Feedback messages #} + {% for message in messages %} +
+ {{ message|safe }} + × +
+ {% endfor %} + + {# Content header #} + {% block base_header %} +
- {% block base_header %} + {% block help %} + {% if view.help_path %} + {% trans 'Ajuda' %} + {% endif %} + {% endblock %} -
- {% block help %} - {% if view.help_path %} - {% trans 'Ajuda' %} - {% endif %} - {% endblock %} - {% block title %}{% if view.title %}

{{ view.title }}

{% endif %}{% endblock %} -
- {% endblock base_header %} + {% block title %} + {% if view.title %} +

{{ view.title }}

+ {% endif %} + {% endblock %} + +
+ {% endblock base_header %} + + {# Content per se #} + {% block base_content %} + {% endblock base_content %} +
+
- {% block base_content %}{% endblock %} -
{% endblock content_container %} - -
- {% block foot_js %} - - - - {% endblock foot_js %} + {% block foot_js %} + + + + {% endblock foot_js %}