diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-10-15 13:51:08 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-10-15 13:51:08 +0200 |
| commit | 3fc06759b070622cd13c3dba4ea9b4dcbb18db18 (patch) | |
| tree | 2a15e5aa0f08e32c4565d49078e67f95d81607d7 | |
| parent | cb433cccdd4f8cc822d948589726fc4c4122f20a (diff) | |
| download | sonarqube-3fc06759b070622cd13c3dba4ea9b4dcbb18db18.tar.gz sonarqube-3fc06759b070622cd13c3dba4ea9b4dcbb18db18.zip | |
SONAR-6834 update background task status indicators to mix with quality gate statuses
| -rw-r--r-- | server/sonar-web/src/main/js/apps/background-tasks/tasks.js | 6 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js index 8d3753e7d13..c469637204d 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js @@ -26,13 +26,13 @@ export default React.createClass({ inner = <i className="spinner"/>; break; case STATUSES.SUCCESS: - inner = <i className="icon-test-status-ok"/>; + inner = <span className="badge badge-success">{window.t('background_task.status.SUCCESS')}</span>; break; case STATUSES.FAILED: - inner = <i className="icon-test-status-error"/>; + inner = <span className="badge badge-danger">{window.t('background_task.status.FAILED')}</span>; break; case STATUSES.CANCELED: - inner = <i className="icon-test-status-skipped"/>; + inner = <span className="badge badge-muted">{window.t('background_task.status.CANCELED')}</span>; break; default: inner = ''; diff --git a/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx b/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx index 45061352e56..77cceaabc66 100644 --- a/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx +++ b/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx @@ -4,8 +4,7 @@ import PendingIcon from '../../../components/shared/pending-icon'; export default React.createClass({ render() { let metaList = [], - // FIXME check right permission - canSeeBackgroundTasks = this.props.conf.showSettings, + canSeeBackgroundTasks = this.props.conf.showBackgroundTasks, backgroundTasksUrl = `${baseUrl}/project/background_tasks?id=${encodeURIComponent(this.props.component.key)}`; if (this.props.isInProgress) { @@ -32,7 +31,7 @@ export default React.createClass({ window.t('component_navigation.status.failed'); metaList.push( <li key="isFailed" data-toggle="tooltip" title={tooltip}> - <i className="icon-test-status-error"/> <span className="text-danger">{window.t('background_task.status.FAILED')}</span> + <span className="badge badge-danger">{window.t('background_task.status.FAILED')}</span> </li> ); } |