From 4fcf7cde67bd6e629669ab959e87264d3017e575 Mon Sep 17 00:00:00 2001
From: ValessioBrito <ValessioBrito@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 15 Oct 2007 04:47:55 +0000
Subject: [PATCH] ActionItem110: Template Noosfero Bar

---
 app/views/layouts/application.rhtml    | 47 ++++++++++++++++++++++++++---------------------
 app/views/shared/categories_menu.rhtml |  7 +++++--
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index d759c19..ccec0dc 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -3,6 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
     <%= javascript_include_tag 'prototype' %>
+    <%= javascript_include_tag 'sweetTitles' %>
     <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
     <%= javascript_include_tag 'scriptaculous' %>
     <%= javascript_include_tag 'dragdrop' %>
@@ -61,11 +62,17 @@
     <div id="wrap" class='category<%= category_color %>'>
       <div id='noosfero_bar' class='category<%= category_color %>'>
         <div id='accessibility_menu'>
-          <a href='#'>Acessibilidade</a>
-          <a href='#'>Central de Buscas</a>
-          <a href='#'>Ir para conteúdo</a>
+          <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a>
+	  <a href='#'>Acessibilidade</a>
         </div><!-- accessibility_menu -->
 
+        <div id='search_box'>
+          <form id='search_box_form' action="" method="GET">
+            <input id="input_search" type='text' name='q' value='<%= _('Your search here ...')%>'>
+            <input id="button_search" type='submit' value='<%= _('Search')%>'>
+          </form>
+        </div><!-- id='search_box' -->
+
         <div id='navigation_bar'>
           <%= render :file => 'shared/categories_menu' %>
         </div><!-- id='navigation_bar' -->
@@ -74,35 +81,29 @@
           prepareMenu('navigation_bar', { timeout: 50 });
         </script>
 
-        <div id='search_box'>
-          <form id='search_box_form' action="" method="GET">
-            <input type='text' name='q' value='<%= _('Your search here ...')%>'>
-            <input type='submit' value='Buscar'>
-          </form>
-        </div><!-- id='search_box' -->
-
-        <div id="header">
-          <%= header %>
-        </div>
-
+	<div id='path_category'>
         <% if @category %>
-          <div id='category'>
             <%= @category.full_name %>
-          </div>
+	<% else @category %>
+        <div id='user_options'>
+               <%= header %>
+	</div><!-- id='user_options' -->
         <% end %>
+	</div>
 
       </div><!-- id="noosfero_bar" -->
 
+        <div id='header'><!-- Aqui eh um cabeçalho especifico do layout interno/usuario -->
+        </div><!-- id='header' -->
 
       <div id='content'>
         <!-- <a name='main_content'/></a> -->
         <!-- Aqui entra um conteudo tipo o titulo da pagina do usuário e os botoes do comatose? -->
-        <!--
         <div id='header_content'>
         </div>
-        -->
+
         <% if params[:controller] == 'cms' %>
-          <div id='boxes'>
+          <div id='boxes'><a name="content"> </a>
             <%= yield %>
           </div>
         <% else %>
@@ -110,12 +111,16 @@
         <% end %>
       </div><!-- id="content" -->
 
+      <div id="footer_content"><!-- Rodape do onteudo -->
+      </div><!-- id="footer_content" -->
+
+    </div><!-- id="wrap" -->
+
       <div id="footer">
         <!-- <a name='footer'/></a> -->
         <%= footer %>
+	<br /><center><font size="0.5pt">Versão Simplificada | <b>Versão com Efeitos</b> </font></center>
       </div><!-- id="footer" -->
 
-    </div><!-- id="wrap" -->
-
   </body>
 </html>
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
index 8e3a4e2..4b202d9 100644
--- a/app/views/shared/categories_menu.rhtml
+++ b/app/views/shared/categories_menu.rhtml
@@ -1,6 +1,9 @@
 <ul>
-  <li>
-  <%= link_to Noosfero::PROJECT, :controller => 'home' %>
+  <li id='category' class="active">
+  Noosfero
+    <ul>
+      <li><%= link_to Noosfero::PROJECT, :controller => 'home' %> <%= header %></li>
+    </ul>
   </li>
   <% @environment.display_categories.each do |item| %>
     <li id='category<%= item.display_color %>' <%= 'class="active"' if (@category && (@category.top_ancestor == item)) %> >
--
libgit2 0.21.2