From 1aea9af53ca430984e3bbcd6b665a36924390b3d Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 14 May 2012 16:20:22 +0200 Subject: [PATCH] SONAR-3375 Add a warning message in the footer when the browser is IE6 --- .../resources/org/sonar/l10n/core.properties | 1 + .../WEB-INF/app/controllers/ie6_controller.rb | 27 ------- .../WEB-INF/app/views/ie6/index.css.erb | 78 ------------------- .../WEB-INF/app/views/layouts/_head.html.erb | 1 - .../app/views/layouts/_layout.html.erb | 1 + .../src/main/webapp/stylesheets/style.css | 5 ++ 6 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/controllers/ie6_controller.rb delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index 516ca6a8881..1208c915a3e 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -279,6 +279,7 @@ layout.documentation=Documentation layout.ask_a_questions=Ask a question layout.plugins=Plugins layout.evaluation=Embedded database should be used for evaluation purpose only +layout.ie6_warn=IE6 is not supported sidebar.project_settings=Configuration sidebar.security=Security diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/ie6_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/ie6_controller.rb deleted file mode 100644 index 0ee201d22df..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/ie6_controller.rb +++ /dev/null @@ -1,27 +0,0 @@ -# -# Sonar, open source software quality management tool. -# Copyright (C) 2008-2012 SonarSource -# mailto:contact AT sonarsource DOT com -# -# Sonar is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 3 of the License, or (at your option) any later version. -# -# Sonar is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with Sonar; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 -# -class Ie6Controller < ApplicationController - layout nil - - def index - file_path = "#{RAILS_ROOT}/app/views/ie6/index.css.erb" - render :file => file_path, :content_type => "text/css" - end -end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb deleted file mode 100644 index 4ff4ffe8195..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb +++ /dev/null @@ -1,78 +0,0 @@ -* html .png{ -position:relative; -behavior: expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", -this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "', sizingMethod='image')", -this.src = "<%= ApplicationController.root_context -%>/images/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), -this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "', sizingMethod='crop')", -this.runtimeStyle.backgroundImage = "none")),this.pngSet=true) -); -} -div#page { - overflow-x: auto; -} -div#content { - padding-top: 10px; - display: inline-block; -} -#hdadmin img { - padding-top: 8px; -} - -.tabs { - border-bottom: 0; -} - -.tabs .tab { - vertical-align: bottom; - border-style: solid; - border-width: 1px; - padding-top: 1px; - padding-right: 5px; - padding-left: 6px; - padding-bottom: 5px; -} - -.tabs .tab.selected { - vertical-align: bottom; - border-style: solid; - border-width: 1px; - padding-top: 1px; - padding-right: 5px; - padding-left: 6px; - padding-bottom: 5px; -} - -.tabs .tab.selected a { - background-color: #eee; - color: #333333; -} - -.smalltabs .tab.selected a { - background-color: #eee; - color: #333333; -} -table.data tbody tr { - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; -} -table.data thead tr { - height: 20px; - border: 0; -} -table.data thead tr th, table.data tbody tr td { - border-bottom: 1px solid #DDD; - padding: 3px 5px; - height: 20px; - vertical-align: top; -} -table.data thead tr th { - font-weight: bold; -} -table.data tfoot tr td { - border-bottom: 0; - padding: 3px 5px; -} -#page-operations { - clear: both; - display: block; -} \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index 6441dc9ed7f..3b8e5bb7bfc 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -32,7 +32,6 @@ <%= javascript_include_tag 'duplication' %> <%= javascript_include_tag 'resource' %> <% end %> - <% diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index 6e61d766e14..b9da26594a3 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -207,6 +207,7 @@ <% unless DatabaseVersion.production? %>
<%= message('layout.evaluation') -%> <% end %> + <% end %> diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index 10ad01d82d5..6a4174cc180 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -237,6 +237,11 @@ div#sidebar .selected a, div#sidebar .selected a:hover, div#sidebar.selected a:v padding: 4px 0; margin-top: 10px; } +.ie6-warn { + color: #EEE; + background: #FF5252; + padding: 0 5px; +} #ftlinks a { color: #444; -- 2.39.5