From fe61a8e17699ba83ad613a7f397fd0095b83fbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= Date: Wed, 8 May 2013 19:11:54 -0300 Subject: [PATCH] =?UTF-8?q?Adicionados=20barra=20e=20rodap=C3=A9=20padr?= =?UTF-8?q?=C3=B5es=20aos=20templates=20do=20SIGI.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media/css/base_site.css | 58 +++++++++++++-- sigi/templates/admin/base.html | 82 +++++++++++++++++++++ sigi/templates/admin/base_site.html | 46 +++++++++--- sigi/templates/login.html | 2 + sigi/templates/registration/logged_out.html | 14 ++++ 5 files changed, 188 insertions(+), 14 deletions(-) create mode 100644 sigi/templates/admin/base.html create mode 100644 sigi/templates/registration/logged_out.html diff --git a/media/css/base_site.css b/media/css/base_site.css index 15af1eb..35315ac 100644 --- a/media/css/base_site.css +++ b/media/css/base_site.css @@ -144,12 +144,52 @@ img.chart { width: 31%; } +div.partners > ul > li { + display: inline; +} + +div.utils li { + display: inline; +} + /* FOOTER */ -#footer { - color: #555; - font-size: 0.9em; - text-align: center; - margin-top: 40px; +div#footer { + background-color: #25528C; + display: table; + margin: 4em 0 0; + padding: 0.5em 0; + vertical-align: middle; + width: 100%; +} + +div#footer div.footernote { + width: 45%; + padding: 0.4em 1em; + text-align: left; + float: left; +} + +div#footer div.footerlogos { + width: 50%; + padding: 0.4em 1em; + text-align: center; + margin-left: 50%; + border-left: 1px solid white; +} + +div#footer div.footerlogos li { + display: inline; + margin-right: 2em; +} + +div#footer p { + font-size: 0.7em; + font-weight: normal; + color: white; +} + +div#footer a { + color: white; } /* JQuery */ @@ -200,3 +240,11 @@ img.chart { display: inline-block; float: right; } + +#branding h1 { + float: left; +} + +#user-tools { + position: inherit; +} \ No newline at end of file diff --git a/sigi/templates/admin/base.html b/sigi/templates/admin/base.html new file mode 100644 index 0000000..124262d --- /dev/null +++ b/sigi/templates/admin/base.html @@ -0,0 +1,82 @@ + + + +{% block title %}{% endblock %} + +{% block extrastyle %}{% endblock %} + +{% if LANGUAGE_BIDI %}{% endif %} + +{% block extrahead %}{% endblock %} +{% block blockbots %}{% endblock %} + +{% load i18n %} + + + + +
+ {% block container-top %}{% endblock %} + {% if not is_popup %} + + + + {% block breadcrumbs %}{% endblock %} + {% endif %} + + {% if messages %} + + {% endif %} + + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ + + {% block footer %}{% endblock %} +
+ + + + \ No newline at end of file diff --git a/sigi/templates/admin/base_site.html b/sigi/templates/admin/base_site.html index cfc4c18..1bbd361 100644 --- a/sigi/templates/admin/base_site.html +++ b/sigi/templates/admin/base_site.html @@ -4,8 +4,8 @@ {% block title %}{{ title }} | SIGI{% endblock %} {% block extrastyle %} - + + {% endblock %} {% block extrahead %} @@ -13,10 +13,27 @@ Direitos Reservados." /> {% endblock %} +{% block container-top %} + +{% endblock %} + {% block branding %} -

- Sistema de Informações Gerenciais do Interlegis -

+

+ Sistema de Informações Gerenciais do Interlegis +

{% endblock %} {% block userlinks %} @@ -32,12 +49,23 @@ {% block footer %} {% if not is_popup %} -