Commit 4fcf7cde67bd6e629669ab959e87264d3017e575
1 parent
5d72e8fc
Exists in
master
and in
29 other branches
ActionItem110: Template Noosfero Bar
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@698 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
31 additions
and
23 deletions
Show diff stats
app/views/layouts/application.rhtml
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> |
| 4 | 4 | |
| 5 | 5 | <%= javascript_include_tag 'prototype' %> |
| 6 | + <%= javascript_include_tag 'sweetTitles' %> | |
| 6 | 7 | <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %> |
| 7 | 8 | <%= javascript_include_tag 'scriptaculous' %> |
| 8 | 9 | <%= javascript_include_tag 'dragdrop' %> |
| ... | ... | @@ -61,11 +62,17 @@ |
| 61 | 62 | <div id="wrap" class='category<%= category_color %>'> |
| 62 | 63 | <div id='noosfero_bar' class='category<%= category_color %>'> |
| 63 | 64 | <div id='accessibility_menu'> |
| 64 | - <a href='#'>Acessibilidade</a> | |
| 65 | - <a href='#'>Central de Buscas</a> | |
| 66 | - <a href='#'>Ir para conteúdo</a> | |
| 65 | + <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a> | |
| 66 | + <a href='#'>Acessibilidade</a> | |
| 67 | 67 | </div><!-- accessibility_menu --> |
| 68 | 68 | |
| 69 | + <div id='search_box'> | |
| 70 | + <form id='search_box_form' action="" method="GET"> | |
| 71 | + <input id="input_search" type='text' name='q' value='<%= _('Your search here ...')%>'> | |
| 72 | + <input id="button_search" type='submit' value='<%= _('Search')%>'> | |
| 73 | + </form> | |
| 74 | + </div><!-- id='search_box' --> | |
| 75 | + | |
| 69 | 76 | <div id='navigation_bar'> |
| 70 | 77 | <%= render :file => 'shared/categories_menu' %> |
| 71 | 78 | </div><!-- id='navigation_bar' --> |
| ... | ... | @@ -74,35 +81,29 @@ |
| 74 | 81 | prepareMenu('navigation_bar', { timeout: 50 }); |
| 75 | 82 | </script> |
| 76 | 83 | |
| 77 | - <div id='search_box'> | |
| 78 | - <form id='search_box_form' action="" method="GET"> | |
| 79 | - <input type='text' name='q' value='<%= _('Your search here ...')%>'> | |
| 80 | - <input type='submit' value='Buscar'> | |
| 81 | - </form> | |
| 82 | - </div><!-- id='search_box' --> | |
| 83 | - | |
| 84 | - <div id="header"> | |
| 85 | - <%= header %> | |
| 86 | - </div> | |
| 87 | - | |
| 84 | + <div id='path_category'> | |
| 88 | 85 | <% if @category %> |
| 89 | - <div id='category'> | |
| 90 | 86 | <%= @category.full_name %> |
| 91 | - </div> | |
| 87 | + <% else @category %> | |
| 88 | + <div id='user_options'> | |
| 89 | + <%= header %> | |
| 90 | + </div><!-- id='user_options' --> | |
| 92 | 91 | <% end %> |
| 92 | + </div> | |
| 93 | 93 | |
| 94 | 94 | </div><!-- id="noosfero_bar" --> |
| 95 | 95 | |
| 96 | + <div id='header'><!-- Aqui eh um cabeçalho especifico do layout interno/usuario --> | |
| 97 | + </div><!-- id='header' --> | |
| 96 | 98 | |
| 97 | 99 | <div id='content'> |
| 98 | 100 | <!-- <a name='main_content'/></a> --> |
| 99 | 101 | <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? --> |
| 100 | - <!-- | |
| 101 | 102 | <div id='header_content'> |
| 102 | 103 | </div> |
| 103 | - --> | |
| 104 | + | |
| 104 | 105 | <% if params[:controller] == 'cms' %> |
| 105 | - <div id='boxes'> | |
| 106 | + <div id='boxes'><a name="content"> </a> | |
| 106 | 107 | <%= yield %> |
| 107 | 108 | </div> |
| 108 | 109 | <% else %> |
| ... | ... | @@ -110,12 +111,16 @@ |
| 110 | 111 | <% end %> |
| 111 | 112 | </div><!-- id="content" --> |
| 112 | 113 | |
| 114 | + <div id="footer_content"><!-- Rodape do onteudo --> | |
| 115 | + </div><!-- id="footer_content" --> | |
| 116 | + | |
| 117 | + </div><!-- id="wrap" --> | |
| 118 | + | |
| 113 | 119 | <div id="footer"> |
| 114 | 120 | <!-- <a name='footer'/></a> --> |
| 115 | 121 | <%= footer %> |
| 122 | + <br /><center><font size="0.5pt">Versão Simplificada | <b>Versão com Efeitos</b> </font></center> | |
| 116 | 123 | </div><!-- id="footer" --> |
| 117 | 124 | |
| 118 | - </div><!-- id="wrap" --> | |
| 119 | - | |
| 120 | 125 | </body> |
| 121 | 126 | </html> | ... | ... |
app/views/shared/categories_menu.rhtml
| 1 | 1 | <ul> |
| 2 | - <li> | |
| 3 | - <%= link_to Noosfero::PROJECT, :controller => 'home' %> | |
| 2 | + <li id='category' class="active"> | |
| 3 | + Noosfero | |
| 4 | + <ul> | |
| 5 | + <li><%= link_to Noosfero::PROJECT, :controller => 'home' %> <%= header %></li> | |
| 6 | + </ul> | |
| 4 | 7 | </li> |
| 5 | 8 | <% @environment.display_categories.each do |item| %> |
| 6 | 9 | <li id='category<%= item.display_color %>' <%= 'class="active"' if (@category && (@category.top_ancestor == item)) %> > | ... | ... |