Download as
Browse Code »

Commit 5b29a09392f0cd3f5278be81b9ad9d8425f0b995

Authored by Carlos Coêlho
1 parent 92329966
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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>
Showing 3 changed files with 60 additions and 57 deletions   Show diff stats
static/css/header.css
  Diff comments   View file @5b29a09
... ... @@ -170,7 +170,7 @@
170 170 }
171 171  
172 172 #quick-links{
173   - padding-right: 30px
  173 + padding-right: 10px
174 174 }
175 175  
176 176 #quick-links > li > a{
... ...
templates/footer.html
  Diff comments   View file @5b29a09
1   -{% load i18n browserid conversejs gravatar %}
  1 +{% load i18n %}
2 2 {% load static from staticfiles %}
3 3  
4 4 <footer>
5 5 <div class="row">
6 6 <div class="container">
7 7 <div class="pull-right go-top">
8   - <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>{% trans "Back to top" %}</a>
  8 + <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>Voltar ao topo</a>
9 9 </div>
10 10 </div><!-- end go-top -->
11   - <div class="col-lg-12 footer-content">
  11 + <div class="col-lg-12 offset footer-content">
12 12 <div class="container">
13 13 <div class="row">
14   - <dl class="col-md-3 footer-links">
15   - <dt>{% trans "Topics" %}</dt>
16   - <dd><a href="/social/spb/o-que-e-o-software-publico" title="SPB">{% trans "SPB" %}</a></dd>
17   - <dd><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">{% trans "SISP-SPB" %}</a></dd>
18   - <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">{% trans "AvaliaSPB" %}</a></dd>
19   - <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">{% trans "4CMBr" %}</a></dd>
20   - <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/xowiki/" title="5cQualiBr" href="#">{% trans "5cQualiBr" %}</a></dd>
  14 + <dl class="col-md-2 col-md-offset-1 footer-links">
  15 + <dt>Assuntos</dt>
  16 + <dd><a href="/social/spb/publique-seu-software" title="Publique seu software">Publique seu software</a></dd>
  17 + <dd><a href="http://www.softwarepublico.gov.br/mpv/" title="Prestadores de serviço">Prestadores de serviço</a></dd>
  18 + <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="Espaço dos municípios">Espaço dos municípios</a></dd>
21 19 </dl>
22   - <dl class="col-md-3 footer-links">
23   - <dt>{% trans "Services" %}</dt>
24   - <dd class="portalservicos-item">
25   - <a title="Perguntas frequentes" href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  20 + <dl class="col-md-2 footer-links">
  21 + <dt>Software Público</dt>
  22 + <dd class="portalspb-item">
  23 + <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a>
26 24 </dd>
27   - <dd class="portalservicos-item">
28   - <a title="Contato" href="/social/spb/contato">{% trans "Contact" %}</a>
  25 + <dd class="portalspb-item">
  26 + <a title="Eventos" href="/social/profile/spb/events">Eventos</a>
29 27 </dd>
  28 + <dd class="portalspb-item">
  29 + <a title="Prêmios" href="/social/spb/premios">Prêmios</a>
  30 + </dd>
  31 + <dd class="portalspb-item">
  32 + <a title="Publicações" href="/social/spb/publicacoes">Publicações</a>
  33 + </dd>
  34 + </dl>
  35 + <dl class="col-md-2 footer-links">
  36 + <dt>Serviços</dt>
  37 + <dd>
  38 + <a href="/social/spb/ajuda#faq" title="FAQ">FAQ</a>
  39 + </dd>
  40 + <dd>
  41 + <a href="/social/spb/contato" title="Contato">Contato</a>
  42 + </dd>
  43 + <dd>
  44 + <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" title="Relatar erros">Relatar erros</a>
  45 + </dd>
30 46 </dl>
31   - <dl class="col-md-3 footer-links">
  47 + <dl class="col-md-2 footer-links">
32 48 <dt>RSS</dt>
33   - <dd><a href="#" title="O que é?">{% trans "What is it?" %}</a></dd>
34   - <dd><a href="#" title="Assine">{% trans "Subscribe" %}</a></dd>
  49 + <dd><a href="#" title="O que é?">O que é</a></dd>
  50 + <dd><a href="#" title="Assine">Assine</a></dd>
35 51 </dl>
36   - <dl class="col-md-3 footer-links">
37   - <dt>{% trans "Navigation" %}</dt>
38   - <dd><a href="#">{% trans "Accessibility" %}</a></dd>
39   - <dd><a href="/social/spb/mapa-do-site">{% trans "Site map" %}</a></dd>
40   - <dd><a href="#">Versão em Português</a></dd>
  52 + <dl class="col-md-2 footer-links">
  53 + <dt>Navegação</dt>
  54 + <dd><a href="#">Acessibilidade</a></dd>
  55 + <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd>
41 56 </dl>
42 57 </div>
43 58 </div>
... ... @@ -45,18 +60,18 @@
45 60 <div class="row footer-gov">
46 61 <div class="container">
47 62 <div class="col-md-7">
48   - <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>
  63 + <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>
49 64 </div>
50 65 <div class="col-md-5 institucionais">
51   - <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>
52   - <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>
  66 + <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>
  67 + <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>
53 68 </div>
54 69 </div>
55 70 </div><!-- end footer-gov -->
56 71 <div class="row spb-definitions">
57 72 <div class="container">
58   - <div id="about-pspb">{% trans "This is a BETA version and it's hosted at University of Brasilia" %}</div>
59   - <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" %}.
  73 + <div id="about-pspb">Essa versão é BETA e está hospedada na Universidade de Brasília</div>
  74 + <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.
60 75 </div>
61 76 </div>
62 77 </div><!-- end spb-definitions -->
... ...
templates/header.html
  Diff comments   View file @5b29a09
1   -{% load i18n browserid conversejs gravatar plugins %}
  1 +{% load i18n gravatar plugins %}
2 2 {% load static from staticfiles %}
3 3  
4 4 <header>
5 5 <div class="navbar navbar-static-top">
6 6 <!-- begin of barra-brasil -->
7 7 <div id="barra-brasil">
8   - <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>
  8 + <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>
9 9 </div>
10 10 <script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
11 11 <!-- end of barra-brasil -->
... ... @@ -15,48 +15,40 @@
15 15 <div class="col-md-12">
16 16 <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">
17 17 <li>
18   - <a id="link-conteudo" href="#main-content" accesskey="1">{% trans "Go to content" %} <span class="label label-primary">1</span></a>
  18 + <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>
19 19 </li>
20 20 <li>
21   - <a id="link-navegacao" href="#menu-spb" accesskey="2">{% trans "Go to menu" %} <span class="label label-primary">2</span></a>
  21 + <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>
22 22 </li>
23   - <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>
  23 + <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>
24 24 </li>
25 25 <li>
26   - <a id="link-rodape" href="#link-top" accesskey="4">{% trans "Go to bottom" %} <span class="label label-primary">4</span></a>
  26 + <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
27 27 </li>
28 28 </ul> <!-- end of accesskeys -->
29 29 <ul id="portal-siteactions" class="nav navbar-nav navbar-right">
30 30 <li id="siteaction-accessibility">
31   - <a href="/software-publico-brasileiro/acessibilidade"><span>{% trans "Accessibility" %}</span></a>
  31 + <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
32 32 </li>
33 33 <li id="siteaction-contraste">
34   - <a href="#"><span>{% trans "High contrast" %}</span></a>
  34 + <a href="#"><span>Alto Contraste</span></a>
35 35 </li>
36 36 <li id="siteaction-mapadosite">
37   - <a href="/social/spb/mapa-do-site"><span>{% trans "Site map" %}</span></a>
  37 + <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
38 38 </li>
39 39 <!-- begin of user-menu -->
40 40 {% if not user.is_authenticated %}
41 41 <li class="dropdown hidden-xs hidden-lg">
42   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Access" %} <b class="caret"></b></a>
  42 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
43 43 <ul class="dropdown-menu">
44 44 {% trans 'Login' as login_text %}
45   - {% if BROWSERID_ENABLED %}
46   - <li>{% browserid_login text=login_text %}</li>
47   - {% else %}
48 45 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
49 46 <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
50   - {% endif %}
51 47 </ul>
52 48 </li>
53 49 {% trans 'Login' as login_text %}
54   - {% if BROWSERID_ENABLED %}
55   - <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
56   - {% else %}
57 50 <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
58 51 <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
59   - {% endif %}
60 52 {% else %}
61 53 <li id="user-menu" class="dropdown">
62 54 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -71,10 +63,7 @@
71 63 <div>
72 64 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
73 65 {% trans 'Logout' as logout_text %}
74   - {% if BROWSERID_ENABLED %}
75   - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
76   - {% else %}
77   - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a> {% endif %}
  66 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
78 67 </div>
79 68 </div>
80 69 </li>
... ... @@ -113,10 +102,10 @@
113 102 <div class="row">
114 103 <ul id="quick-links-sm" class="hidden-md hidden-lg">
115 104 <li id="link-faq">
116   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  105 + <a href="/social/spb/ajuda">FAQ</a>
117 106 </li>
118 107 <li id="link-contact">
119   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
  108 + <a href="/social/spb/contato">Contato</a>
120 109 </li>
121 110 </ul>
122 111 <div class="navbar-header logo">
... ... @@ -134,10 +123,10 @@
134 123 </ul>
135 124 <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
136 125 <li id="link-faq">
137   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  126 + <a href="/social/spb/ajuda">Perguntas Frequentes</a>
138 127 </li>
139 128 <li id="link-contact">
140   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
  129 + <a href="/social/spb/contato">Contato</a>
141 130 </li>
142 131 </ul>
143 132 </div>
... ... @@ -145,4 +134,3 @@
145 134 </div>
146 135 </div>
147 136 </header>
148   -
... ...