From 2be63d418cd56160575e80164fe700e229a66f35 Mon Sep 17 00:00:00 2001 From: "steffen.jurrack" Date: Fri, 14 Sep 2012 11:03:32 +0200 Subject: [PATCH] fixing wrong class name bug, refactoring ids to classes where needed --- app/views/banner/_after_top_menu.haml | 2 +- app/views/banner/_before_main_menu.haml | 2 +- app/views/banner/_body_bottom.haml | 6 +++--- app/views/banner/_project_body_bottom.haml | 6 +++--- app/views/banner/_show.haml | 2 +- assets/stylesheets/banner.css | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/views/banner/_after_top_menu.haml b/app/views/banner/_after_top_menu.haml index ad225d5..cc61da0 100644 --- a/app/views/banner/_after_top_menu.haml +++ b/app/views/banner/_after_top_menu.haml @@ -1,5 +1,5 @@ = render :partial=>'banner/body_bottom' :javascript document.observe("dom:loaded", function() { - new Insertion.After($('top-menu'), $('banner_area')); + new Insertion.After($('header'), $('.banner_area')); }); \ No newline at end of file diff --git a/app/views/banner/_before_main_menu.haml b/app/views/banner/_before_main_menu.haml index 368809c..0a7e0d7 100644 --- a/app/views/banner/_before_main_menu.haml +++ b/app/views/banner/_before_main_menu.haml @@ -1,5 +1,5 @@ = render :partial=>'banner/project_body_bottom' :javascript document.observe("dom:loaded", function() { - new Insertion.Before($('main-menu'), $('project_banner_area')); + new Insertion.Before($('main-menu'), $('.project_banner_area')); }); \ No newline at end of file diff --git a/app/views/banner/_body_bottom.haml b/app/views/banner/_body_bottom.haml index 6f68375..b548036 100644 --- a/app/views/banner/_body_bottom.haml +++ b/app/views/banner/_body_bottom.haml @@ -1,8 +1,8 @@ -#banner_area.banner_area - #banner_content{:class=>"banner.banner_#{Setting.plugin_redmine_banner['type']}"} +.banner_area + .banner_content{:class=>"banner banner_#{Setting.plugin_redmine_banner['type']}"} = textilizable Setting.plugin_redmine_banner['banner_description'] -if User.current.admin? && (params[:controller] != 'settings' && params[:action] != 'settings' && params[:id] != 'redmine_banner') - #banner_edit + .banner_edit = link_to l(:button_edit), {:controller => 'settings', :action => 'plugin', :id => 'redmine_banner'}, {:class => 'icon banner-icon-edit', :title => l(:button_edit)} %a.icon.banner-icon-off{:href=>"#", :onclick=>"", :title=>"#{l(:banner_off)}"}= l(:button_off) diff --git a/app/views/banner/_project_body_bottom.haml b/app/views/banner/_project_body_bottom.haml index 914d04e..a501929 100644 --- a/app/views/banner/_project_body_bottom.haml +++ b/app/views/banner/_project_body_bottom.haml @@ -4,12 +4,12 @@ -display_part = banner.display_part -return '' unless BannerHelper.is_action_to_display?(@_controller, display_part) -#project_banner_area.banner_area - #banner_content{:class=>"banner banner_#{banner.style}"} +.project_banner_area.banner_area + .banner_content{:class=>"banner banner_#{banner.style}"} =textilizable banner.banner_description -if authorize_for(:banner, :edit) - #banner_edit + .banner_edit = link_to(l(:button_edit), {:controller => 'projects', :action => "settings", :id => @project, :tab => 'banner'}, {:class => 'icon banner-icon-edit', :title => l(:button_edit)}) diff --git a/app/views/banner/_show.haml b/app/views/banner/_show.haml index 45650db..f6a5488 100644 --- a/app/views/banner/_show.haml +++ b/app/views/banner/_show.haml @@ -2,7 +2,7 @@ -@banner = Banner.find_or_create(@project.id) = labelled_form_for :settings, @banner, :url => {:controller => 'banner', :action => 'edit', :project_id => @project, :tab => 'banner', :setting_id => @banner.id}, :html => {:id => 'banner' } do |f| = error_messages_for 'banner' - #box + .box %p= f.check_box :enabled, :label => l(:button_activate) %p = content_tag(:label, l(:label_message_type)) diff --git a/assets/stylesheets/banner.css b/assets/stylesheets/banner.css index a87cd42..d564d73 100644 --- a/assets/stylesheets/banner.css +++ b/assets/stylesheets/banner.css @@ -88,15 +88,15 @@ span.use_timer { padding-right: 20px; } -div#banner_area { +div.banner_area { position:relative; } -div#project_banner_area { +div.project_banner_area { position:relative; } -div#banner_area div#banner_edit { +div.banner_area div.banner_edit { display:block; position:absolute; bottom:5px; @@ -109,7 +109,7 @@ div#banner_area div#banner_edit { opacity: 0.3; } -div#banner_area div#banner_edit:hover { +div.banner_area div.banner_edit:hover { filter: alpha(opacity=80); -moz-opacity: 0.8; opacity: 0.8; @@ -122,7 +122,7 @@ div#banner_area div#banner_edit:hover { background-image: url(../images/edit.png); } -div#project_banner_area div#banner_edit { +div.project_banner_area div.banner_edit { display:block; position:absolute; bottom:5px; @@ -135,7 +135,7 @@ div#project_banner_area div#banner_edit { opacity: 0.3; } -div#project_banner_area div#banner_edit:hover { +div.project_banner_area div.banner_edit:hover { filter: alpha(opacity=80); -moz-opacity: 0.8; opacity: 0.8;