Download as
Browse Code »

Commit 10dcdef540bbfdd4cbdc73415af285e012329954

Authored by Arthur Sturzbecher
Committed by Thiago Ribeiro
1 parent 9fcb3b2f
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

Fixing theme header that was wrapping all content 

    Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
Showing 1 changed file with 24 additions and 67 deletions   Show diff stats
header.html.erb
  Diff comments   View file @10dcdef
1 1 <!-- barra do governo -->
2   - <div id="barra-brasil">
3   - <a href="http://brasil.gov.br" title="Acesse para conhecer todos os serviços e informações do Governo Brasileiro na Internet.">Portal do Governo Brasileiro</a>
4   - </div>
  2 +<div id="barra-brasil">
  3 + <a href="http://brasil.gov.br" title="Acesse para conhecer todos os serviços e informações do Governo Brasileiro na Internet.">Portal do Governo Brasileiro</a>
  4 +</div>
5 5 <!--fim barra do governo -->
6 6  
7   -
8 7 <div class="header-content">
9 8 <div role="banner" id="header">
10 9 <div>
... ... @@ -34,8 +33,6 @@
34 33 </a>
35 34 </li>
36 35 </ul>
37   -
38   -
39 36 <ul id="portal-siteactions">
40 37 <li id="siteaction-accessibility">
41 38 <a href="/software-publico-brasileiro/acessibilidade">Acessibilidade</a>
... ... @@ -46,29 +43,24 @@
46 43 <li id="siteaction-mapadosite">
47 44 <a href="/search">Mapa do Site</a>
48 45 </li>
49   -
50   - <li id="siteaction-languages-pt">
51   - <a href="?lang=pt" title="Português">Português</a>
52   - </li>
53   - <li id="siteaction-languages-en">
  46 + <li id="siteaction-languages-pt">
  47 + <a href="?lang=pt" title="Português">Português</a>
  48 + </li>
  49 + <li id="siteaction-languages-en">
54 50 <a href="?lang=en" title="English">English</a>
55 51 </li>
56 52 </ul>
57   -
58   -
59 53 <div id="logo">
60   -
61   - <a title="Software Público" href="/">
  54 + <a title="Software Público" href="/">
62 55 <span id="portal-title"></span>
63 56 </a>
64 57 </div>
65   -
66 58 <div role="search" id="portal-searchbox">
67 59 <form action="/search">
68 60 <input type="text" autocomplete="off" name="query" size="18" title="Buscar no Site" placeholder="Buscar no Site" accesskey="3" class="searchField" id="searchGadget">
69   - <input type="submit" class="searchButton" value="Buscar"></form>
  61 + <input type="submit" class="searchButton" value="Buscar">
  62 + </form>
70 63 </div>
71   -
72 64 <div id="social-icons">
73 65 <ul>
74 66 <li>
... ... @@ -85,56 +77,21 @@
85 77 </li>
86 78 </ul>
87 79 </div>
  80 + </div>
  81 + <div id="sobre">
  82 + <ul id="links-rapidos">
  83 + <li id="link-faq">
  84 + <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
  85 + </li>
  86 + <li id="link-contact">
  87 + <a href="/contact/portal/new">Contato</a>
  88 + </li>
  89 + </ul>
  90 + </div>
88 91 </div>
89   -
90   - <div id="sobre">
91   - <ul id="links-rapidos">
92   - <li id="link-faq">
93   - <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
94   - </li>
95   - <li id="link-contact">
96   - <a href="/contact/portal/new">Contato</a>
97   - </li>
98   - </ul>
  92 + <div id="menucontainer">
99 93 </div>
100   -
101   -</div>
102   -
103   -
104   -<div id="menucontainer">
105   - <!--<ul id="hmenu">
106   - <li class="parent_menu"><a href="/">Software Público</a>
107   -
108   - </li>
109   - <li class="parent_menu"><a href="/">Mercado Público</a>
110   -
111   - </li>
112   - <li class="parent_menu"><a href="/search/communities">Comunidades</a>
113   -
114   - <!-- <ul>
115   - <li class="child_menu"><a href="#">Comunidades de Software</a>
116   -
117   - </li>
118   - <li class="child_menu"><a href="#">Universidades</a>
119   - </li>
120   - </ul>
121   - </li>-->
122   - <!-- <li class="parent_menu"><a href="#">Software</a>
123   -
124   - </li> -->
125   - <!-- <li class="parent_menu"><a href="/search/people">Usuário</a>
126   -
127   - </li>
128   - </ul> -->
129   -
130   -</div>
131   -
132   - <div id="categories_menu">
  94 + <div id="categories_menu">
133 95 <%= theme_include 'categories' %>
134 96 </div>
135   -
136   - <!--
137   -<div id="barra-psocial">
138   -
139   -</div>-->
140   -
  97 +</div>
... ...