From c310b49e7e463621296e8efd4618afc39ec74a43 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 7 Oct 2014 14:56:22 +0200 Subject: SONAR-5598 The ">" icon used on filters in the headers is confusing --- .../main/hbs/component-viewer/header/_cw-header-link.hbs | 4 ++-- .../main/hbs/component-viewer/header/cw-issues-header.hbs | 14 +++++++------- .../src/main/hbs/component-viewer/header/cw-scm-header.hbs | 2 +- .../main/hbs/component-viewer/header/cw-tests-header.hbs | 2 +- server/sonar-web/src/main/less/component-viewer.less | 2 +- server/sonar-web/src/main/less/icons.less | 5 +++++ 6 files changed, 17 insertions(+), 12 deletions(-) (limited to 'server') diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs index 70f66492319..f61e72781c6 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs @@ -1,5 +1,5 @@
  • {{t 'metric' label 'name'}} {{value}} - -
    • \ No newline at end of file + + diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs index 91ba1ecc927..4f8fcbfbcd9 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs @@ -14,31 +14,31 @@ {{#if currentIssue}}
  • {{t 'component_viewer.issues.current_issue'}} - +
    • {{/if}} {{#unless state.removed}}
  • {{t 'component_viewer.issues.unresolved_issues'}} - +
    • {{/unless}} {{#unless state.removed}}
  • {{t 'component_viewer.issues.open_issues'}} - +
    • {{/unless}} {{#unless state.removed}}
  • {{t 'component_viewer.issues.fixed_issues'}} - +
    • {{/unless}} {{#unless state.removed}}
  • {{t 'component_viewer.issues.false_positive_issues'}} - +
    • {{/unless}} @@ -55,7 +55,7 @@
  • {{severityIcon key}} {{name}} {{count}} - +
    • {{else}}
  • @@ -79,7 +79,7 @@
  • {{name}} {{count}} - +
    • {{else}}
  • diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs index 2cf3da9e995..d208b7cb185 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs @@ -8,7 +8,7 @@ diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs index c11d69bc279..6cba8cef9c4 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs @@ -72,7 +72,7 @@ {{#if coveredLines}} {{coveredLines}} {{/if}} - +
    • {{else}}
  • diff --git a/server/sonar-web/src/main/less/component-viewer.less b/server/sonar-web/src/main/less/component-viewer.less index 58ee62b571d..a24fcd828ab 100644 --- a/server/sonar-web/src/main/less/component-viewer.less +++ b/server/sonar-web/src/main/less/component-viewer.less @@ -556,7 +556,7 @@ & > i { position: absolute; top: 50%; - right: 10px; + right: 6px; margin-top: -7px; } diff --git a/server/sonar-web/src/main/less/icons.less b/server/sonar-web/src/main/less/icons.less index f13dc75e7d5..fa174f8b19b 100644 --- a/server/sonar-web/src/main/less/icons.less +++ b/server/sonar-web/src/main/less/icons.less @@ -516,6 +516,11 @@ a[class^="icon-"], a[class*=" icon-"] { content: "\f016"; font-size: @iconFontSize; } +.icon-component-viewer-filter:before { + content: "\e60e"; + color: #999; + font-size: @iconSmallFontSize; +} /* -- cgit v1.2.3 From 7de8c46bddf3614a3324efbcbdab5539f92533e0 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 7 Oct 2014 14:59:48 +0200 Subject: SONAR-5632 Clicking "Download" on the "System Info" page fails --- .../src/main/webapp/WEB-INF/app/controllers/system_controller.rb | 8 ++++++-- server/sonar-web/src/main/webapp/WEB-INF/app/models/server.rb | 9 ++++----- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'server') diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb index d29a32f37d6..1c86a0f75b5 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb @@ -25,11 +25,15 @@ class SystemController < ApplicationController def index @server=Server.new - + + filename = 'SystemInfo' + server_id = @server.sonar_property(ServerIdConfigurationController::PROPERTY_SERVER_ID) + filename += '-' + server_id.to_s if server_id + respond_to do |format| format.html format.csv { - send_data(to_csv, :type => 'text/csv; charset=utf-8', :disposition => 'attachment; filename=sonar_system_info.csv') + send_data(to_csv, :type => 'text/csv; charset=utf-8', :disposition => "attachment; filename=#{filename}.csv") } end end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/server.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/server.rb index 8e8514384f4..a5dec04afa9 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/server.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/server.rb @@ -20,7 +20,7 @@ class Server def info - system_info + sonar_info + system_statistics + sonar_plugins + system_properties + search_info + system_info + sonar_info + system_statistics + sonar_plugins + system_properties + cluster_info + nodes_info end def system_info @@ -129,6 +129,9 @@ class Server system_properties end + def sonar_property(key) + Java::OrgSonarServerUi::JRubyFacade.getInstance().getContainer().getComponentByType(Java::OrgApacheCommonsConfiguration::Configuration.java_class).getProperty(key) + end private @@ -155,10 +158,6 @@ class Server java.text.SimpleDateFormat.new("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(date) end - def sonar_property(key) - Java::OrgSonarServerUi::JRubyFacade.getInstance().getContainer().getComponentByType(Java::OrgApacheCommonsConfiguration::Configuration.java_class).getProperty(key) - end - def realm_name realm_factory = Api::Utils.java_facade.getCoreComponentByClassname('org.sonar.server.user.SecurityRealmFactory') if realm_factory && realm_factory.getRealm() -- cgit v1.2.3