From ceda7f180e68605be2cba2a2a71beabc9ffbd0a2 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Wed, 1 Oct 2014 21:28:20 -0300
Subject: [PATCH] Marcado bloco "menu-principal" no template base

O nome "nav-global" eh usado pelo django-admin-bootstrapped
em outro bloco. Por isso renomeamos para "menu-principal",
preservando o bloco "nav-global" do django-admin-bootstrapped.
---
 .../templates/servicos/casa_manifesta.html    |  5 +-
 sigiStatic/css/base_site.css                  | 97 -------------------
 templates/503.html                            |  4 +-
 templates/admin/base.html                     |  4 +
 templates/admin/carrinho.html                 |  4 +-
 templates/admin/login.html                    |  4 +-
 6 files changed, 11 insertions(+), 107 deletions(-)

diff --git a/sigi/apps/servicos/templates/servicos/casa_manifesta.html b/sigi/apps/servicos/templates/servicos/casa_manifesta.html
index e720a55..6b5942f 100644
--- a/sigi/apps/servicos/templates/servicos/casa_manifesta.html
+++ b/sigi/apps/servicos/templates/servicos/casa_manifesta.html
@@ -15,10 +15,7 @@
 {% block coltype %}colMS{% endblock %}
 {% block bodyclass %}casa-manifesta change-form{% endblock %}
 
-{% block nav-global %}
-<div id="nav-global">
-</div>
-{% endblock %}
+{% block menu-principal %}{% endblock %}
 
 {% block breadcrumbs %}
 <div class="breadcrumbs">
diff --git a/sigiStatic/css/base_site.css b/sigiStatic/css/base_site.css
index f397dfb..2d9afeb 100644
--- a/sigiStatic/css/base_site.css
+++ b/sigiStatic/css/base_site.css
@@ -15,103 +15,6 @@ a:hover {
 	text-decoration: none;
 }
 
-#nav-global {
-	border: none;
-	border: 0px;
-	margin: 0px;
-	padding: 0px;
-	font-size: 14px;
-	font-weight: bold;
-	clear: both;
-}
-
-#nav-global ul { /*background:#222;*/
-	background: #efefef url("../../static/admin/img/nav-bg.gif");
-	/*#9C9C9C;*/
-	height: 25px;
-	margin: 0;
-	padding: 0;
-}
-
-#nav-global li {
-	float: left;
-	list-style: none;
-	padding: 0px;
-}
-
-#nav-global li a {
-	/*background: url("../img/menu/seperator.gif") bottom right no-repeat;*/
-	color: #cccccc;
-	display: block;
-	font-weight: normal;
-	line-height: 25px;
-	margin: 0px;
-	padding: 0px 15px;
-	text-align: center;
-	text-decoration: none;
-	/*font-size: medium;*/
-}
-
-#nav-global li a:link,#nav-global li a:visited {
-	color: black;
-}
-
-#nav-global li a:hover,#nav-global ul li:hover a {
-	background-color: #333;
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-#nav-global li ul {
-	background: #333;
-	display: none;
-	height: auto;
-	padding: 0px;
-	margin: 0px;
-	border: 0px;
-	position: absolute;
-	width: 200px;
-	z-index: 200;
-	/*top:1em;*/ /*left:0;*/
-}
-
-#nav-global li:hover ul {
-	display: block;
-}
-
-#nav-global li li {
-	background: url('../img/menu/sub_sep.gif') bottom left no-repeat;
-	display: block;
-	float: none;
-	margin: 0px;
-	padding: 0px;
-	width: 200px;
-}
-
-#nav-global li:hover li a {
-	background: none;
-}
-
-#nav-global li ul a {
-	display: block;
-	height: 25px;
-	font-style: normal;
-	margin: 0px;
-	padding: 0px 10px 0px 15px;
-	text-align: left;
-}
-
-#nav-global li ul a:hover,#nav-global li ul li:hover a {
-	background-color: #393939;
-	border: 0px;
-	color: #ffffff;
-	text-decoration: none;
-}
-
-#nav-global p {
-	clear: left;
-}
-
 div.breadcrumbs {
 	display: none;
 }
diff --git a/templates/503.html b/templates/503.html
index ed5fbe0..57dee54 100644
--- a/templates/503.html
+++ b/templates/503.html
@@ -3,14 +3,14 @@
 {% block title %}Serviço em manutenção (503) | SIGI{% endblock %}
 
 {% block branding %}{% endblock %}
-{% block nav-global %}{% endblock %}
+{% block menu-principal %}{% endblock %}
 {% block breadcrumbs %}{% endblock %}
 
 {% block content %}
 <h1>SIGI em manutenção</h1>
 
 <p>Esta página está atualmente em manutenção! Por favor, tente
-  novamente mais tarde.</p> 
+  novamente mais tarde.</p>
 
 <p>Obrigado pela paciência,<br />
   Serviço de Pesquisa e Desenvolvimento Tecnológico (SPDT)</p>
diff --git a/templates/admin/base.html b/templates/admin/base.html
index 778e62d..f627d1d 100644
--- a/templates/admin/base.html
+++ b/templates/admin/base.html
@@ -120,6 +120,8 @@
         </div>
     </div>
     <!-- END Header -->
+
+    {% block menu-principal %}
     <div role="navigation" class="navbar navbar-default">
       <div class="container-fluid">
         <div class="navbar-header">
@@ -135,6 +137,8 @@
         </div><!--/.nav-collapse -->
       </div><!--/.container-fluid -->
     </div>
+    {% endblock %}
+
     {% endif %}
 
     <!-- Content -->
diff --git a/templates/admin/carrinho.html b/templates/admin/carrinho.html
index bf564f0..2fb7cf0 100644
--- a/templates/admin/carrinho.html
+++ b/templates/admin/carrinho.html
@@ -35,8 +35,8 @@
 {% endblock %}
 
 
-{% block branding %} {% endblock %}
-{% block nav-global %}  {% endblock %}
+{% block branding %}{% endblock %}
+{% block menu-principal %}{% endblock %}
 {% block breadcrumbs %}{% endblock %}
 
 {% block title %}Carrinho | SIGI{% endblock %}
diff --git a/templates/admin/login.html b/templates/admin/login.html
index 111f485..638d261 100644
--- a/templates/admin/login.html
+++ b/templates/admin/login.html
@@ -5,7 +5,7 @@
 
 {% block bodyclass %}login{% endblock %}
 
-{% block nav-global %}{% endblock %}
+{% block menu-principal %}{% endblock %}
 
 {% block content_title %}{% endblock %}
 
@@ -61,4 +61,4 @@ document.getElementById('id_username').focus()
 </div>
 {% endblock %}
 
-{% block footer %}{% endblock %}
\ No newline at end of file
+{% block footer %}{% endblock %}