From 8846c0896d2bde897f72690250449426da6f1881 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 24 Jan 2014 19:13:56 +0600 Subject: [PATCH] New Issues Page: update templates, comments actions --- .../WEB-INF/app/views/issues/search.html.erb | 8 ++ .../app/views/issues/templates/_issue.hbs.erb | 2 +- .../issues/templates/_issue_detail.hbs.erb | 85 ++++++++++--------- .../_issue_detail_comment_form.hbs.erb | 2 +- .../issues/templates/_issues_actions.hbs.erb | 32 +++---- .../WEB-INF/app/views/layouts/_head.html.erb | 1 - .../navigator/handlebars-extensions.js | 43 +++++++++- .../webapp/javascripts/navigator/issues.js | 32 ++++--- .../javascripts/third-party/moment.min.js | 6 -- sonar-server/wro.xml | 1 - 10 files changed, 134 insertions(+), 78 deletions(-) delete mode 100644 sonar-server/src/main/webapp/javascripts/third-party/moment.min.js diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb index 24a07d868d0..51c75cb7485 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb @@ -69,6 +69,14 @@ '<%= escape_javascript action -%>': '<%= escape_javascript message("issue.action.#{action}.formlink") -%>', <% end -%> }, + 'transitions': { + confirm: '<%= escape_javascript message('issue.transition.confirm') -%>', + unconfirm: '<%= escape_javascript message('issue.transition.unconfirm') -%>', + resolve: '<%= escape_javascript message('issue.transition.resolve') -%>', + falsepositive: '<%= escape_javascript message('issue.transition.falsepositive') -%>', + reopen: '<%= escape_javascript message('issue.transition.reopen') -%>', + close: '<%= escape_javascript message('issue.transition.close') -%>' + }, assignee: '<%= escape_javascript message('issue_filter.criteria.assignee') -%>', resolution: '<%= escape_javascript message('issue_filter.criteria.resolution') -%>', resolutions: { diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb index 74cca976847..c7101e02d09 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb @@ -7,7 +7,7 @@ {{/if}}
- {{fromNow updateDate}} + {{fUpdateAge}}
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb index 27f6129169d..83bf9b2f0b7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb @@ -123,7 +123,7 @@

<%= image_tag('reviews/comment.png') -%> {{userName}} - ({{fCreationDate}}) + ({{fCreatedAge}}) {{#if updatable}}  <%= image_tag 'sep12.png' -%>  @@ -137,46 +137,55 @@ {{/each}} - + {{/ifNotEmpty}}
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb index 0b1c4540f7f..1d9f7de5dd7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb @@ -8,7 +8,7 @@ - + <%= message('cancel') -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb index 6ad281c955c..c8ee1c91fc4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb @@ -1,19 +1,21 @@