From 5840d762607aad6281fa665e8d1dee44deb4c3a1 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Thu, 20 Sep 2007 21:47:28 +0000 Subject: [PATCH] ActionItem70: adding initial implementation of top bar --- app/helpers/application_helper.rb | 7 +++++-- app/views/layouts/application.rhtml | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- public/artwork/newbar/menu.html | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------- public/designs/templates/default/images/bg_bgheader.png | Bin 229 -> 0 bytes public/designs/templates/default/images/bg_content.png | Bin 225 -> 0 bytes public/designs/templates/default/images/bg_footer.png | Bin 168 -> 0 bytes public/designs/templates/default/images/bg_header.png | Bin 23824 -> 0 bytes public/designs/templates/default/stylesheets/style.css | 12 +++++++----- public/images/bg_bgheader.png | Bin 0 -> 229 bytes public/images/bg_content.png | Bin 0 -> 225 bytes public/images/bg_footer.png | Bin 0 -> 168 bytes public/images/bg_header.png | Bin 0 -> 23824 bytes public/images/bg_item_bar_blue_active.png | Bin 0 -> 215 bytes public/images/bg_item_bar_blue_off.png | Bin 0 -> 223 bytes public/images/bg_item_bar_blue_on.png | Bin 0 -> 225 bytes public/images/bg_item_bar_red_active.png | Bin 0 -> 212 bytes public/images/bg_item_bar_red_off.png | Bin 0 -> 211 bytes public/images/bg_item_bar_red_on.png | Bin 0 -> 217 bytes public/images/bg_noosfero_bar.png | Bin 0 -> 238 bytes public/images/bg_noosfero_bar_red.png | Bin 0 -> 229 bytes public/images/icon_enter_mini.png | Bin 0 -> 278 bytes public/javascripts/menu.js | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/stylesheets/menu.css | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 23 files changed, 586 insertions(+), 169 deletions(-) delete mode 100644 public/designs/templates/default/images/bg_bgheader.png delete mode 100644 public/designs/templates/default/images/bg_content.png delete mode 100644 public/designs/templates/default/images/bg_footer.png delete mode 100644 public/designs/templates/default/images/bg_header.png create mode 100644 public/images/bg_bgheader.png create mode 100644 public/images/bg_content.png create mode 100644 public/images/bg_footer.png create mode 100644 public/images/bg_header.png create mode 100644 public/images/bg_item_bar_blue_active.png create mode 100644 public/images/bg_item_bar_blue_off.png create mode 100644 public/images/bg_item_bar_blue_on.png create mode 100644 public/images/bg_item_bar_red_active.png create mode 100644 public/images/bg_item_bar_red_off.png create mode 100644 public/images/bg_item_bar_red_on.png create mode 100644 public/images/bg_noosfero_bar.png create mode 100644 public/images/bg_noosfero_bar_red.png create mode 100644 public/images/icon_enter_mini.png create mode 100644 public/javascripts/menu.js create mode 100644 public/stylesheets/menu.css diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d0218ea..9b39d19 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -143,9 +143,12 @@ module ApplicationHelper content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') end - # FIXME def footer - 'nothing in the footer yet' + # FIXME: add some information from the environment + [ + content_tag('div', 'some information about this environment'), + content_tag('div', _('%s, version %s' % [ link_to(Noosfero::PROJECT, 'http://www.colivre.coop.br/Noosfero'), Noosfero::VERSION])), + ].join("\n") end # returns the current profile beign viewed. diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 6b6d0f3..911b9e1 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -4,61 +4,136 @@ <%= javascript_include_tag :defaults %> <%= design_all_header_tags %> <%= javascript_include_tag 'cms' %> - <%= javascript_include_tag 'menu' %> <% if params[:controller] == 'cms' %> <%= stylesheet_link_tag 'cms' %> <% end %> <%= stylesheet_link_tag 'common' %> + <%= stylesheet_link_tag 'menu' %> + <%= javascript_include_tag 'menu' %> - <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;" %> -
- <% unless flash[:notice].nil? %> -
- <%= flash[:notice] %> -
- <%= link_to_function( content_tag(:span, _('Close') ), visual_effect(:fade, "notice", :duration => 0.5), :id => 'button_close_notice' ) %> -
-
- <% end %> -
- -