Download as
Browse Code »

Commit c9a8f27abce4680a38c980d8a91ac7ffd5ccd5e4

Authored by Carlos Coêlho
2 parents bfca3524 917f0a85
Exists in master and in 27 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_list_style_on_folder_elements, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, lxc_settings, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_sisp_buttons, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories

Merge remote-tracking branch 'origin/sisp_catalog_header'

Showing 4 changed files with 7 additions and 53 deletions   Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/header.css
  Diff comments   View file @c9a8f27
... ... @@ -428,7 +428,8 @@ header #sisp-header-quick-access a {
428 428 font-weight: bold;
429 429 }
430 430  
  431 +/*
431 432 header #spb-header-content,
432 433 header #sisp-header-content {
433 434 padding-top: 13px;
434   -}
  435 +} */
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/footer_sisp.html
  Diff comments   View file @c9a8f27
... ... @@ -10,50 +10,19 @@
10 10 <div id="footer" role="contentinfo">
11 11 <a name="afooter" id="afooter"></a>
12 12 <div id="doormat-container" class="columns-4">
13   - <div class="doormatColumn column-0">
  13 + <div class ="doormatColumn column-0">
14 14 <dl class="doormatSection">
15   - <dt class="doormatSectionHeader">Assuntos</dt>
  15 + <dt class="doormatSectionHeader">Navegação</dt>
16 16 <dd class="doormatSectionBody">
17   - <a href="/social/sisp/publique-seu-software" class="external-link">Publique seu software</a>
  17 + <a href="/social/sisp/acessibilidade" class="external-link">Acessibilidade</a>
18 18 </dd>
19   - <!--
20 19 <dd class="doormatSectionBody">
21   - <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
  20 + <a href="/social/sisp/mapa-do-site" class="external-link">Mapa do site</a>
22 21 </dd>
23   - -->
24 22 </dl>
25 23 </div>
26 24 <div class="doormatColumn column-1">
27 25 <dl class="doormatSection">
28   - <dt class="doormatSectionHeader">Portal do SISP</dt>
29   - <dd class="doormatSectionBody">
30   - <a href="/social/sisp/entenda-o-que-e" class="external-link">Entenda o que é</a>
31   - </dd>
32   - <!--
33   - <dd class="doormatSectionBody">
34   - <a href="/social/profile/sisp/events" class="external-link">Eventos</a>
35   - </dd>
36   - -->
37   - </dl>
38   - </div>
39   - <div class="doormatColumn column-2">
40   - <dl class="doormatSection">
41   - <dt class="doormatSectionHeader">Serviços</dt>
42   - <dd class="doormatSectionBody">
43   - <a href="/social/sisp/ajuda#faq" class="external-link">FAQ</a>
44   - </dd>
45   - <dd class="doormatSectionBody">
46   - <a href="/social/sisp/contato" class="external-link">Contato</a>
47   - </dd>
48   - <!--
49   - <dd class="doormatSectionBody">
50   - <a href="/archives/thread/sisp-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
51   - </dd>
52   - -->
53   - </dl>
54   - </div>
55   - <div class="doormatColumn column-3">
56   - <dl class="doormatSection">
57 26 <dt class="doormatSectionHeader">RSS</dt>
58 27 <dd class="doormatSectionBody">
59 28 <a href="/social/sisp/rss/o-que-e" class="external-link">O que é?</a>
... ... @@ -62,15 +31,6 @@
62 31 <a href="/rss/colab/latest" class="external-link">Assine</a>
63 32 </dd>
64 33 </dl>
65   - <dl class="doormatSection">
66   - <dt class="doormatSectionHeader">Navegação</dt>
67   - <dd class="doormatSectionBody">
68   - <a href="/social/sisp/acessibilidade" class="external-link">Acessibilidade</a>
69   - </dd>
70   - <dd class="doormatSectionBody">
71   - <a href="/social/sisp/mapa-do-site" class="external-link">Mapa do site</a>
72   - </dd>
73   - </dl>
74 34 </div>
75 35 </div>
76 36 <div class="clear"></div>
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_sisp.html
  Diff comments   View file @c9a8f27
... ... @@ -8,9 +8,6 @@
8 8 </div>
9 9 <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
10 10 <div id="header" role="banner">
11   - <div id="sisp-header-quick-access">
12   - <p class='pull-right'>Acesso rápido: <a href="{{ SPB_PORTAL }}">Software Público Brasileiro</a></p>
13   - </div>
14 11 <div id="sisp-header-content">
15 12 <ul id="accessibility">
16 13 <li>
... ... @@ -67,8 +64,7 @@
67 64 </div>
68 65 <div id="logo">
69 66 <a id="portal-logo" title="" href="/">
70   - <span id="portal-title-1">Portal do</span>
71   - <h1 id="portal-title" class="corto">SISP</h1>
  67 + <h1 id="portal-title" class="corto">Catálogo do SISP</h1>
72 68 <span id="portal-description">MINISTÉRIO DO PLANEJAMENTO, ORÇAMENTO E GESTÃO</span>
73 69 </a>
74 70 </div>
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_spb.html
  Diff comments   View file @c9a8f27
... ... @@ -8,9 +8,6 @@
8 8 </div>
9 9 <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
10 10 <div id="header" role="banner">
11   - <div id="spb-header-quick-access">
12   - <p class='pull-right'>Acesso rápido: <a href="{{ SISP_PORTAL }}">Portal do SISP</a></p>
13   - </div>
14 11 <div id="spb-header-content">
15 12 <ul id="accessibility">
16 13 <li>
... ...