SONAR-10428 Remove old icons (#13)

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
index 637a81005473fbec297f72b2d40115789a077121..f3fb35559e72e180ea181aa2adc046a7794e1b55 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
@@ -19,7 +19,6 @@
  */
 import React from 'react';
 import { sortBy, uniqBy } from 'lodash';
-import ConditionsAlert from './ConditionsAlert';
 import AddConditionForm from './AddConditionForm';
 import Condition from './Condition';
 import { translate, getLocalizedMetricName } from '../../../helpers/l10n';
@@ -89,10 +88,10 @@ export default class Conditions extends React.PureComponent {
       metric: metrics[condition.metric]
     }));
     return (
-      <div id="quality-gate-conditions" className="quality-gate-section">
+      <div className="quality-gate-section" id="quality-gate-conditions">
         <h3 className="spacer-bottom">{translate('quality_gates.conditions')}</h3>
 
-        <ConditionsAlert />
+        <div className="big-spacer-bottom">{translate('quality_gates.introduction')}</div>
 
         {this.state.error && <div className="alert alert-danger">{this.state.error}</div>}
 
@@ -108,7 +107,7 @@ export default class Conditions extends React.PureComponent {
         )}
 
         {sortedConditions.length ? (
-          <table id="quality-gate-conditions" className="data zebra zebra-hover">
+          <table className="data zebra zebra-hover" id="quality-gate-conditions">
             <thead>
               <tr>
                 <th className="nowrap">{translate('quality_gates.conditions.metric')}</th>

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionsAlert.js b/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionsAlert.js
deleted file mode 100644 (file)
index e0e9e3c..0000000
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionsAlert.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-import React, { Component } from 'react';
-import AlertErrorIcon from '../../../components/icons-components/AlertErrorIcon';
-import AlertSuccessIcon from '../../../components/icons-components/AlertSuccessIcon';
-import AlertWarnIcon from '../../../components/icons-components/AlertWarnIcon';
-import { translate } from '../../../helpers/l10n';
-
-export default class ConditionsAlert extends Component {
-  state = {
-    expanded: false
-  };
-
-  handleMoreClick(e) {
-    e.preventDefault();
-    this.setState({ expanded: true });
-  }
-
-  render() {
-    const { expanded } = this.state;
-
-    return (
-      <div className="big-spacer-bottom">
-        {translate('quality_gates.introduction')}
-        {!expanded && (
-          <a className="spacer-left" href="#" onClick={this.handleMoreClick.bind(this)}>
-            {translate('more')}
-          </a>
-        )}
-        {expanded && (
-          <div className="spacer-top">
-            {translate('quality_gates.health_icons')}
-            <ul>
-              <li className="little-spacer-top">
-                <AlertSuccessIcon /> {translate('alerts.notes.ok')}
-              </li>
-              <li className="little-spacer-top">
-                <AlertWarnIcon /> {translate('alerts.notes.warn')}
-              </li>
-              <li className="little-spacer-top">
-                <AlertErrorIcon /> {translate('alerts.notes.error')}
-              </li>
-            </ul>
-          </div>
-        )}
-      </div>
-    );
-  }
-}

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 2485efae2c7bb175ebd16dc912c75fdd646abd03..7e76dfebc6f77a37a69923b3db76477903aef4f7 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1356,9 +1356,6 @@ notification.dispatcher.CeReportTaskFailure.project=Background tasks in failure
 #
 #------------------------------------------------------------------------------
 
-alerts.notes.ok=at least one threshold is defined, no threshold is reached.
-alerts.notes.warn=at least one warning threshold is reached, no error threshold is reached.
-alerts.notes.error=at least one error threshold is reached.
 alerts.operator.<=is less than
 alerts.operator.>=is greater than
 alerts.operator.\==equals