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 %> -
- -