Download as
Browse Code »

Commit ae59f0537642f3aedba51d69dfd64a3df7d13a9b

Authored by Carlos Coêlho
1 parent 198adafc
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 stylesheet 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Showing 5 changed files with 17 additions and 28 deletions   Show diff stats
static/css/footer.css
  Diff comments   View file @ae59f05
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
48 .footer-gov .institucionais a{ 48 .footer-gov .institucionais a{
49 display:table-cell; 49 display:table-cell;
50 vertical-align: middle; 50 vertical-align: middle;
  51 + float: right;
51 } 52 }
52 53
53 .footer-gov a:hover{ 54 .footer-gov a:hover{
@@ -64,6 +65,10 @@ @@ -64,6 +65,10 @@
64 padding-bottom: 10px; 65 padding-bottom: 10px;
65 } 66 }
66 67
  68 +.footer-gov .logo-brasil img{
  69 + padding-right: 0;
  70 +}
  71 +
67 .go-top{ 72 .go-top{
68 font-size: 13px; 73 font-size: 13px;
69 height: 2em; 74 height: 2em;
static/css/header.css
  Diff comments   View file @ae59f05
@@ -127,7 +127,6 @@ @@ -127,7 +127,6 @@
127 #search-form #header-searchbox{ 127 #search-form #header-searchbox{
128 width: 100%; 128 width: 100%;
129 border-radius: 5px 0px 0px 5px; 129 border-radius: 5px 0px 0px 5px;
130 - border-right: none;  
131 background: #fff; 130 background: #fff;
132 } 131 }
133 132
static/css/screen.css
  Diff comments   View file @ae59f05
@@ -452,8 +452,3 @@ span.highlighted { @@ -452,8 +452,3 @@ span.highlighted {
452 .chart > p > label { 452 .chart > p > label {
453 margin: 0 2px; 453 margin: 0 2px;
454 } 454 }
455 -  
456 -.row {  
457 - margin-left: 0;  
458 - margin-right: 0;  
459 -}  
templates/footer.html
  Diff comments   View file @ae59f05
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="row"> 13 <div class="row">
14 <dl class="col-md-3 footer-links"> 14 <dl class="col-md-3 footer-links">
15 <dt>{% trans "Topics" %}</dt> 15 <dt>{% trans "Topics" %}</dt>
16 - <dd><a href="http://www.softwarepublico.gov.br/O_que_e_o_SPB" title="SPB">{% trans "SPB" %}</a></dd> 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> 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> 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> 19 <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">{% trans "4CMBr" %}</a></dd>
@@ -22,19 +22,10 @@ @@ -22,19 +22,10 @@
22 <dl class="col-md-3 footer-links"> 22 <dl class="col-md-3 footer-links">
23 <dt>{% trans "Services" %}</dt> 23 <dt>{% trans "Services" %}</dt>
24 <dd class="portalservicos-item"> 24 <dd class="portalservicos-item">
25 - <a title="Perguntas frequentes" href="#">{% trans "Frequently Asked Questions" %}</a> 25 + <a title="Perguntas frequentes" href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
26 </dd> 26 </dd>
27 <dd class="portalservicos-item"> 27 <dd class="portalservicos-item">
28 - <a title="Contato" href="#">{% trans "Contact" %}</a>  
29 - </dd>  
30 - <dd class="portalservicos-item">  
31 - <a title="Serviços da [Denominação]" href="#">{% trans " [Denomination's] services" %}</a>  
32 - </dd>  
33 - <dd class="portalservicos-item">  
34 - <a title="Dados abertos" href="#">{% trans "Open data" %}</a>  
35 - </dd>  
36 - <dd class="portalservicos-item">  
37 - <a title="Área de imprensa" href="#">{% trans "Press area" %}</a> 28 + <a title="Contato" href="/social/spb/contato">{% trans "Contact" %}</a>
38 </dd> 29 </dd>
39 </dl> 30 </dl>
40 <dl class="col-md-3 footer-links"> 31 <dl class="col-md-3 footer-links">
@@ -45,10 +36,8 @@ @@ -45,10 +36,8 @@
45 <dl class="col-md-3 footer-links"> 36 <dl class="col-md-3 footer-links">
46 <dt>{% trans "Navigation" %}</dt> 37 <dt>{% trans "Navigation" %}</dt>
47 <dd><a href="#">{% trans "Accessibility" %}</a></dd> 38 <dd><a href="#">{% trans "Accessibility" %}</a></dd>
48 - <dd><a href="#">{% trans "Site map" %}</a></dd>  
49 - <dd><a href="#">Versión en Español</a></dd> 39 + <dd><a href="/social/spb/mapa-do-site">{% trans "Site map" %}</a></dd>
50 <dd><a href="#">Versão em Português</a></dd> 40 <dd><a href="#">Versão em Português</a></dd>
51 - <dd><a href="#">English version</a></dd>  
52 </dl> 41 </dl>
53 </div> 42 </div>
54 </div> 43 </div>
@@ -59,7 +48,8 @@ @@ -59,7 +48,8 @@
59 <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> 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>
60 </div> 49 </div>
61 <div class="col-md-5 institucionais"> 50 <div class="col-md-5 institucionais">
62 - <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" %}<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> 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>
63 </div> 53 </div>
64 </div> 54 </div>
65 </div><!-- end footer-gov --> 55 </div><!-- end footer-gov -->
templates/header.html
  Diff comments   View file @ae59f05
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <a href="#"><span>{% trans "High contrast" %}</span></a> 34 <a href="#"><span>{% trans "High contrast" %}</span></a>
35 </li> 35 </li>
36 <li id="siteaction-mapadosite"> 36 <li id="siteaction-mapadosite">
37 - <a href="/search"><span>{% trans "Site map" %}</span></a> 37 + <a href="/social/spb/mapa-do-site"><span>{% trans "Site map" %}</span></a>
38 </li> 38 </li>
39 <!-- begin of user-menu --> 39 <!-- begin of user-menu -->
40 {% if not user.is_authenticated %} 40 {% if not user.is_authenticated %}
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 <div class="row" id="spb-logo-search"> 87 <div class="row" id="spb-logo-search">
88 <div class="col-md-6 logo-box"> 88 <div class="col-md-6 logo-box">
89 <div id="logo"> 89 <div id="logo">
90 - <a href="#" id="portal-logo"> 90 + <a href="/" id="portal-logo">
91 <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" /> 91 <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" />
92 </a> 92 </a>
93 </div> 93 </div>
@@ -113,10 +113,10 @@ @@ -113,10 +113,10 @@
113 <div class="row"> 113 <div class="row">
114 <ul id="quick-links-sm" class="hidden-md hidden-lg"> 114 <ul id="quick-links-sm" class="hidden-md hidden-lg">
115 <li id="link-faq"> 115 <li id="link-faq">
116 - <a href="/ajuda/ajuda/duvidas-frequentes">{% trans "Frequently Asked Questions" %}</a> 116 + <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
117 </li> 117 </li>
118 <li id="link-contact"> 118 <li id="link-contact">
119 - <a href="/contact/portal/new">{% trans "Contact" %}</a> 119 + <a href="/social/spb/contato">{% trans "Contact" %}</a>
120 </li> 120 </li>
121 </ul> 121 </ul>
122 <div class="navbar-header logo"> 122 <div class="navbar-header logo">
@@ -134,10 +134,10 @@ @@ -134,10 +134,10 @@
134 </ul> 134 </ul>
135 <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm"> 135 <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
136 <li id="link-faq"> 136 <li id="link-faq">
137 - <a href="/ajuda/ajuda/duvidas-frequentes">{% trans "Frequently Asked Questions" %}</a> 137 + <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
138 </li> 138 </li>
139 <li id="link-contact"> 139 <li id="link-contact">
140 - <a href="/contact/portal/new">{% trans "Contact" %}</a> 140 + <a href="/social/spb/contato">{% trans "Contact" %}</a>
141 </li> 141 </li>
142 </ul> 142 </ul>
143 </div> 143 </div>