From 1a437a5d5e10906b80e7f17bf01975a9cc603004 Mon Sep 17 00:00:00 2001
From: Carlos Oliveira <carlospecter@gmail.com>
Date: Tue, 7 Jul 2015 09:27:31 -0300
Subject: [PATCH] Alignment adjust

---
 colab/proxy/noosfero/diazo.xml                      |   1 -
 colab/proxy/noosfero/static/noosfero/css/screen.css |   4 ++++
 colab/static/css/header.css                         |  25 +++++++++++++++++++++++++
 colab/templates/footer.html                         |   2 +-
 colab/templates/header.html                         | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------
 5 files changed, 120 insertions(+), 96 deletions(-)

diff --git a/colab/proxy/noosfero/diazo.xml b/colab/proxy/noosfero/diazo.xml
index bd1d770..0a76b14 100644
--- a/colab/proxy/noosfero/diazo.xml
+++ b/colab/proxy/noosfero/diazo.xml
@@ -12,7 +12,6 @@
     <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
     <drop theme="/html/head/script" />
     <drop css:content="#barra-brasil" />
-    <drop css:content="#user" />
     <drop css:content="#theme-footer" />
     <drop css:content="#homepage-link" />
     <drop css:content=".header-content" />
diff --git a/colab/proxy/noosfero/static/noosfero/css/screen.css b/colab/proxy/noosfero/static/noosfero/css/screen.css
index 75d4560..2c6b1ba 100644
--- a/colab/proxy/noosfero/static/noosfero/css/screen.css
+++ b/colab/proxy/noosfero/static/noosfero/css/screen.css
@@ -61,3 +61,7 @@
 div#main-content {
 	margin-top: 100px;
 }
+
+.colab-style .container {
+  width: 1020px;
+}
diff --git a/colab/static/css/header.css b/colab/static/css/header.css
index b5dedc0..6d224ea 100644
--- a/colab/static/css/header.css
+++ b/colab/static/css/header.css
@@ -55,6 +55,31 @@
   border-bottom: 1px dotted #2c66ce;
 }
 
+#colab-portal-siteactions .dropdown-menu li {
+  display: block;
+}
+
+#colab-portal-siteactions .dropdown-menu a {
+  padding: 3px;
+}
+
+#colab-portal-siteactions .dropdown-menu a:hover {
+  background: none;
+}
+
+#colab-portal-siteactions .dropdown-menu a.btn-info,
+#colab-portal-siteactions .dropdown-menu a.btn-default {
+  text-transform: capitalize;
+}
+
+#colab-portal-siteactions .dropdown-menu a.btn-info:hover,
+#colab-portal-siteactions .dropdown-menu a.btn-default:hover {
+  background: #5e82c6;
+}
+
+#colab-siteaction-contraste a {
+  display: none;
+}
 /* User-bar */
 
 #user-menu a.btn {
diff --git a/colab/templates/footer.html b/colab/templates/footer.html
index 78c35a7..74f7992 100644
--- a/colab/templates/footer.html
+++ b/colab/templates/footer.html
@@ -49,7 +49,7 @@
       </dl>
       <dl class="col-md-2 colab-footer-links">
         <dt>Navegação</dt>
-          <dd><a href="/social/spb/acessibilidade">Acessibilidade</a></dd>
+          <dd><a href="https://www.secom.gov.br/acessibilidade">Acessibilidade</a></dd>
           <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd>
       </dl>
     </div>
diff --git a/colab/templates/header.html b/colab/templates/header.html
index ad446f2..423976c 100644
--- a/colab/templates/header.html
+++ b/colab/templates/header.html
@@ -11,71 +11,69 @@
 <!-- end of barra-brasil -->
   <div id="first-nav">
     <div class="container">
-      <div class="row">
-        <div class="col-md-12">
-          <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">
-            <li>
-              <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>
-            </li>
-            <li>
-              <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>
-            </li>
-            <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">Ir para a busca <span class="label label-primary">3</span></a>
-            </li>
-            <li>
-              <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
-            </li>
-          </ul> <!-- end of accesskeys -->
-          <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">
-            <li id="colab-siteaction-accessibility">
-              <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
-            </li>
-            <li id="colab-siteaction-contraste">
-              <a href="#"><span>Alto Contraste</span></a>
-            </li>
-            <li id="colab-siteaction-mapadosite">
-              <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
-            </li>
-            <!-- begin of user-menu -->
-            {% if not user.is_authenticated %}
-            <li class="dropdown hidden-xs hidden-lg">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-              {% trans 'Login' as login_text %}
-                <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
-                <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
-              </ul>
-            </li>
+      <div class="col-md-12">
+        <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">
+          <li>
+            <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>
+          </li>
+          <li>
+            <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>
+          </li>
+          <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">Ir para a busca <span class="label label-primary">3</span></a>
+          </li>
+          <li>
+            <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
+          </li>
+        </ul> <!-- end of accesskeys -->
+        <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">
+          <li id="colab-siteaction-accessibility">
+            <a href="https://www.secom.gov.br/acessibilidade"><span>Acessibilidade</span></a>
+          </li>
+          <li id="colab-siteaction-contraste">
+            <a href="#"><span>Alto Contraste</span></a>
+          </li>
+          <li id="colab-siteaction-mapadosite">
+            <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
+          </li>
+          <!-- begin of user-menu -->
+          {% if not user.is_authenticated %}
+          <li class="dropdown hidden-xs hidden-lg">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
+            <ul class="dropdown-menu">
             {% trans 'Login' as login_text %}
-            <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
-            <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
-            {% else %}
-            <li id="user-menu" class="dropdown">
-              <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
-              <ul class="dropdown-menu" role="menu">
-                <li>
-                  <div class="wrapper">
-                    <div class="thumbnail">{% gravatar user.email 100 %}</div>
-                      <div class="user-info">
-                        <span><b>{{ user.get_full_name }}</b></span>
-                        <span class="quiet">{{ user.email }}</span>
-                      </div>
-                      <div>
-                        <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
-                        {% trans 'Logout' as logout_text %}
-                        <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+              <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+              <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+            </ul>
+          </li>
+          {% trans 'Login' as login_text %}
+          <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+          <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+          {% else %}
+          <li id="user-menu" class="dropdown">
+            <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
+            <ul class="dropdown-menu" role="menu">
+              <li>
+                <div class="wrapper">
+                  <div class="thumbnail">{% gravatar user.email 100 %}</div>
+                    <div class="user-info">
+                      <span><b>{{ user.get_full_name }}</b></span>
+                      <span class="quiet">{{ user.email }}</span>
                     </div>
+                    <div>
+                      <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
+                      {% trans 'Logout' as logout_text %}
+                      <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
                   </div>
-                </li>
-              </ul>
-            </li> <!-- end of user-menu -->
-            {% endif %}
-          </ul>
-        </div>
-      </div> <!-- end of access-menu -->
-      <div class="row" id="spb-logo-search">
+                </div>
+              </li>
+            </ul>
+          </li> <!-- end of user-menu -->
+          {% endif %}
+        </ul>
+      </div>
+      <div id="spb-logo-search">
         <div class="col-md-6 logo-box">
-          <div id="logo">
+          <div id="logo" class="nav navbar-nav">
             <a href="/" id="portal-logo">
                   <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" />
             </a>
@@ -83,7 +81,7 @@
         </div>
         <div class="col-md-6">
           <div class="input-group box-search navbar-right">
-              <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form" role="search">
+            <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-right" role="search">
               <div class="form-group">
                 <label class="sr-only" for="header-searchbox">{% trans 'Search...' %}</label>
                 <input name="q" id="header-searchbox"
@@ -91,45 +89,43 @@
                       type="search" placeholder="{% trans 'Search...' %}" />
               </div>
               <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-              </form>
-            </div>
+            </form>
+          </div>
         </div>
       </div>
     </div>
   </div><!-- end of first-nav -->
   <div id="second-nav">
     <div class="container">
-      <div class="row">
-        <ul id="quick-links-sm" class="hidden-md hidden-lg">
-          <li id="link-faq">
-            <a href="/social/spb/ajuda">FAQ</a>
-          </li>
-          <li id="link-contact">
-            <a href="/social/spb/contato">Contato</a>
-          </li>
-        </ul>
-        <div class="navbar-header logo">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-        <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
-          <li>
-            <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
-          </li>
-          {% proxy_menu %}
-        </ul>
-        <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
-          <li id="link-faq">
-            <a href="/social/spb/ajuda">Perguntas Frequentes</a>
-          </li>
-          <li id="link-contact">
-            <a href="/social/spb/contato">Contato</a>
-          </li>
-        </ul>
+      <ul id="quick-links-sm" class="hidden-md hidden-lg">
+        <li id="link-faq">
+          <a href="/social/spb/ajuda">FAQ</a>
+        </li>
+        <li id="link-contact">
+          <a href="/social/spb/contato">Contato</a>
+        </li>
+      </ul>
+      <div class="navbar-header logo">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
       </div>
+      <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
+        <li>
+          <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
+        </li>
+        {% proxy_menu %}
+      </ul>
+      <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
+        <li id="link-faq">
+          <a href="/social/spb/ajuda">Perguntas Frequentes</a>
+        </li>
+        <li id="link-contact">
+          <a href="/social/spb/contato">Contato</a>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
--
libgit2 0.21.2