Updated links and footer content

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Lucas Kanshiro <kanashiro.duarte@gmail.com> Signed-off-by: Melissa Wen <melissa.srw@gmail.com>

Updated links and footer content
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Lucas Kanshiro <kanashiro.duarte@gmail.com> Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Carlos Coêlho
1 parent 92329966
Showing 3 changed files with 60 additions and 57 deletions Show diff stats
static/css/header.css
templates/footer.html
templates/header.html
@@ -170,7 +170,7 @@
 }
 #quick-links{
-  padding-right: 30px
+  padding-right: 10px
 }
 #quick-links > li > a{
-{% load i18n browserid conversejs gravatar %}
+{% load i18n %}
 {% load static from staticfiles %}
 <footer>
 <div class="row">
   <div class="container">
     <div class="pull-right go-top">
-      <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>{% trans "Back to top" %}</a>
+      <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>Voltar ao topo</a>
     </div>
   </div><!-- end go-top -->
-  <div class="col-lg-12 footer-content">
+  <div class="col-lg-12 offset footer-content">
     <div class="container">
       <div class="row">
-        <dl class="col-md-3 footer-links">
-          <dt>{% trans "Topics" %}</dt>
-          <dd><a href="/social/spb/o-que-e-o-software-publico" title="SPB">{% trans "SPB" %}</a></dd>
-          <dd><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">{% trans "SISP-SPB" %}</a></dd>
-          <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">{% trans "AvaliaSPB" %}</a></dd>
-          <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">{% trans "4CMBr" %}</a></dd>
-          <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/xowiki/" title="5cQualiBr" href="#">{% trans "5cQualiBr" %}</a></dd>
+        <dl class="col-md-2 col-md-offset-1 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-3 footer-links">
-          <dt>{% trans "Services" %}</dt>
-            <dd class="portalservicos-item">
-                <a title="Perguntas frequentes" href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
+        <dl class="col-md-2 footer-links">
+          <dt>Software Público</dt>
+            <dd class="portalspb-item">
+              <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a>
             </dd>
-            <dd class="portalservicos-item">
-                <a title="Contato" href="/social/spb/contato">{% trans "Contact" %}</a>
+            <dd class="portalspb-item">
+              <a title="Eventos" href="/social/profile/spb/events">Eventos</a>
             </dd>
+            <dd class="portalspb-item">
+              <a title="Prêmios" href="/social/spb/premios">Prêmios</a>
+            </dd>
+            <dd class="portalspb-item">
+              <a title="Publicações" href="/social/spb/publicacoes">Publicações</a>
+            </dd>
+        </dl>
+        <dl class="col-md-2 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-3 footer-links">
+        <dl class="col-md-2 footer-links">
           <dt>RSS</dt>
-            <dd><a href="#" title="O que é?">{% trans "What is it?" %}</a></dd>
-            <dd><a href="#" title="Assine">{% trans "Subscribe" %}</a></dd>
+            <dd><a href="#" title="O que é?">O que é</a></dd>
+            <dd><a href="#" title="Assine">Assine</a></dd>
         </dl>
-        <dl class="col-md-3 footer-links">
-          <dt>{% trans "Navigation" %}</dt>
-            <dd><a href="#">{% trans "Accessibility" %}</a></dd>
-            <dd><a href="/social/spb/mapa-do-site">{% trans "Site map" %}</a></dd>
-            <dd><a href="#">Versão em Português</a></dd>
+        <dl class="col-md-2 footer-links">
+          <dt>Navegação</dt>
+            <dd><a href="#">Acessibilidade</a></dd>
+            <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd>
         </dl>
       </div>
     </div>
@@ -45,18 +60,18 @@
   <div class="row 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>{% trans "Information access" %}</span></a>
+          <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>
       </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>{% trans "Brazil - Federal Government" %}</span></a>
-        <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>{% trans "Republic Presidency General Secretary" %}</span></a>
+        <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="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>
     </div>
   </div><!-- end footer-gov -->
   <div class="row spb-definitions">
     <div class="container">
-      <div id="about-pspb">{% trans "This is a BETA version and it's hosted at University of Brasilia" %}</div>
-      <div id="about-noosfero">{% trans "This site makes use of the social network platform" %} <a href="http://noosfero.org/">Noosfero</a>, {% trans "licensed under" %} <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> {% trans "version 3 or above" %}.
+      <div id="about-pspb">Essa versão é BETA e está hospedada na Universidade de Brasília</div>
+      <div id="about-noosfero">Este site utiliza a plataforma para redes sociais <a href="http://noosfero.org/">Noosfero</a>, licenciado sob a <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> versão 3 ou superior.
       </div>
     </div>
   </div><!-- end spb-definitions -->
-{% load i18n browserid conversejs gravatar plugins %}
+{% load i18n gravatar plugins %}
 {% load static from staticfiles %}
 <header>
 <div class="navbar navbar-static-top">
 <!-- begin of barra-brasil -->
 <div id="barra-brasil">
-  <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">{% trans "Brazilian Government Portal" %}</a>
+  <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a>
 </div>
 <script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
 <!-- end of barra-brasil -->
@@ -15,48 +15,40 @@
         <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">{% trans "Go to content" %} <span class="label label-primary">1</span></a>
+              <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">{% trans "Go to menu" %} <span class="label label-primary">2</span></a>
+              <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">{% trans "Go to search" %} <span class="label label-primary">3</span></a>
+            <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">{% trans "Go to bottom" %} <span class="label label-primary">4</span></a>
+              <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="portal-siteactions" class="nav navbar-nav navbar-right">
             <li id="siteaction-accessibility">
-              <a href="/software-publico-brasileiro/acessibilidade"><span>{% trans "Accessibility" %}</span></a>
+              <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
             </li>
             <li id="siteaction-contraste">
-              <a href="#"><span>{% trans "High contrast" %}</span></a>
+              <a href="#"><span>Alto Contraste</span></a>
             </li>
             <li id="siteaction-mapadosite">
-              <a href="/social/spb/mapa-do-site"><span>{% trans "Site map" %}</span></a>
+              <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">{% trans "Access" %} <b class="caret"></b></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
               <ul class="dropdown-menu">
               {% trans 'Login' as login_text %}
-              {% if BROWSERID_ENABLED %}
-                <li>{% browserid_login text=login_text %}</li>
-              {% else %}
                 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
                 <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
-              {% endif %}
               </ul>
             </li>
             {% trans 'Login' as login_text %}
-            {% if BROWSERID_ENABLED %}
-            <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
-            {% else %}
             <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>
-            {% endif %}
             {% 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>
@@ -71,10 +63,7 @@
                       <div>
                         <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
                         {% trans 'Logout' as logout_text %}
-                        {% if BROWSERID_ENABLED %}
-                         {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
-                        {% else %}
-                        <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>                         {% endif %}
+                        <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
                     </div>
                   </div>
                 </li>
@@ -113,10 +102,10 @@
       <div class="row">
         <ul id="quick-links-sm" class="hidden-md hidden-lg">
           <li id="link-faq">
-            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
+            <a href="/social/spb/ajuda">FAQ</a>
           </li>
           <li id="link-contact">
-            <a href="/social/spb/contato">{% trans "Contact" %}</a>
+            <a href="/social/spb/contato">Contato</a>
           </li>
         </ul>
         <div class="navbar-header logo">
@@ -134,10 +123,10 @@
         </ul>
         <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
           <li id="link-faq">
-            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
+            <a href="/social/spb/ajuda">Perguntas Frequentes</a>
           </li>
           <li id="link-contact">
-            <a href="/social/spb/contato">{% trans "Contact" %}</a>
+            <a href="/social/spb/contato">Contato</a>
           </li>
         </ul>
       </div>
@@ -145,4 +134,3 @@
   </div>
 </div>
 </header>
-
	@@ -170,7 +170,7 @@		@@ -170,7 +170,7 @@
170	}	170	}
171		171
172	#quick-links{	172	#quick-links{
173	- padding-right: 30px	173	+ padding-right: 10px
174	}	174	}
175		175
176	#quick-links > li > a{	176	#quick-links > li > a{