aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-06-30 11:08:56 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-06-30 11:09:03 +0200
commitc4290eed319bc9de42dd8eb6c73535578b6f917a (patch)
treef29f39798f4d191e1a08746746387b0a5eceeb8a
parent86fc3f7b843e11250ade0a178e473e1eb0095f52 (diff)
downloadsonarqube-c4290eed319bc9de42dd8eb6c73535578b6f917a.tar.gz
sonarqube-c4290eed319bc9de42dd8eb6c73535578b6f917a.zip
apply feedback for the quality profiles page
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js29
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.js2
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js11
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
4 files changed, 20 insertions, 23 deletions
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
index 62706071207..3023d9d3d21 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
@@ -131,44 +131,37 @@ export default class ProfileHeader extends React.Component {
</button>
<ul className="dropdown-menu dropdown-menu-right">
<li>
- <Link
- to={{ pathname: '/compare', query: { key: profile.key } }}
- id="quality-profile-compare">
- {translate('compare')}
- </Link>
- </li>
- <li>
<a href={activateMoreUrl}>
{translate('quality_profiles.activate_more_rules')}
</a>
</li>
<li>
+ <a id="quality-profile-backup" href={backupUrl}>
+ {translate('backup_verb')}
+ </a>
+ </li>
+ <li>
<Link
to={{ pathname: '/compare', query: { key: profile.key } }}
id="quality-profile-compare">
{translate('compare')}
</Link>
</li>
- <li>
- <a id="quality-profile-backup" href={backupUrl}>
- {translate('backup_verb')}
- </a>
- </li>
{canAdmin && (
<li>
- <a id="quality-profile-rename"
+ <a id="quality-profile-copy"
href="#"
- onClick={this.handleRenameClick.bind(this)}>
- {translate('rename')}
+ onClick={this.handleCopyClick.bind(this)}>
+ {translate('copy')}
</a>
</li>
)}
{canAdmin && (
<li>
- <a id="quality-profile-copy"
+ <a id="quality-profile-rename"
href="#"
- onClick={this.handleCopyClick.bind(this)}>
- {translate('copy')}
+ onClick={this.handleRenameClick.bind(this)}>
+ {translate('rename')}
</a>
</li>
)}
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.js b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.js
index 108b42c14b7..836e47653cc 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.js
@@ -75,7 +75,7 @@ export default class ProfileProjects extends React.Component {
e.target.blur();
new ChangeProjectsView({
profile: this.props.profile,
- loadProjects: this.loadProjects
+ loadProjects: this.props.updateProfiles
}).render();
}
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
index e153d03a216..cbb8e9de974 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import React from 'react';
-import { PropTypes as RouterPropTypes } from 'react-router';
+import { Link, PropTypes as RouterPropTypes } from 'react-router';
import groupBy from 'lodash/groupBy';
import pick from 'lodash/pick';
import sortBy from 'lodash/sortBy';
@@ -56,13 +56,16 @@ export default class ProfilesList extends React.Component {
<thead>
<tr>
<th>
- {language.name}
- {' ('}
+ <Link
+ to={{ pathname: '/', query: { language: language.key } }}
+ className="link-base-color">
+ {language.name}
+ </Link>
+ {', '}
{translateWithParameters(
'quality_profiles.x_profiles',
profilesCount
)}
- {')'}
{this.props.canAdmin && (
<button
className="huge-spacer-left js-restore-built-in"
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 ac158bc19fe..a4a27c7dfd9 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1787,6 +1787,7 @@ quality_profiles.deprecated_rules=Deprecated Rules
quality_profiles.x_deprecated_rules_are_still_activated={0} deprecated rule(s) are still activated on {1} quality profile(s):
quality_profiles.stagnant_profiles=Stagnant Profiles
quality_profiles.not_updated_more_than_year=The following profiles haven't been updated for more than 1 year:
+quality_profiles.exporters=Exporters