ActionItem93: several changes to layout

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@929 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem93: several changes to layout
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@929 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent ddbcecf8
Showing 4 changed files with 51 additions and 130 deletions Show diff stats
app/helpers/application_helper.rb
app/views/layouts/application.rhtml
app/views/shared/categories_menu.rhtml
public/stylesheets/menu.css
@@ -117,20 +117,13 @@ module ApplicationHelper
        ( link_to_homepage( _('My account') )),
        ( link_to_myprofile _('My Enterprises'), {:controller => 'membership_editor'} ),
        ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),
-       ( link_to_document (about_document), _('About')  if about_document ),
     ].join("\n")
     content_tag('span', links, :id => 'user_links')
   end
-  def about_document
-    Article.find_all_by_slug(_('about')).select do |a| 
-      a.full_path.split(/\//).shift == 'noosfero'
-    end[0]
-  end
-
   def shortcut_header_links
     if logged_in?
-      [ accessibility_link, 
+      [
         ( link_to_homepage( content_tag('span', _('My account')),nil, { :id => 'icon_go_home'} ) ), 
 	# MUDAR, O ID acima deve ser no Link <a id=...
 	# O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.
@@ -138,16 +131,12 @@ module ApplicationHelper
         ( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout', :method => 'post'}, :id => 'icon_logout'),
       ]
     else
-      [ accessibility_link,
+      [ 
         ( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'icon_login' ),
       ]
     end.join(" ")
   end
-  def header
-    login_or_register_or_logout
-  end
-
   def login_or_register_or_logout
     if logged_in?
       user_links + " " + logout_box
@@ -217,12 +206,6 @@ module ApplicationHelper
     ]
   end
-  def about_links
-    links = [
-      [(link_to _('Report bug'), 'http://www.colivre.coop.br/Noosfero/BugItem')],
-    ]
-  end
-
   def design_links
     links = [
       [(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')],
@@ -231,46 +214,6 @@ module ApplicationHelper
     ]
   end
-  #FIXME: about_links should be shown even if the user isn't logged in
-  def user_options
-    return [] unless logged_in?
-    profile = Profile.find_by_identifier(params[:profile])
-    case params[:controller]
-      when 'admin_panel'
-        admin_links
-      when 'membership_editor'
-        membership_links
-      when 'profile_editor'
-        if profile.kind_of?(Enterprise) && params[:action] == 'index'
-          enterprise_links
-        elsif profile.kind_of?(Person) && params[:action] == 'index'
-           myprofile_links
-        elsif params[:action] == 'design_editor'
-          design_links
-        else
-          []
-        end
-      when 'content_viewer'
-        if params[:profile] == 'noosfero' && params[:page][0] == 'about'
-          about_links
-        else
-          person_links
-        end
-      else
-        []
-    end.map{|l| link_if_permitted(l[0], l[1], l[2]) }
-  end
-
-#  def user_options
-#  end
-
-  def accessibility_link
-    doc = Article.find_all_by_slug(_('accessibility')).select do |a| 
-      a.full_path.split(/\//).shift == 'noosfero'
-    end[0]
-    link_to_document doc, _('Accessibility'), :id => 'icon_accessibility' if doc 
-  end
-
   def search_box
     [form_tag( :controller => 'search', :action => 'index'),
       submit_tag(_('Search'), :id => 'button_search'),
@@ -2,20 +2,19 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title> 
-     <% if @category %>
-      Noosfero &rarr; <%= @category.full_name %>  
-     <% else %>
-      Noosfero
-     <% end %>
+      <% if @category %>
+        Noosfero &rarr; <%= @category.full_name %>
+      <% else %>
+        Noosfero
+      <% end %>
     </title>
-   <meta name="description" content="FIXME: Descriptions of Noosfero" />
-   <meta name="keywords" content="Noosfero, Community, Open Source" />
+    <meta name="description" content="FIXME: Descriptions of Noosfero" />
+    <meta name="keywords" content="Noosfero, Community, Open Source" />
     <%= design_all_header_tags %>
     <%= stylesheet_link_tag 'common' %>
     <%= stylesheet_link_tag 'help' %>
     <%= stylesheet_link_tag 'menu' %>
     <%= javascript_include_tag 'menu' %>
-
     <%# cms stuff %>
     <% if params[:controller] == 'cms' %>
       <%= javascript_include_tag 'cms' %>
@@ -34,22 +33,21 @@
     <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;", :alt => _('Image for Loading...') %>
     <div id="wrap" class='category<%= category_color %>'>
+
       <div id='noosfero_bar' class='category<%= category_color %>'>
         <div id='accessibility_menu'>
-          <a href='#content' id='icon_go_content'><span><%= _('Go Content') %></span></a>
-         <%= shortcut_header_links %>
+          <a href='#content' id='icon_go_content'><span><%= _('Go to content') %></span></a>
+          <%= shortcut_header_links %>
         </div><!-- accessibility_menu -->
-      <div id='top_bar' class='category<%= category_color %>'>
-       <div id='path_category'>
-        <% if @category %>
-            <%= @category.full_name %>
-        <% else @category %>
-        <div id='user_options'>
-          <%= user_options.join(' ') %>
-        </div><!-- id='user_options' -->
-        <% end %>
+
+        <div id='top_bar' class='category<%= category_color %>'>
+          <div id='path_category'>
+            <% if @category %>
+              <%= @category.full_name %>
+            <% end %>
+          </div>
         </div>
-       </div>
+
         <div id='search_box'>
           <%= search_box %>
         </div><!-- id='search_box' -->
@@ -61,35 +59,35 @@
         <script type="text/javascript">
           prepareMenu('navigation_bar', { timeout: 10 });
         </script>
-
-
       </div><!-- id="noosfero_bar" -->
-    <div id='frame'><!-- Frame que envolve toda pagina de um usuario -->
-     <div id='header'><!-- Abaixo um cabeçalho especifico para a pagina de 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'><a name="content"> </a>
-            <%= yield %>
+      <div id='frame'><!-- Frame que envolve toda pagina de um usuario -->
+        <div id='header'>
+          <!-- Abaixo um cabeçalho especifico para a pagina de 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>
-        <% else %>
-          <%= design_display(yield) %>
-        <% end %>
-      </div><!-- id="content" -->
-      <div id="footer_content"><!-- Rodape do onteudo -->
-      </div><!-- id="footer_content" -->
-   </div><!-- id="frame" -->
+
+          <% if params[:controller] == 'cms' %>
+            <div id='boxes'><a name="content"> </a>
+              <%= yield %>
+            </div>
+          <% else %>
+            <%= design_display(yield) %>
+          <% end %>
+        </div><!-- id="content" -->
+        <div id="footer_content"><!-- Rodape do onteudo -->
+        </div><!-- id="footer_content" -->
+      </div><!-- id="frame" -->
     </div><!-- id="wrap" -->
-      <div id="footer">
-        <!-- <a name='footer'/></a> -->
-        <%= localist_menu %>
-        <%= footer %>
-      </div><!-- id="footer" -->
+    <div id="footer">
+      <!-- <a name='footer'/></a> -->
+      <%= localist_menu %>
+      <%= footer %>
+    </div><!-- id="footer" -->
   </body>
 </html>
 <ul>
-  <li id='category' <%= 'class="active"' unless @category %>  >
-  <%= Noosfero::PROJECT.capitalize %>
-    <ul>
-      <li><%= link_to _('Home'), :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)) %> >
       <%= item.name %>
@@ -51,7 +51,7 @@ color: #ffffff;
 #accessibility_menu {
   position: absolute;
   right: 10px;
-  width: 200px;
+  width: 300px;
   text-align: right;
   font-family: Verdana, Arial, Serif-sans;
   font-size: 9px;
@@ -62,7 +62,6 @@ color: #ffffff;
 /* Images Icons Mini-BAR */
 #accessibility_menu span {
-display: none;
 }
 #accessibility_menu a#icon_go_content {
@@ -90,30 +89,17 @@ background-image: url(&#39;../images/icons-bar/accessibility.png&#39;);
 }
 #accessibility_menu a {
-  padding: 0px;
-  margin: 0px;
-  margin-right: 5px;
+  color: white;
+  font-weight: bold;
+  padding-left: 28px;
+  height: 24px;
   display: block;
   float: right;
-  width: 24px;
-  height: 24px;
-  background-position: 0px 0px;
   background-repeat: no-repeat;
-  text-decoration: none;
+  padding-top: 4px;
 }
 #accessibility_menu a:hover span {
- display: block;
- position: absolute;
- top: 1px;
- right: 200px;
- width: 100px;
- text-align: right;
- background: url("../images/ico_enterlink.gif") no-repeat;
- background-position: 106px 6px;
- color: #ffffff;
- font-weight: bold;
- padding-right: 8px;
 }
	@@ -117,20 +117,13 @@ module ApplicationHelper		@@ -117,20 +117,13 @@ module ApplicationHelper
117	( link_to_homepage( _('My account') )),	117	( link_to_homepage( _('My account') )),
118	( link_to_myprofile _('My Enterprises'), {:controller => 'membership_editor'} ),	118	( link_to_myprofile _('My Enterprises'), {:controller => 'membership_editor'} ),
119	( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),	119	( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),
120	- ( link_to_document (about_document), _('About') if about_document ),
121	].join("\n")	120	].join("\n")
122	content_tag('span', links, :id => 'user_links')	121	content_tag('span', links, :id => 'user_links')
123	end	122	end
124		123
125	- def about_document
126	- Article.find_all_by_slug(_('about')).select do \|a\|
127	- a.full_path.split(/\//).shift == 'noosfero'
128	- end[0]
129	- end
130	-
131	def shortcut_header_links	124	def shortcut_header_links
132	if logged_in?	125	if logged_in?
133	- [ accessibility_link,	126	+ [
134	( link_to_homepage( content_tag('span', _('My account')),nil, { :id => 'icon_go_home'} ) ),	127	( link_to_homepage( content_tag('span', _('My account')),nil, { :id => 'icon_go_home'} ) ),
135	# MUDAR, O ID acima deve ser no Link <a id=...	128	# MUDAR, O ID acima deve ser no Link <a id=...
136	# O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.	129	# O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.
	@@ -138,16 +131,12 @@ module ApplicationHelper		@@ -138,16 +131,12 @@ module ApplicationHelper
138	( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout', :method => 'post'}, :id => 'icon_logout'),	131	( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout', :method => 'post'}, :id => 'icon_logout'),
139	]	132	]
140	else	133	else
141	- [ accessibility_link,	134	+ [
142	( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'icon_login' ),	135	( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'icon_login' ),
143	]	136	]
144	end.join(" ")	137	end.join(" ")
145	end	138	end
146		139
147	- def header
148	- login_or_register_or_logout
149	- end
150	-
151	def login_or_register_or_logout	140	def login_or_register_or_logout
152	if logged_in?	141	if logged_in?
153	user_links + " " + logout_box	142	user_links + " " + logout_box
	@@ -217,12 +206,6 @@ module ApplicationHelper		@@ -217,12 +206,6 @@ module ApplicationHelper
217	]	206	]
218	end	207	end
219		208
220	- def about_links
221	- links = [
222	- [(link_to _('Report bug'), 'http://www.colivre.coop.br/Noosfero/BugItem')],
223	- ]
224	- end
225	-
226	def design_links	209	def design_links
227	links = [	210	links = [
228	[(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')],	211	[(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')],
	@@ -231,46 +214,6 @@ module ApplicationHelper		@@ -231,46 +214,6 @@ module ApplicationHelper
231	]	214	]
232	end	215	end
233		216
234	- #FIXME: about_links should be shown even if the user isn't logged in
235	- def user_options
236	- return [] unless logged_in?
237	- profile = Profile.find_by_identifier(params[:profile])
238	- case params[:controller]
239	- when 'admin_panel'
240	- admin_links
241	- when 'membership_editor'
242	- membership_links
243	- when 'profile_editor'
244	- if profile.kind_of?(Enterprise) && params[:action] == 'index'
245	- enterprise_links
246	- elsif profile.kind_of?(Person) && params[:action] == 'index'
247	- myprofile_links
248	- elsif params[:action] == 'design_editor'
249	- design_links
250	- else
251	- []
252	- end
253	- when 'content_viewer'
254	- if params[:profile] == 'noosfero' && params[:page][0] == 'about'
255	- about_links
256	- else
257	- person_links
258	- end
259	- else
260	- []
261	- end.map{\|l\| link_if_permitted(l[0], l[1], l[2]) }
262	- end
263	-
264	-# def user_options
265	-# end
266	-
267	- def accessibility_link
268	- doc = Article.find_all_by_slug(_('accessibility')).select do \|a\|
269	- a.full_path.split(/\//).shift == 'noosfero'
270	- end[0]
271	- link_to_document doc, _('Accessibility'), :id => 'icon_accessibility' if doc
272	- end
273	-
274	def search_box	217	def search_box
275	[form_tag( :controller => 'search', :action => 'index'),	218	[form_tag( :controller => 'search', :action => 'index'),
276	submit_tag(_('Search'), :id => 'button_search'),	219	submit_tag(_('Search'), :id => 'button_search'),
1	<ul>	1	<ul>
2	- <li id='category' <%= 'class="active"' unless @category %> >
3	- <%= Noosfero::PROJECT.capitalize %>
4	- <ul>
5	- <li><%= link_to _('Home'), :controller => 'home' %> <%= header %></li>
6	- </ul>
7	- </li>
8	<% @environment.display_categories.each do \|item\| %>	2	<% @environment.display_categories.each do \|item\| %>
9	<li id='category<%= item.display_color %>' <%= 'class="active"' if (@category && (@category.top_ancestor == item)) %> >	3	<li id='category<%= item.display_color %>' <%= 'class="active"' if (@category && (@category.top_ancestor == item)) %> >
10	<%= item.name %>	4	<%= item.name %>