diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-10-26 09:50:48 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-10-26 09:50:48 +0100 |
| commit | 81c7de07a6766809f7610a51883608f99f639af6 (patch) | |
| tree | 0d9494824c456f176f1ed8beb5ffd1e559739b53 | |
| parent | 98d0ae05725be4eb289452e324239b5b154ed835 (diff) | |
| parent | 549ab52a5762fe385ae273a44641d185f0e75252 (diff) | |
| download | sonarqube-81c7de07a6766809f7610a51883608f99f639af6.tar.gz sonarqube-81c7de07a6766809f7610a51883608f99f639af6.zip | |
Merge remote-tracking branch 'origin/branch-5.2'
| -rw-r--r-- | server/sonar-web/src/main/js/apps/background-tasks/stats.js | 6 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/stats.js b/server/sonar-web/src/main/js/apps/background-tasks/stats.js index cd6057b8912..b934075202b 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/stats.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/stats.js @@ -60,6 +60,7 @@ export default React.createClass({ return ( <span> <a ref="failureCount" onClick={this.onFailuresClick} className="emphasised-measure" + title="Count of projects where processing of most recent analysis report failed" href="#">{this.props.failuresCount}</a> {window.t('background_tasks.failures')} @@ -68,7 +69,10 @@ export default React.createClass({ } else { return ( <span> - <span ref="failureCount" className="emphasised-measure">{this.props.failuresCount}</span> + <span ref="failureCount" className="emphasised-measure" + title="Count of projects where processing of most recent analysis report failed"> + {this.props.failuresCount} + </span> {window.t('background_tasks.failures')} </span> diff --git a/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js b/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js index 680654fc37e..1860d5eaf2a 100644 --- a/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js +++ b/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js @@ -3,8 +3,8 @@ import React from 'react'; export default React.createClass({ renderLogo() { let url = this.props.logoUrl || `${window.baseUrl}/images/logo.svg`, - width = this.props.logoWidth || null, - height = this.props.logoWidth ? 30 : null, + width = this.props.logoWidth || 100, + height = 30, title = window.t('layout.sonar.slogan'); return <img src={url} width={width} height={height} alt={title} title={title}/>; }, |