From: Stas Vilchik Date: Mon, 2 Feb 2015 08:28:54 +0000 (+0100) Subject: SONAR-5966 apply feedback X-Git-Tag: 5.1-RC1~475 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c4315f532063a37ae096aa546564021273dfb0e;p=sonarqube.git SONAR-5966 apply feedback --- diff --git a/server/sonar-web/src/main/hbs/issue/issue.hbs b/server/sonar-web/src/main/hbs/issue/issue.hbs index bae85b20c6b..f9825f28342 100644 --- a/server/sonar-web/src/main/hbs/issue/issue.hbs +++ b/server/sonar-web/src/main/hbs/issue/issue.hbs @@ -3,17 +3,11 @@
-
{{message}} {{t 'rule'}}
+
{{message}}
- {{#if debt}} -
- {{t 'issue.debt'}} {{debt}} -
- {{/if}} -
{{fromNow creationDate}}  @@ -89,6 +83,14 @@ {{/inArray}}
+ {{#if debt}} +
+ + {{tp 'issue.x_debt' debt}} + +
+ {{/if}} + {{#inArray actions "comment"}}
-  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} +  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}}   {{else}} -  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} +  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} {{/inArray}}
@@ -128,15 +130,15 @@
{{#each comments}}
-
 {{userName}} +
 {{userName}}
{{{show html htmlText}}}
({{fromNow createdAt}})
{{#if updatable}} - {{t 'edit'}}  - {{t 'delete'}} + + {{/if}}
diff --git a/server/sonar-web/src/main/js/translate.js b/server/sonar-web/src/main/js/translate.js index 6501ac910fa..4bc86736641 100644 --- a/server/sonar-web/src/main/js/translate.js +++ b/server/sonar-web/src/main/js/translate.js @@ -20,7 +20,7 @@ message = message.replace('{' + i + '}', p); }); } - return message || ''; + return message || (key + ' ' + args.join(' ')); }; diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less index 1b4d9aacc43..b4a0ec67399 100644 --- a/server/sonar-web/src/main/less/components/issues.less +++ b/server/sonar-web/src/main/less/components/issues.less @@ -70,9 +70,9 @@ } .issue-rule { - font-size: 11px; - font-weight: 400; - .link-no-underline; + padding: 0 3px; + background-color: fade(@blue, 30%); + opacity: 0.5; } .issue-component { @@ -160,6 +160,7 @@ .issue-comment { display: table; + width: 100%; } .issue-comment + .issue-comment { @@ -170,14 +171,17 @@ display: table-cell; vertical-align: top; max-width: 130px; + width: 1px; line-height: 18px; color: @secondFontColor; + font-weight: 500; .text-ellipsis; } .issue-comment-age { display: table-cell; vertical-align: top; + width: 1px; line-height: 18px; white-space: nowrap; color: @secondFontColor; @@ -195,6 +199,7 @@ .issue-comment-actions { display: table-cell; vertical-align: top; + width: 1px; padding-left: 5px; line-height: 18px; white-space: nowrap; diff --git a/server/sonar-web/src/main/less/icons.less b/server/sonar-web/src/main/less/icons.less index 189dfd35795..f111413d818 100644 --- a/server/sonar-web/src/main/less/icons.less +++ b/server/sonar-web/src/main/less/icons.less @@ -4,11 +4,11 @@ @font-face { font-family: 'sonar'; - src:url('../fonts/sonar-5.0.eot?'); - src:url('../fonts/sonar-5.0.eot?#iefix') format('embedded-opentype'), - url('../fonts/sonar-5.0.woff?') format('woff'), - url('../fonts/sonar-5.0.ttf?') format('truetype'), - url('../fonts/sonar-5.0.svg?#sonar') format('svg'); + src:url('../fonts/sonar-5.1.eot?'); + src:url('../fonts/sonar-5.1.eot?#iefix') format('embedded-opentype'), + url('../fonts/sonar-5.1.woff?') format('woff'), + url('../fonts/sonar-5.1.ttf?') format('truetype'), + url('../fonts/sonar-5.1.svg?#sonar') format('svg'); font-weight: normal; font-style: normal; } @@ -32,6 +32,10 @@ a[class^="icon-"], a[class*=" icon-"] { .link-no-underline; } +.icon-half-transparent { + opacity: 0.5; +} + /* * Colors @@ -541,6 +545,16 @@ a[class^="icon-"], a[class*=" icon-"] { content: "\f002"; font-size: @iconFontSize; } +.icon-edit:before { + content: "\f040"; + font-size: @iconFontSize; +} +.icon-ellipsis-h:before { + position: relative; + top: 1px; + content: "\f141"; + font-size: @iconSmallFontSize; +} /* diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.eot b/server/sonar-web/src/main/webapp/fonts/sonar-5.0.eot deleted file mode 100755 index 79dc7be85f6..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.eot and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.svg b/server/sonar-web/src/main/webapp/fonts/sonar-5.0.svg deleted file mode 100755 index f9b5034ccc6..00000000000 --- a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.ttf b/server/sonar-web/src/main/webapp/fonts/sonar-5.0.ttf deleted file mode 100755 index b0e9bcfbdd8..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.ttf and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.woff b/server/sonar-web/src/main/webapp/fonts/sonar-5.0.woff deleted file mode 100755 index 3ebd1fff3bd..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.0.woff and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.1.eot b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.eot new file mode 100755 index 00000000000..a7e6b566e4b Binary files /dev/null and b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.eot differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.1.svg b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.svg new file mode 100755 index 00000000000..c869c17dce5 --- /dev/null +++ b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.svg @@ -0,0 +1,85 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.1.ttf b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.ttf new file mode 100755 index 00000000000..26ef2b9f786 Binary files /dev/null and b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.ttf differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.1.woff b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.woff new file mode 100755 index 00000000000..f2d222278fe Binary files /dev/null and b/server/sonar-web/src/main/webapp/fonts/sonar-5.1.woff differ 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 1d4481d83d4..410557c39c3 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -701,6 +701,7 @@ issue.reported_by=Reported by issue.authorLogin=Author: issue.component_deleted=Removed issue.debt=Debt: +issue.x_debt={0} debt issue.technical_debt=Technical Debt: issue.technical_debt_short=Debt issue.technical_debt_deleted=Rule not configured to generate technical debt estimate.