From 1ee405a7f24aa8c6b5f4ef24dfc68beadc8cc42b Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 24 Sep 2015 21:58:00 -0300
Subject: [PATCH] New footer

---
 colab/static/css/footer.css | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
 colab/templates/footer.html | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
 2 files changed, 196 insertions(+), 106 deletions(-)

diff --git a/colab/static/css/footer.css b/colab/static/css/footer.css
index bd70ed3..7a5be8d 100644
--- a/colab/static/css/footer.css
+++ b/colab/static/css/footer.css
@@ -1,97 +1,140 @@
 /*Footer*/
 
 footer {
-  background: none;
+    font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
 }
 
-.colab-footer-content{
-  background: rgb(213,213,213);
-  font-family: 'Open Sans Regular', Arial, Helvetica, sans-serif;
+footer #btn-top {
+    min-width: 960px;
+    max-width: 960px;
+    padding-right: 0px;
+    margin-bottom: 22px;
+    text-decoration: none;
+    font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    position: relative;
 }
 
-.colab-footer-links a{
-  color:#2c66ce;
-  font-size: 13px;
-  line-height: 1.7em;
+footer #btn-top a {
+    padding-left: 20px;
+    background: url("../img/voltar-topo.png") no-repeat left center;
+    color: #777;
+    font-size: 14px;
 }
 
-.colab-footer-links a:hover{
-  background: none;
-  text-decoration: underline;
+footer #footer {
+    padding: 4px 0 20px 0;
+    min-height: 50px;
+    width: 100%;
+    background: #EAEDF0;
+    color: #fff;
+    font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
+    min-width: 960px;
 }
 
-.colab-footer-links{
-  color:#2c66ce;
-  border-left:1px dotted #2c66ce;
-  margin-top: 50px;
-  margin-bottom: 50px;
+
+footer #footer > div {
+    margin: 2em auto;
+    padding-top: 1em;
+    max-width: 960px;
 }
 
-.colab-footer-links dt{
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 1.3em;
-  margin-bottom: 8px;
-  font-family: 'Open Sans Regular', Arial, Helvetica, sans-serif;
+footer #doormat-container {
+    float: none;
+    width: 100%;
 }
 
-.colab-footer-links dd{
-  padding-bottom: 3px
+footer #doormat-container dl {
+    border-left: 1px dotted #9CB5E2;
+    margin: 0 0 18px 0;
+    font-size: 13px;
 }
 
-.footer-gov{
-  background: #0042b2;
+footer #doormat-container dt {
+    color: #2C65CD;
+    font-size: 18px;
+    font-family: "open_sansbold", Arial, Helvetica, sans-serif;
 }
 
-.footer-gov > .container{
-  padding: 2em 0;
+footer #doormat-container dt,
+footer #doormat-container dd {
+    padding-left: 10px;
+    margin-bottom: 4px;
 }
 
-.footer-gov .institucionais a{
-  display:table-cell;
-  vertical-align: middle;
-  float: right;
+footer #doormat-container dd a {
+    color: #2C65CD;
 }
 
-.footer-gov a:hover{
-  text-decoration: none;
+footer #doormat-container dd a:hover {
+    text-decoration: none;
+}
+
+footer #doormat-container.columns-4 .doormatColumn {
+    width: 21%;
 }
 
-.footer-gov span{
-  display: none;
+footer #doormat-container .doormatColumn {
+    float: left;
+    margin: 0 1.1em 0 0.8em;
+    text-align: left;
 }
 
-.footer-gov .colab-logo-sgpr img, .logo-acesso img{
-  padding-top: 10px;
-  padding-right: 15%;
-  padding-bottom: 10px;
+#footer .footer-logos {
+    margin: 0 0 -20px;
+    padding: 1.6em 0;
+    max-width: 100%;
+    background: #0041B1;
 }
 
-.colab-logo-sgpr img, .spb-definitions {
-    display: none;
+#footer .footer-logos div {
+    width: 960px;
+    margin: auto;
+    overflow: auto;
 }
 
-.footer-gov .logo-brasil img{
-  padding-right: 0;
+#footer .footer-logos div .logo-acesso-footer {
+    background-image: url("../img/acesso-a-informacao.png");
+    float: left;
+    width: 107px;
+    height: 49px;
 }
 
-.go-top{
-  font-size: 13px;
-  height: 2em;
+
+#footer .footer-logos div .logo-brasil-footer {
+    background-image: url("../img/brasil.png");
+    float: right;
+    width: 153px;
+    height: 48px;
+ }
+
+footer #extra-footer p {
+    margin: 1em auto;
+    max-width: 960px;
+    font-size: 12px;
+    line-height: 1.8em;
 }
 
-.go-top a{
+footer #extra-footer a {
+    color: #2C65CD;
+}
+
+footer #footer .clear {
+    clear: both;
+}
+
+
+footer .go-top a{
   color: #717782;
   line-height: 2em;
 }
 
-.go-top i {
+footer .go-top i {
   margin-right: 5px;
   text-decoration: none;
-  font-size: 12px; 
+  font-size: 12px;
 }
 
-.spb-definitions{
-  font-size: 10px;
-  padding: 10px 0;
+html footer div#wrap-footer-brasil {
+    padding: 0;
 }
diff --git a/colab/templates/footer.html b/colab/templates/footer.html
index 78c35a7..506ee70 100644
--- a/colab/templates/footer.html
+++ b/colab/templates/footer.html
@@ -2,68 +2,115 @@
 {% load static from staticfiles %}
 
 <footer>
-  <div class="container">
+  <div id="btn-top" class="container">
     <div class="pull-right go-top">
-      <a id="link-top" href="#link-rodape"><i class="fa fa-chevron-up"></i>Voltar ao topo</a>
+      <a id="link-top" href="#link-rodape">Voltar para o topo</a>
     </div>
   </div>
-  <div class="container-fluid colab-footer-content">
-    <div class="container">
-      <dl class="col-md-2 col-md-offset-1 colab-footer-links">
-        <dt>Assuntos</dt>
-        <dd><a href="/social/spb/publique-seu-software" title="Publique seu software">Publique seu software</a></dd>
-        <dd><a href="http://www.softwarepublico.gov.br/mpv/" title="Prestadores de serviço">Prestadores de serviço</a></dd>
-        <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="Espaço dos municípios">Espaço dos municípios</a></dd>
-      </dl>
-      <dl class="col-md-2 colab-footer-links">
-        <dt>Software Público</dt>
-          <dd class="colab-portalspb-item">
-            <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a>
+  <div id="footer" role="contentinfo">
+    <a name="afooter" id="afooter"></a>
+    <div id="doormat-container" class="columns-4">
+      <div class="doormatColumn column-0">
+        <dl class="doormatSection">
+          <dt class="doormatSectionHeader">Assuntos</dt>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/publique-seu-software" class="external-link">Publique seu software</a>
           </dd>
-          <dd class="colab-portalspb-item">
-            <a title="Eventos" href="/social/profile/spb/events">Eventos</a>
+          <dd class="doormatSectionBody">
+            <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
           </dd>
-          <dd class="colab-portalspb-item">
-            <a title="Prêmios" href="/social/spb/premios">Prêmios</a>
+          <dd class="doormatSectionBody">
+            <a href="http://antigo.softwarepublico.gov.br/4cmbr/xowiki/Principal" class="external-link">Espaços dos municípios</a>
           </dd>
-          <dd class="colab-portalspb-item">
-            <a title="Publicações" href="/social/spb/publicacoes">Publicações</a>
+        </dl>
+      </div>
+      <div class="doormatColumn column-1">
+        <dl class="doormatSection">
+          <dt class="doormatSectionHeader">Software Público</dt>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/entenda-o-que-e" class="external-link">Entenda o que é</a>
           </dd>
-      </dl>
-      <dl class="col-md-2 colab-footer-links">
-        <dt>Serviços</dt>
-        <dd>
-          <a href="/social/spb/ajuda#faq" title="FAQ">FAQ</a>
-        </dd>
-        <dd>
-          <a href="/social/spb/contato" title="Contato">Contato</a>
-        </dd>
-        <dd>
-          <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" title="Relatar erros">Relatar erros</a>
-        </dd>
-      </dl>
-      <dl class="col-md-2 colab-footer-links">
-        <dt>RSS</dt>
-          <dd><a href="/social/spb/rss/o-que-e" title="O que é?">O que é</a></dd>
-          <dd><a href="/rss/colab/latest" title="Assine">Assine</a></dd>
-      </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="/social/spb/mapa-do-site">Mapa do site</a></dd>
-      </dl>
-    </div>
-
-  <div class="footer-gov">
-    <div class="container">
-      <div class="col-md-7">
-          <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="{% static 'img/acesso-a-informacao.png' %}" ><span>Acesso a Informação</span></a>
+          <dd class="doormatSectionBody">
+            <a href="/social/profile/spb/events" class="external-link">Eventos</a>
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/premios" class="external-link">Prêmios</a>
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/publicacoes" class="external-link">Publicações</a>
+          </dd>
+        </dl>
       </div>
-      <div class="col-md-5 institucionais">
-        <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>Brasil - Governo Federal</span></a>
-        <a class="colab-logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>Secretaria-geral da Presidência da República</span></a>
+      <div class="doormatColumn column-2">
+        <dl class="doormatSection">
+          <dt class="doormatSectionHeader">Serviços</dt>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/ajuda#faq" class="external-link">FAQ</a>
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/contato" class="external-link">Contato</a>
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
+          </dd>
+        </dl>
+      </div>
+      <div class="doormatColumn column-3">
+        <dl class="doormatSection">
+          <dt class="doormatSectionHeader">RSS</dt>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/rss/o-que-e" class="external-link">O que é?</a>    
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/rss/colab/latest" class="external-link">Assine</a>
+          </dd>
+        </dl>
+        <dl class="doormatSection">
+          <dt class="doormatSectionHeader">Navegação</dt>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/acessibilidade" class="external-link">Acessibilidade</a>  
+          </dd>
+          <dd class="doormatSectionBody">
+            <a href="/social/spb/mapa-do-site" class="external-link">Mapa do site</a>
+          </dd>
+        </dl>
       </div>
     </div>
-  </div><!-- end footer-gov -->
+    <div class="clear"></div>
+    <!-- <div id="footer-brasil" class="footer-logos">
+      <div>
+        <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso">
+          <img src="{% static 'img/acesso-a-informacao.png' %}" alt="Acesso a Informação"></a>
+        <a href="http://www.brasil.gov.br/" class="logo-brasil">
+          <img src="{% static 'img/brasil.png' %}" alt="Brasil - Governo Federal"></a>
+      </div>
+    </div> -->
+ <div class="footer-logos">
+
+
+      <div>
+
+          <a href="http://www.acessoainformacao.gov.br/">
+              <span class="logo-acesso-footer"></span>
+          </a>
+
+
+          <a href="http://www.brasil.gov.br/">
+              <span class="logo-brasil-footer"></span>
+          </a>
+
+
+      </div>
+
+  </div>
+  </div>
+  <div id="extra-footer">
+    <p>
+      Desenvolvido com os projetos de software livre
+      <a href="http://github.com/colab/colab">Colab</a>,
+      <a href="http://gitlab.com">Gitlab</a>,
+      <a href="http://www.gnu.org/software/mailman/">Mailman</a> e
+      <a href="http://noosfero.org">Noosfero</a>
+    </p>
   </div>
 </footer>
--
libgit2 0.21.2