From 6d5f68a9de9c3c0365921ad95304ea7051640c7b Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 22 Jul 2014 12:03:41 +0200
Subject: [PATCH] Move ruby templates to handlebars

---
 server/sonar-web/Gruntfile.coffee             |   8 +-
 .../component-viewer/coverage-popup.coffee    |   2 +-
 .../covered-files-popup.coffee                |   2 +-
 .../component-viewer/duplication-popup.coffee |   2 +-
 .../coffee/component-viewer/header.coffee     |   2 +-
 .../header/basic-header.coffee                |   2 +-
 .../header/coverage-header.coffee             |   4 +-
 .../header/duplications-header.coffee         |   2 +-
 .../header/issues-header.coffee               |   2 +-
 .../header/more-actions.coffee                |   4 +-
 .../component-viewer/header/scm-header.coffee |   2 +-
 .../header/tests-header.coffee                |   2 +-
 .../line-actions-popup.coffee                 |   4 +-
 .../main/coffee/component-viewer/main.coffee  |   2 +-
 .../coffee/component-viewer/source.coffee     |   8 +-
 .../time-changes-popup.coffee                 |   2 +-
 .../coffee/component-viewer/workspace.coffee  |   2 +-
 .../collections/action-plans.coffee           |   0
 .../{issues => issue}/issue-view.coffee       |  20 +--
 .../manual-issue-view.coffee                  |   2 +-
 .../models/change-log.coffee                  |   0
 .../{issues => issue}/models/issue.coffee     |   0
 .../{issues => issue}/models/rule.coffee      |   0
 .../views/assign-form-view.coffee             |   2 +-
 .../views/change-log-view.coffee              |   4 +-
 .../views/comment-form-view.coffee            |   4 +-
 .../views/plan-form-view.coffee               |   4 +-
 .../{issues => issue}/views/rule-view.coffee  |   4 +-
 .../views/set-severity-form-view.coffee       |   4 +-
 .../{code-expand.hbs => cw-code-expand.hbs}   |   0
 ...overagePopup.hbs => cw-coverage-popup.hbs} |   0
 ...tionPopup.hbs => cw-duplication-popup.hbs} |   0
 .../{header.hbs => cw-header.hbs}             |   0
 .../{layout.hbs => cw-layout.hbs}             |   0
 ...ns-popup.hbs => cw-line-options-popup.hbs} |   0
 .../{more-actions.hbs => cw-more-actions.hbs} |   0
 .../{source.hbs => cw-source.hbs}             |   0
 ...es-popup.hbs => cw-time-changes-popup.hbs} |   0
 .../{workspace.hbs => cw-workspace.hbs}       |   0
 .../{_header-item.hbs => _cw-header-item.hbs} |   0
 .../{_header-link.hbs => _cw-header-link.hbs} |   0
 .../{basic-header.hbs => cw-basic-header.hbs} |   0
 ...rage-header.hbs => cw-coverage-header.hbs} |   0
 ...s-popup.hbs => cw-covered-files-popup.hbs} |   0
 ...-header.hbs => cw-duplications-header.hbs} |   0
 ...issues-header.hbs => cw-issues-header.hbs} |   0
 .../{scm-header.hbs => cw-scm-header.hbs}     |   0
 .../{tests-header.hbs => cw-tests-header.hbs} |   0
 .../hbs/{issues => issue}/assign-form.hbs     |   0
 .../main/hbs/{issues => issue}/change-log.hbs |   0
 .../hbs/{issues => issue}/comment-form.hbs    |   0
 .../src/main/hbs/{issues => issue}/issue.hbs  |   0
 .../hbs/{issues => issue}/manual-issue.hbs    |   0
 .../main/hbs/{issues => issue}/plan-form.hbs  |   0
 .../src/main/hbs/{issues => issue}/rule.hbs   |   0
 .../{issues => issue}/set-severity-form.hbs   |   0
 .../src/main/hbs/issues/filter-bar.hbs        |   2 +
 .../src/main/hbs/issues/issue-detail.hbs      |  20 +++
 .../src/main/hbs/issues/issues-actions.hbs    |  27 +++
 .../issues/issues-details-favorite-filter.hbs |  13 ++
 .../src/main/hbs/issues/issues-header.hbs     |  39 ++++
 .../sonar-web/src/main/hbs/issues/issues.hbs  |   4 +
 .../src/main/hbs/issues/no-issues.hbs         |   1 +
 .../main/hbs/navigator/ajax-select-filter.hbs |   5 +
 .../hbs/navigator/base-details-filter.hbs     |   1 +
 .../src/main/hbs/navigator/base-filter.hbs    |   5 +
 .../main/hbs/navigator/checkbox-filter.hbs    |   4 +
 .../main/hbs/navigator/choice-filter-item.hbs |  13 ++
 .../src/main/hbs/navigator/choice-filter.hbs  |   2 +
 .../hbs/navigator/favorite-details-filter.hbs |  13 ++
 .../main/hbs/navigator/favorite-filter.hbs    |   1 +
 .../src/main/hbs/navigator/metric-filter.hbs  |  27 +++
 .../more-criteria-details-filter.hbs          |   9 +
 .../hbs/navigator/more-criteria-filter.hbs    |   1 +
 .../src/main/hbs/navigator/range-filter.hbs   |   5 +
 .../src/main/hbs/navigator/string-filter.hbs  |   3 +
 .../main/js/common/handlebars-extensions.js   |   4 +-
 server/sonar-web/src/main/js/issues/extra.js  |  24 +--
 server/sonar-web/src/main/js/measures/app.js  |   2 +-
 .../main/js/measures/measures-filter-bar.js   |   7 +
 .../navigator/filters/ajax-select-filters.js  |   5 +-
 .../main/js/navigator/filters/base-filters.js |  11 +-
 .../js/navigator/filters/checkbox-filters.js  |   5 +-
 .../js/navigator/filters/choice-filters.js    |   7 +-
 .../js/navigator/filters/favorite-filters.js  |   7 +-
 .../main/js/navigator/filters/filter-bar.js   |   1 -
 .../js/navigator/filters/metric-filters.js    |   8 +-
 .../filters/more-criteria-filters.js          |   7 +-
 .../js/navigator/filters/range-filters.js     |   8 +-
 .../js/navigator/filters/string-filters.js    |   8 +-
 .../app/views/coding_rules/index.html.erb     |   3 -
 .../WEB-INF/app/views/issues/search.html.erb  |  15 --
 .../templates/_filter_bar_template.hbs.erb    |   4 -
 .../views/issues/templates/_header.hbs.erb    |  41 -----
 .../app/views/issues/templates/_issue.hbs.erb |  22 ---
 .../issues/templates/_issue_detail.hbs.erb    |  51 ------
 .../_issue_detail_assign_form.hbs.erb         |  11 --
 .../_issue_detail_comment_form.hbs.erb        |  18 --
 .../templates/_issue_detail_inner.hbs.erb     | 166 ------------------
 .../templates/_issue_detail_plan_form.hbs.erb |  22 ---
 .../templates/_issue_detail_rule.hbs.erb      |   9 -
 .../_issue_detail_set_severity_form.hbs.erb   |  16 --
 .../views/issues/templates/_issues.hbs.erb    |   6 -
 .../issues/templates/_issues_actions.hbs.erb  |  29 ---
 .../_issues_details_favorite_filter.hbs.erb   |  15 --
 .../views/issues/templates/_no_issues.hbs.erb |   3 -
 .../app/views/measures/search.html.erb        |   2 -
 .../navigator/_filter_templates.html.erb      |  13 --
 .../_ajax_select_filter_template.hbs.erb      |   7 -
 .../_base_details_filter_template.hbs.erb     |   3 -
 .../templates/_base_filter_template.hbs.erb   |   7 -
 .../_checkbox_filter_template.hbs.erb         |   6 -
 .../_choice_filter_item_template.hbs.erb      |  15 --
 .../templates/_choice_filter_template.hbs.erb |   4 -
 .../_favorite_details_filter_template.hbs.erb |  15 --
 .../_favorite_filter_template.hbs.erb         |   3 -
 .../templates/_metric_filter_template.hbs.erb |  29 ---
 ...e_criteria_details_filter_template.hbs.erb |  11 --
 .../_more_criteria_filter_template.hbs.erb    |   3 -
 .../templates/_range_filter_template.hbs.erb  |   7 -
 .../templates/_string_filter_template.hbs.erb |   5 -
 121 files changed, 314 insertions(+), 642 deletions(-)
 rename server/sonar-web/src/main/coffee/{issues => issue}/collections/action-plans.coffee (100%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/issue-view.coffee (95%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/manual-issue-view.coffee (98%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/models/change-log.coffee (100%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/models/issue.coffee (100%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/models/rule.coffee (100%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/assign-form-view.coffee (99%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/change-log-view.coffee (81%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/comment-form-view.coffee (94%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/plan-form-view.coffee (95%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/rule-view.coffee (93%)
 rename server/sonar-web/src/main/coffee/{issues => issue}/views/set-severity-form-view.coffee (94%)
 rename server/sonar-web/src/main/hbs/component-viewer/{code-expand.hbs => cw-code-expand.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{coveragePopup.hbs => cw-coverage-popup.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{duplicationPopup.hbs => cw-duplication-popup.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{header.hbs => cw-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{layout.hbs => cw-layout.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{line-options-popup.hbs => cw-line-options-popup.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{more-actions.hbs => cw-more-actions.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{source.hbs => cw-source.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{time-changes-popup.hbs => cw-time-changes-popup.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/{workspace.hbs => cw-workspace.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{_header-item.hbs => _cw-header-item.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{_header-link.hbs => _cw-header-link.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{basic-header.hbs => cw-basic-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{coverage-header.hbs => cw-coverage-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{covered-files-popup.hbs => cw-covered-files-popup.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{duplications-header.hbs => cw-duplications-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{issues-header.hbs => cw-issues-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{scm-header.hbs => cw-scm-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/component-viewer/header/{tests-header.hbs => cw-tests-header.hbs} (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/assign-form.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/change-log.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/comment-form.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/issue.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/manual-issue.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/plan-form.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/rule.hbs (100%)
 rename server/sonar-web/src/main/hbs/{issues => issue}/set-severity-form.hbs (100%)
 create mode 100644 server/sonar-web/src/main/hbs/issues/filter-bar.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/issue-detail.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/issues-actions.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/issues-details-favorite-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/issues-header.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/issues.hbs
 create mode 100644 server/sonar-web/src/main/hbs/issues/no-issues.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/ajax-select-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/base-details-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/base-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/checkbox-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/choice-filter-item.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/choice-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/favorite-details-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/favorite-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/metric-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/more-criteria-details-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/more-criteria-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/range-filter.hbs
 create mode 100644 server/sonar-web/src/main/hbs/navigator/string-filter.hbs
 create mode 100644 server/sonar-web/src/main/js/measures/measures-filter-bar.js
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb
 delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb

diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index 96ac5583ac9..845cfb36694 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -216,6 +216,9 @@ module.exports = (grunt) ->
 
       build:
         files:
+          '<%= pkg.assets %>js/templates/navigator.js': [
+            '<%= pkg.sources %>hbs/navigator/**/*.hbs'
+          ]
           '<%= pkg.assets %>js/templates/coding-rules.js': [
             '<%= pkg.sources %>hbs/common/**/*.hbs'
             '<%= pkg.sources %>hbs/coding-rules/**/*.hbs'
@@ -226,8 +229,11 @@ module.exports = (grunt) ->
           '<%= pkg.assets %>js/templates/component-viewer.js': [
             '<%= pkg.sources %>hbs/component-viewer/**/*.hbs'
           ]
-          '<%= pkg.assets %>js/templates/issues.js': [
+          '<%= pkg.assets %>js/templates/issue.js': [
             '<%= pkg.sources %>hbs/common/**/*.hbs'
+            '<%= pkg.sources %>hbs/issue/**/*.hbs'
+          ]
+          '<%= pkg.assets %>js/templates/issues.js': [
             '<%= pkg.sources %>hbs/issues/**/*.hbs'
           ]
           '<%= pkg.assets %>js/templates/api-documentation.js': [
diff --git a/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
index 9311fef5b1c..f91747cbeec 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/coverage-popup.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class CoveragePopupView extends Popup
-    template: Templates['coveragePopup']
+    template: Templates['cw-coverage-popup']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/covered-files-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/covered-files-popup.coffee
index 2d6a37a135b..cd259388305 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/covered-files-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/covered-files-popup.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class CoveredFilesPopupView extends Popup
-    template: Templates['covered-files-popup']
+    template: Templates['cw-covered-files-popup']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/duplication-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/duplication-popup.coffee
index 108da019e95..cd24e404ac4 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/duplication-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/duplication-popup.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class DuplicationPopupView extends Popup
-    template: Templates['duplicationPopup']
+    template: Templates['cw-duplication-popup']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header.coffee
index 6695c5be324..44fdef9b4e6 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header.coffee
@@ -39,7 +39,7 @@ define [
 
 
   class extends Marionette.Layout
-    template: Templates['header']
+    template: Templates['cw-header']
 
 
     regions:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/basic-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/basic-header.coffee
index 74ce85f372d..2f8a2300b39 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/basic-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/basic-header.coffee
@@ -10,4 +10,4 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['basic-header']
\ No newline at end of file
+    template: Templates['cw-basic-header']
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/coverage-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/coverage-header.coffee
index 03c408fa888..9f77bc9dd7d 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/coverage-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/coverage-header.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['coverage-header']
+    template: Templates['cw-coverage-header']
 
 
     events:
@@ -82,4 +82,4 @@ define [
 
 
     serializeData: ->
-      _.extend super, period: @state.get('period')?.toJSON()
\ No newline at end of file
+      _.extend super, period: @state.get('period')?.toJSON()
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/duplications-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/duplications-header.coffee
index 8722adf27d8..8cb931878af 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/duplications-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/duplications-header.coffee
@@ -10,7 +10,7 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['duplications-header']
+    template: Templates['cw-duplications-header']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/issues-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/issues-header.coffee
index ecfa4b5a918..f7d24a90601 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/issues-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/issues-header.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['issues-header']
+    template: Templates['cw-issues-header']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/more-actions.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/more-actions.coffee
index a35e54f62e9..1de367f55e0 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/more-actions.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/more-actions.coffee
@@ -11,7 +11,7 @@ define [
 
   class extends Marionette.ItemView
     className: 'component-viewer-header-more-actions'
-    template: Templates['more-actions']
+    template: Templates['cw-more-actions']
 
 
     events:
@@ -45,4 +45,4 @@ define [
 
     serializeData: ->
       _.extend super,
-        state: @options.main.state.toJSON()
\ No newline at end of file
+        state: @options.main.state.toJSON()
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/scm-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/scm-header.coffee
index 29e44cfa472..66b43636a47 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/scm-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/scm-header.coffee
@@ -14,7 +14,7 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['scm-header']
+    template: Templates['cw-scm-header']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/header/tests-header.coffee b/server/sonar-web/src/main/coffee/component-viewer/header/tests-header.coffee
index d297e53bc35..76e196c66c7 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/header/tests-header.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/header/tests-header.coffee
@@ -15,7 +15,7 @@ define [
 
 
   class extends BaseHeaderView
-    template: Templates['tests-header']
+    template: Templates['cw-tests-header']
 
 
     ui:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/line-actions-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/line-actions-popup.coffee
index f0de0ac50c5..9e79833a32d 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/line-actions-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/line-actions-popup.coffee
@@ -2,7 +2,7 @@ define [
   'backbone.marionette'
   'templates/component-viewer'
   'common/popup'
-  'issues/manual-issue-view'
+  'issue/manual-issue-view'
 ], (
   Marionette
   Templates
@@ -14,7 +14,7 @@ define [
 
 
   class extends Popup
-    template: Templates['line-options-popup']
+    template: Templates['cw-line-options-popup']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
index 969ccd32f96..ff35d806b79 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
@@ -69,7 +69,7 @@ define [
 
   class ComponentViewer extends utils.mixOf Marionette.Layout, IssuesMixin, CoverageMixin, DuplicationsMixin, SCMMixin
     className: 'component-viewer'
-    template: Templates['layout']
+    template: Templates['cw-layout']
 
 
     regions:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/source.coffee b/server/sonar-web/src/main/coffee/component-viewer/source.coffee
index 7d47af82001..a9f612367bd 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/source.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/source.coffee
@@ -5,8 +5,8 @@ define [
   'component-viewer/duplication-popup'
   'component-viewer/time-changes-popup'
   'component-viewer/line-actions-popup'
-  'issues/issue-view'
-  'issues/models/issue'
+  'issue/issue-view'
+  'issue/models/issue'
   'common/handlebars-extensions'
 ], (
   Marionette
@@ -26,8 +26,8 @@ define [
 
 
   class SourceView extends Marionette.ItemView
-    template: Templates['source']
-    expandTemplate: Templates['code-expand']
+    template: Templates['cw-source']
+    expandTemplate: Templates['cw-code-expand']
 
     LINES_AROUND_ISSUE = 4
     LINES_AROUND_COVERED_LINE = 1
diff --git a/server/sonar-web/src/main/coffee/component-viewer/time-changes-popup.coffee b/server/sonar-web/src/main/coffee/component-viewer/time-changes-popup.coffee
index 0854f1b91e6..6d8aa77860e 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/time-changes-popup.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/time-changes-popup.coffee
@@ -12,7 +12,7 @@ define [
 
 
   class TimeChangesPopupView extends Popup
-    template: Templates['time-changes-popup']
+    template: Templates['cw-time-changes-popup']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/component-viewer/workspace.coffee b/server/sonar-web/src/main/coffee/component-viewer/workspace.coffee
index 7432414d258..3f8fac9861e 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/workspace.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/workspace.coffee
@@ -10,7 +10,7 @@ define [
 
 
   class WorkspaceView extends Marionette.ItemView
-    template: Templates['workspace']
+    template: Templates['cw-workspace']
 
 
     events:
diff --git a/server/sonar-web/src/main/coffee/issues/collections/action-plans.coffee b/server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee
similarity index 100%
rename from server/sonar-web/src/main/coffee/issues/collections/action-plans.coffee
rename to server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee
diff --git a/server/sonar-web/src/main/coffee/issues/issue-view.coffee b/server/sonar-web/src/main/coffee/issue/issue-view.coffee
similarity index 95%
rename from server/sonar-web/src/main/coffee/issues/issue-view.coffee
rename to server/sonar-web/src/main/coffee/issue/issue-view.coffee
index 6f9022f6f66..2be7d3120e2 100644
--- a/server/sonar-web/src/main/coffee/issues/issue-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/issue-view.coffee
@@ -1,19 +1,19 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 
-  'issues/models/rule'
-  'issues/views/rule-view'
+  'issue/models/rule'
+  'issue/views/rule-view'
 
-  'issues/models/change-log'
-  'issues/views/change-log-view'
+  'issue/models/change-log'
+  'issue/views/change-log-view'
 
-  'issues/collections/action-plans'
+  'issue/collections/action-plans'
 
-  'issues/views/assign-form-view'
-  'issues/views/comment-form-view'
-  'issues/views/plan-form-view'
-  'issues/views/set-severity-form-view'
+  'issue/views/assign-form-view'
+  'issue/views/comment-form-view'
+  'issue/views/plan-form-view'
+  'issue/views/set-severity-form-view'
 
 ], (
   Marionette
diff --git a/server/sonar-web/src/main/coffee/issues/manual-issue-view.coffee b/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
similarity index 98%
rename from server/sonar-web/src/main/coffee/issues/manual-issue-view.coffee
rename to server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
index 4b066d0318d..cf570fefc42 100644
--- a/server/sonar-web/src/main/coffee/issues/manual-issue-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
diff --git a/server/sonar-web/src/main/coffee/issues/models/change-log.coffee b/server/sonar-web/src/main/coffee/issue/models/change-log.coffee
similarity index 100%
rename from server/sonar-web/src/main/coffee/issues/models/change-log.coffee
rename to server/sonar-web/src/main/coffee/issue/models/change-log.coffee
diff --git a/server/sonar-web/src/main/coffee/issues/models/issue.coffee b/server/sonar-web/src/main/coffee/issue/models/issue.coffee
similarity index 100%
rename from server/sonar-web/src/main/coffee/issues/models/issue.coffee
rename to server/sonar-web/src/main/coffee/issue/models/issue.coffee
diff --git a/server/sonar-web/src/main/coffee/issues/models/rule.coffee b/server/sonar-web/src/main/coffee/issue/models/rule.coffee
similarity index 100%
rename from server/sonar-web/src/main/coffee/issues/models/rule.coffee
rename to server/sonar-web/src/main/coffee/issue/models/rule.coffee
diff --git a/server/sonar-web/src/main/coffee/issues/views/assign-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
similarity index 99%
rename from server/sonar-web/src/main/coffee/issues/views/assign-form-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
index b51435b63af..2e2b6698006 100644
--- a/server/sonar-web/src/main/coffee/issues/views/assign-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
diff --git a/server/sonar-web/src/main/coffee/issues/views/change-log-view.coffee b/server/sonar-web/src/main/coffee/issue/views/change-log-view.coffee
similarity index 81%
rename from server/sonar-web/src/main/coffee/issues/views/change-log-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/change-log-view.coffee
index 8cdb57d0a4b..5978c9bb858 100644
--- a/server/sonar-web/src/main/coffee/issues/views/change-log-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/change-log-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
@@ -16,4 +16,4 @@ define [
 
     serializeData: ->
       _.extend super,
-        issue: @options.issue.toJSON()
\ No newline at end of file
+        issue: @options.issue.toJSON()
diff --git a/server/sonar-web/src/main/coffee/issues/views/comment-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
similarity index 94%
rename from server/sonar-web/src/main/coffee/issues/views/comment-form-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
index 57c0393ce0a..240865ed5a8 100644
--- a/server/sonar-web/src/main/coffee/issues/views/comment-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
@@ -57,4 +57,4 @@ define [
       .done => @options.detailView.updateAfterAction true
       .fail (r) =>
         alert _.pluck(r.responseJSON.errors 'msg').join(' ')
-        @options.detailView.hideActionSpinner()
\ No newline at end of file
+        @options.detailView.hideActionSpinner()
diff --git a/server/sonar-web/src/main/coffee/issues/views/plan-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
similarity index 95%
rename from server/sonar-web/src/main/coffee/issues/views/plan-form-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
index c7130201516..1e0c6b38a14 100644
--- a/server/sonar-web/src/main/coffee/issues/views/plan-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
@@ -56,4 +56,4 @@ define [
 
     serializeData: ->
       items: @collection.toJSON()
-      issue: @options.issue.toJSON()
\ No newline at end of file
+      issue: @options.issue.toJSON()
diff --git a/server/sonar-web/src/main/coffee/issues/views/rule-view.coffee b/server/sonar-web/src/main/coffee/issue/views/rule-view.coffee
similarity index 93%
rename from server/sonar-web/src/main/coffee/issues/views/rule-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/rule-view.coffee
index 25038b05df8..dee20106797 100644
--- a/server/sonar-web/src/main/coffee/issues/views/rule-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/rule-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
@@ -16,4 +16,4 @@ define [
     serializeData: ->
       _.extend super,
         characteristic: this.options.issue.get 'characteristic'
-        subCharacteristic: this.options.issue.get 'subCharacteristic'
\ No newline at end of file
+        subCharacteristic: this.options.issue.get 'subCharacteristic'
diff --git a/server/sonar-web/src/main/coffee/issues/views/set-severity-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
similarity index 94%
rename from server/sonar-web/src/main/coffee/issues/views/set-severity-form-view.coffee
rename to server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
index 96d756db7b4..3842a2d0bdc 100644
--- a/server/sonar-web/src/main/coffee/issues/views/set-severity-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
@@ -1,6 +1,6 @@
 define [
   'backbone.marionette'
-  'templates/issues'
+  'templates/issue'
 ], (
   Marionette
   Templates
@@ -49,4 +49,4 @@ define [
       .done => @options.detailView.updateAfterAction true
       .fail (r) =>
         alert _.pluck(r.responseJSON.errors, 'msg').join(' ')
-        @options.detailView.hideActionSpinner()
\ No newline at end of file
+        @options.detailView.hideActionSpinner()
diff --git a/server/sonar-web/src/main/hbs/component-viewer/code-expand.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-code-expand.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/code-expand.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-code-expand.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/coveragePopup.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/coveragePopup.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-coverage-popup.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/duplicationPopup.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-duplication-popup.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/duplicationPopup.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-duplication-popup.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/layout.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-layout.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/layout.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-layout.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/line-options-popup.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-line-options-popup.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/line-options-popup.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-line-options-popup.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/more-actions.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/more-actions.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/source.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/source.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/time-changes-popup.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-time-changes-popup.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/time-changes-popup.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-time-changes-popup.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/workspace.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/workspace.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/_header-item.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-item.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/_header-item.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-item.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/_header-link.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/_header-link.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/_cw-header-link.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/basic-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-basic-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/basic-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-basic-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/coverage-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/coverage-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/covered-files-popup.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-covered-files-popup.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/covered-files-popup.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-covered-files-popup.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/duplications-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-duplications-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/duplications-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-duplications-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/issues-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/issues-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-issues-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/scm-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/scm-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/tests-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/component-viewer/header/tests-header.hbs
rename to server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/assign-form.hbs b/server/sonar-web/src/main/hbs/issue/assign-form.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/assign-form.hbs
rename to server/sonar-web/src/main/hbs/issue/assign-form.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/change-log.hbs b/server/sonar-web/src/main/hbs/issue/change-log.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/change-log.hbs
rename to server/sonar-web/src/main/hbs/issue/change-log.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/comment-form.hbs b/server/sonar-web/src/main/hbs/issue/comment-form.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/comment-form.hbs
rename to server/sonar-web/src/main/hbs/issue/comment-form.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/issue.hbs b/server/sonar-web/src/main/hbs/issue/issue.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/issue.hbs
rename to server/sonar-web/src/main/hbs/issue/issue.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/manual-issue.hbs b/server/sonar-web/src/main/hbs/issue/manual-issue.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/manual-issue.hbs
rename to server/sonar-web/src/main/hbs/issue/manual-issue.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/plan-form.hbs b/server/sonar-web/src/main/hbs/issue/plan-form.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/plan-form.hbs
rename to server/sonar-web/src/main/hbs/issue/plan-form.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/rule.hbs b/server/sonar-web/src/main/hbs/issue/rule.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/rule.hbs
rename to server/sonar-web/src/main/hbs/issue/rule.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/set-severity-form.hbs b/server/sonar-web/src/main/hbs/issue/set-severity-form.hbs
similarity index 100%
rename from server/sonar-web/src/main/hbs/issues/set-severity-form.hbs
rename to server/sonar-web/src/main/hbs/issue/set-severity-form.hbs
diff --git a/server/sonar-web/src/main/hbs/issues/filter-bar.hbs b/server/sonar-web/src/main/hbs/issues/filter-bar.hbs
new file mode 100644
index 00000000000..4f1907964c7
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/filter-bar.hbs
@@ -0,0 +1,2 @@
+<div class="navigator-filters-list"></div>
+<button class="navigator-filter-submit">{{t 'search_verb'}}</button>
diff --git a/server/sonar-web/src/main/hbs/issues/issue-detail.hbs b/server/sonar-web/src/main/hbs/issues/issue-detail.hbs
new file mode 100644
index 00000000000..c746f72148c
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/issue-detail.hbs
@@ -0,0 +1,20 @@
+<div class="line line-small">
+  {{severityIcon severity}}{{translate "severities" severity}}&nbsp;
+  {{statusIcon status}}{{translate "statuses" status}}
+  {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
+
+  <div class="line-right">
+    {{fUpdateAge}}
+  </div>
+</div>
+
+<div class="line line-nowrap" title="{{message}}">
+  {{message}}
+</div>
+
+<div class="line">
+  {{#unless singleProject}}
+    <div class="subtitle line-nowrap">{{default projectLongName projectName}}</div>
+  {{/unless}}
+  <div class="subtitle line-nowrap">{{componentLongName}}</div>
+</div>
diff --git a/server/sonar-web/src/main/hbs/issues/issues-actions.hbs b/server/sonar-web/src/main/hbs/issues/issues-actions.hbs
new file mode 100644
index 00000000000..1f01db44aaf
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/issues-actions.hbs
@@ -0,0 +1,27 @@
+{{#unless maxResultsReached}}
+  <div class="navigator-actions-order">
+    {{#if sorting}}
+      {{t 'issues.ordered_by'}} <strong class="navigator-actions-ordered-by">{{sorting.sortText}}</strong> {{#if sorting.asc}}<i class="icon-sort-asc"></i>{{else}}<i class="icon-sort-desc"></i>{{/if}}
+    {{else}}
+      Order
+    {{/if}}
+  </div>
+  <ul class="navigator-actions-order-choices">
+    <li data-sort="UPDATE_DATE" data-asc="true">{{t 'issues.sort.update_date'}} <i class="icon-sort-asc"></i></li>
+    <li data-sort="UPDATE_DATE" data-asc="false">{{t 'issues.sort.update_date'}} <i class="icon-sort-desc"></i></li>
+    <li data-sort="SEVERITY" data-asc="true">{{t 'issues.sort.severity'}} <i class="icon-sort-asc"></i></li>
+    <li data-sort="SEVERITY" data-asc="false">{{t 'issues.sort.severity'}} <i class="icon-sort-desc"></i></li>
+    <li data-sort="STATUS" data-asc="true">{{t 'issues.sort.status'}} <i class="icon-sort-asc"></i></li>
+    <li data-sort="STATUS" data-asc="false">{{t 'issues.sort.status'}} <i class="icon-sort-desc"></i></li>
+  </ul>
+{{/unless}}
+<div class="navigator-actions-total">
+  {{t 'issues.found'}}: <strong>{{paging.fTotal}}</strong>
+  {{#notEq paging.fTotal 0}}
+    {{#if appState.canBulkChange}}
+      <a href="{{bulkChangeUrl}}?{{query}}"
+         class="navigator-actions-bulk"
+         title="{{t 'bulk_change'}}"><i class="icon-bulk-change"></i></a>
+    {{/if}}
+  {{/notEq}}
+</div>
diff --git a/server/sonar-web/src/main/hbs/issues/issues-details-favorite-filter.hbs b/server/sonar-web/src/main/hbs/issues/issues-details-favorite-filter.hbs
new file mode 100644
index 00000000000..125f21c4af5
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/issues-details-favorite-filter.hbs
@@ -0,0 +1,13 @@
+<ul class="navigator-filter-select-list">
+  {{#if items}}
+    {{#each items}}
+      <li>
+        <label data-id="{{id}}">{{{name}}}</label>
+      </li>
+    {{/each}}
+    <li class="line"></li>
+  {{/if}}
+  <li class="manage">
+    <label id="manage-favorites">{{t 'manage'}}</label>
+  </li>
+</ul>
diff --git a/server/sonar-web/src/main/hbs/issues/issues-header.hbs b/server/sonar-web/src/main/hbs/issues/issues-header.hbs
new file mode 100644
index 00000000000..bb44852c45e
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/issues-header.hbs
@@ -0,0 +1,39 @@
+<h1 class="navigator-header-title">
+  {{#if name}}
+    {{name}}
+    <span class="navigator-header-title-note">
+      {{#unless shared}}
+        [{{t 'issue_filter.private'}}]
+      {{else}}
+        {{#eq user currentUser}}
+          [{{t 'issue_filter.shared_with_all_users'}}]
+        {{else}}
+          {{#if user}}
+            [{{t 'issue_filter.shared'}}]
+          {{/if}}
+        {{/eq}}
+      {{/unless}}
+    </span>
+  {{else}}
+    {{t 'issues'}}
+  {{/if}}
+</h1>
+
+  <div class="navigator-header-actions button-group">
+    <button id="issues-new-search">{{t 'issue_filter.new_search'}}</button>
+
+    {{#if appState.canManageFilters}}
+      {{#if canModify}}
+        {{#if canSave}}<button id="issues-filter-save">{{t 'save'}}</button>{{/if}}
+      {{/if}}
+      {{#unless id}}<button id="issues-filter-save-as">{{t 'save_as'}}</button>{{/unless}}
+      {{#if id}}<button id="issues-filter-copy">{{t 'copy'}}</button>{{/if}}
+      {{#if canModify}}
+        {{#if id}}<button id="issues-filter-edit">{{t 'edit'}}</button>{{/if}}
+      {{/if}}
+    {{/if}}
+  </div>
+
+{{#if description}}
+  <div class="navigator-header-description">{{description}}</div>
+{{/if}}
diff --git a/server/sonar-web/src/main/hbs/issues/issues.hbs b/server/sonar-web/src/main/hbs/issues/issues.hbs
new file mode 100644
index 00000000000..50dba468b50
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/issues.hbs
@@ -0,0 +1,4 @@
+<ol class="navigator-results-list"></ol>
+<div class="navigator-results-loader">
+  <i class="spinner"></i>
+</div>
diff --git a/server/sonar-web/src/main/hbs/issues/no-issues.hbs b/server/sonar-web/src/main/hbs/issues/no-issues.hbs
new file mode 100644
index 00000000000..33ec1914d28
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/issues/no-issues.hbs
@@ -0,0 +1 @@
+{{t 'issue_filter.no_issues'}}
diff --git a/server/sonar-web/src/main/hbs/navigator/ajax-select-filter.hbs b/server/sonar-web/src/main/hbs/navigator/ajax-select-filter.hbs
new file mode 100644
index 00000000000..97f4be337e0
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/ajax-select-filter.hbs
@@ -0,0 +1,5 @@
+<div class="navigator-filter-search">
+  <input type="text">
+</div>
+<ul class="navigator-filter-select-list choices"></ul>
+<ul class="navigator-filter-select-list opposite"></ul>
diff --git a/server/sonar-web/src/main/hbs/navigator/base-details-filter.hbs b/server/sonar-web/src/main/hbs/navigator/base-details-filter.hbs
new file mode 100644
index 00000000000..40114bbf8f2
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/base-details-filter.hbs
@@ -0,0 +1 @@
+<div class="navigator-filter-details-inner"></div>
diff --git a/server/sonar-web/src/main/hbs/navigator/base-filter.hbs b/server/sonar-web/src/main/hbs/navigator/base-filter.hbs
new file mode 100644
index 00000000000..b20fcf27979
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/base-filter.hbs
@@ -0,0 +1,5 @@
+<div class="navigator-filter-label">{{name}}</div>
+<div class="navigator-filter-value {{#if defaultValue}}default{{/if}}">{{value}}</div>
+{{#if optional}}
+  <div class="navigator-filter-disable">&times;</div>
+{{/if}}
diff --git a/server/sonar-web/src/main/hbs/navigator/checkbox-filter.hbs b/server/sonar-web/src/main/hbs/navigator/checkbox-filter.hbs
new file mode 100644
index 00000000000..158884dd47f
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/checkbox-filter.hbs
@@ -0,0 +1,4 @@
+<div class="navigator-filter-label">{{name}}</div>
+{{#if optional}}
+  <div class="navigator-filter-disable">&times;</div>
+{{/if}}
diff --git a/server/sonar-web/src/main/hbs/navigator/choice-filter-item.hbs b/server/sonar-web/src/main/hbs/navigator/choice-filter-item.hbs
new file mode 100644
index 00000000000..c8b4b596a90
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/choice-filter-item.hbs
@@ -0,0 +1,13 @@
+<li>
+  <label title="{{text}}" data-id="{{id}}">
+    <i class="icon-checkbox {{#if checked}}icon-checkbox-checked{{/if}} {{#unless multiple}}icon-checkbox-single{{/unless}}"></i>
+      {{#if icon}}<i class="icon-{{icon}}"></i>{{/if}}
+    <span>
+        {{text}}
+      {{#if category}}
+        <br>
+          <span class="subtitle">{{category}}</span>
+      {{/if}}
+      </span>
+  </label>
+</li>
diff --git a/server/sonar-web/src/main/hbs/navigator/choice-filter.hbs b/server/sonar-web/src/main/hbs/navigator/choice-filter.hbs
new file mode 100644
index 00000000000..12fd1f0c344
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/choice-filter.hbs
@@ -0,0 +1,2 @@
+<ul class="navigator-filter-select-list choices"></ul>
+<ul class="navigator-filter-select-list opposite"></ul>
diff --git a/server/sonar-web/src/main/hbs/navigator/favorite-details-filter.hbs b/server/sonar-web/src/main/hbs/navigator/favorite-details-filter.hbs
new file mode 100644
index 00000000000..e567f50ea46
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/favorite-details-filter.hbs
@@ -0,0 +1,13 @@
+<ul class="navigator-filter-select-list">
+  {{#ifNotEmpty choicesArray}}
+    {{#each choicesArray}}
+      <li>
+        <label data-id="{{k}}">{{v}}</label>
+      </li>
+    {{/each}}
+    <li class="line"></li>
+  {{/ifNotEmpty}}
+  <li class="manage">
+    <label id="manage-favorites">{{translate "manage" }}</label>
+  </li>
+</ul>
diff --git a/server/sonar-web/src/main/hbs/navigator/favorite-filter.hbs b/server/sonar-web/src/main/hbs/navigator/favorite-filter.hbs
new file mode 100644
index 00000000000..52e00b0692f
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/favorite-filter.hbs
@@ -0,0 +1 @@
+<div class="navigator-filter-favorite-toggle" title="{{translate 'filtersList' }}"></div>
diff --git a/server/sonar-web/src/main/hbs/navigator/metric-filter.hbs b/server/sonar-web/src/main/hbs/navigator/metric-filter.hbs
new file mode 100644
index 00000000000..ae19cec0a7b
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/metric-filter.hbs
@@ -0,0 +1,27 @@
+<div class="navigator-filter-details-inner">
+  <select name="metric">
+    <option></option>
+    {{#each groupedMetrics}}
+      <optgroup label="{{domain}}">
+        {{#each metrics}}
+          <option value="{{name}}">{{short_name}}</option>
+        {{/each}}
+      </optgroup>
+    {{/each}}
+  </select>
+
+  <select name="period">
+    <option value="0">{{translate "value"}}</option>
+    {{#each periods}}
+      <option value="{{@key}}">{{this}}</option>
+    {{/each}}
+  </select>
+
+  <select name="op">
+    {{#each operations}}
+      <option value="{{@key}}">{{this}}</option>
+    {{/each}}
+  </select>
+
+  <input type="text" name="val">
+</div>
diff --git a/server/sonar-web/src/main/hbs/navigator/more-criteria-details-filter.hbs b/server/sonar-web/src/main/hbs/navigator/more-criteria-details-filter.hbs
new file mode 100644
index 00000000000..252cacc2476
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/more-criteria-details-filter.hbs
@@ -0,0 +1,9 @@
+<ul class="navigator-filter-select-list">
+  {{#each filters}}
+    <li>
+      <label data-id="{{id}}" {{#if inactive}}class="inactive"{{/if}} {{#if title}}title="{{title}}"{{/if}}>
+        {{name}}
+      </label>
+    </li>
+  {{/each}}
+</ul>
diff --git a/server/sonar-web/src/main/hbs/navigator/more-criteria-filter.hbs b/server/sonar-web/src/main/hbs/navigator/more-criteria-filter.hbs
new file mode 100644
index 00000000000..e6a677165cd
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/more-criteria-filter.hbs
@@ -0,0 +1 @@
+{{t "moreCriteria"}}
diff --git a/server/sonar-web/src/main/hbs/navigator/range-filter.hbs b/server/sonar-web/src/main/hbs/navigator/range-filter.hbs
new file mode 100644
index 00000000000..a13fdff92e1
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/range-filter.hbs
@@ -0,0 +1,5 @@
+<div class="navigator-filter-details-inner">
+  <input class="navigator-filter-range-input" type="text" name="{{propertyFrom}}" placeholder="{{placeholder}}">
+  <label>{{translate "to"}}</label>
+  <input class="navigator-filter-range-input" type="text" name="{{propertyTo}}" placeholder="{{placeholder}}">
+</div>
diff --git a/server/sonar-web/src/main/hbs/navigator/string-filter.hbs b/server/sonar-web/src/main/hbs/navigator/string-filter.hbs
new file mode 100644
index 00000000000..ab1978c8fa7
--- /dev/null
+++ b/server/sonar-web/src/main/hbs/navigator/string-filter.hbs
@@ -0,0 +1,3 @@
+<div class="navigator-filter-details-inner">
+  <input type="text" name="{{property}}" value="{{value}}">
+</div>
diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index 5451f4d5d9f..cf16e5968ca 100644
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -292,7 +292,7 @@ define(['handlebars', 'moment'], function (Handlebars, moment) {
   });
 
   Handlebars.registerHelper('componentViewerHeaderLink', function(value, label, cl, hash) {
-    var name = '_header-link';
+    var name = '_cw-header-link';
     if (value != null) {
       var ps = Handlebars.partials;
       if (typeof ps[name] !== 'function') {
@@ -303,7 +303,7 @@ define(['handlebars', 'moment'], function (Handlebars, moment) {
   });
 
   Handlebars.registerHelper('componentViewerHeaderItem', function(value, label, hash) {
-    var name = '_header-item';
+    var name = '_cw-header-item';
     if (value != null) {
       var ps = Handlebars.partials;
       if (typeof ps[name] !== 'function') {
diff --git a/server/sonar-web/src/main/js/issues/extra.js b/server/sonar-web/src/main/js/issues/extra.js
index 93dd15f7b79..6f7700c336b 100644
--- a/server/sonar-web/src/main/js/issues/extra.js
+++ b/server/sonar-web/src/main/js/issues/extra.js
@@ -1,14 +1,16 @@
 define(
     [
-      'backbone', 'backbone.marionette',
-      '../navigator/filters/filter-bar',
+      'backbone',
+      'backbone.marionette',
+      'navigator/filters/filter-bar',
       'navigator/filters/base-filters',
       'navigator/filters/favorite-filters',
       'navigator/filters/read-only-filters',
-      'component-viewer/main'
+      'component-viewer/main',
+      'templates/issues'
     ],
     function (Backbone, Marionette, FilterBarView, BaseFilters, FavoriteFiltersModule, ReadOnlyFilterView,
-              ComponentViewer) {
+              ComponentViewer, Templates) {
 
       var AppState = Backbone.Model.extend({
 
@@ -119,7 +121,7 @@ define(
 
 
       var IssueView = Marionette.ItemView.extend({
-        template: Handlebars.compile(jQuery('#issue-template').html() || ''),
+        template: Templates['issue-detail'],
         tagName: 'li',
 
 
@@ -190,12 +192,12 @@ define(
       var NoIssuesView = Marionette.ItemView.extend({
         tagName: 'li',
         className: 'navigator-results-no-results',
-        template: Handlebars.compile(jQuery('#no-issues-template').html() || '')
+        template: Templates['no-issues']
       });
 
 
       var IssuesView = Marionette.CompositeView.extend({
-        template: Handlebars.compile(jQuery('#issues-template').html() || ''),
+        template: Templates['issues'],
         itemViewContainer: '.navigator-results-list',
         itemView: IssueView,
         emptyView: NoIssuesView,
@@ -304,7 +306,7 @@ define(
 
 
       var IssuesActionsView = Marionette.ItemView.extend({
-        template: Handlebars.compile(jQuery('#issues-actions-template').html() || ''),
+        template: Templates['issues-actions'],
 
 
         collectionEvents: {
@@ -376,6 +378,7 @@ define(
             sorting: this.collection.sorting,
             maxResultsReached: this.collection.maxResultsReached,
             appState: window.SS.appState.toJSON(),
+            bulkChangeUrl: baseUrl + '/issues/bulk_change_form',
             query: (Backbone.history.fragment || '').replace(/\|/g, '&')
           });
         }
@@ -384,7 +387,7 @@ define(
 
 
       var IssuesDetailsFavoriteFilterView = FavoriteFiltersModule.DetailsFavoriteFilterView.extend({
-        template: Handlebars.compile(jQuery('#issues-details-favorite-filter-template').html() || ''),
+        template: Templates['issues-details-favorite-filter'],
 
 
         applyFavorite: function (e) {
@@ -435,6 +438,7 @@ define(
 
 
       var IssuesFilterBarView = FilterBarView.extend({
+        template: Templates['filter-bar'],
 
         collectionEvents: {
           'change:enabled': 'changeEnabled'
@@ -511,7 +515,7 @@ define(
 
 
       var IssuesHeaderView = Marionette.ItemView.extend({
-        template: Handlebars.compile(jQuery('#issues-header-template').html() || ''),
+        template: Templates['issues-header'],
 
 
         modelEvents: {
diff --git a/server/sonar-web/src/main/js/measures/app.js b/server/sonar-web/src/main/js/measures/app.js
index eef2662fd89..fbb4d2e4d81 100644
--- a/server/sonar-web/src/main/js/measures/app.js
+++ b/server/sonar-web/src/main/js/measures/app.js
@@ -25,7 +25,7 @@ requirejs.config({
 requirejs(
     [
       'backbone', 'backbone.marionette',
-      'navigator/filters/filter-bar',
+      'measures/measures-filter-bar',
       'navigator/filters/base-filters',
       'navigator/filters/checkbox-filters',
       'navigator/filters/choice-filters',
diff --git a/server/sonar-web/src/main/js/measures/measures-filter-bar.js b/server/sonar-web/src/main/js/measures/measures-filter-bar.js
new file mode 100644
index 00000000000..5b5c6b69c90
--- /dev/null
+++ b/server/sonar-web/src/main/js/measures/measures-filter-bar.js
@@ -0,0 +1,7 @@
+define(['navigator/filters/filter-bar', 'common/handlebars-extensions'], function (FilterBarView) {
+
+  return FilterBarView.extend({
+    template: getTemplate('#filter-bar-template')
+  });
+
+});
diff --git a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
index f8866e1b31a..d32cf80bdf6 100644
--- a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
@@ -2,8 +2,9 @@ define([
   'backbone',
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
+  'templates/navigator',
   'common/handlebars-extensions'
-], function (Backbone, BaseFilters, ChoiceFilters) {
+], function (Backbone, BaseFilters, ChoiceFilters, Templates) {
 
   var PAGE_SIZE = 100;
 
@@ -96,7 +97,7 @@ define([
 
 
   var AjaxSelectDetailsFilterView = ChoiceFilters.DetailsChoiceFilterView.extend({
-    template: getTemplate('#ajax-select-filter-template'),
+    template: Templates['ajax-select-filter'],
     listTemplate: getTemplate('#choice-filter-template'),
     searchKey: 's',
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/base-filters.js b/server/sonar-web/src/main/js/navigator/filters/base-filters.js
index ac8372585ea..fcff56586a4 100644
--- a/server/sonar-web/src/main/js/navigator/filters/base-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/base-filters.js
@@ -1,4 +1,9 @@
-define(['backbone', 'backbone.marionette', 'common/handlebars-extensions'], function (Backbone, Marionette) {
+define([
+  'backbone',
+  'backbone.marionette',
+  'templates/navigator',
+  'common/handlebars-extensions'
+], function (Backbone, Marionette, Templates) {
 
   var Filter = Backbone.Model.extend({
 
@@ -20,7 +25,7 @@ define(['backbone', 'backbone.marionette', 'common/handlebars-extensions'], func
 
 
   var DetailsFilterView = Marionette.ItemView.extend({
-    template: getTemplate('#base-details-filter-template'),
+    template: Templates['base-details-filter'],
     className: 'navigator-filter-details',
 
 
@@ -38,7 +43,7 @@ define(['backbone', 'backbone.marionette', 'common/handlebars-extensions'], func
 
 
   var BaseFilterView = Marionette.ItemView.extend({
-    template: getTemplate('#base-filter-template'),
+    template: Templates['base-filter'],
     className: 'navigator-filter',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js b/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
index 49e3490309a..7bae1e0b47d 100644
--- a/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
@@ -2,11 +2,12 @@ define([
   'backbone',
   'backbone.marionette',
   'navigator/filters/base-filters',
+  'templates/navigator',
   'common/handlebars-extensions'
-], function (Backbone, Marionette, BaseFilters) {
+], function (Backbone, Marionette, BaseFilters, Templates) {
 
   return BaseFilters.BaseFilterView.extend({
-    template: getTemplate('#checkbox-filter-template'),
+    template: Templates['checkbox-filter'],
     className: 'navigator-filter navigator-filter-inline',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/choice-filters.js b/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
index 823ab260a26..b368384be9c 100644
--- a/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
@@ -1,12 +1,13 @@
 define([
   'handlebars',
   'navigator/filters/base-filters',
+  'templates/navigator',
   'common/handlebars-extensions'
-], function (Handlebars, BaseFilters) {
+], function (Handlebars, BaseFilters, Templates) {
 
   var DetailsChoiceFilterView = BaseFilters.DetailsFilterView.extend({
-    template: getTemplate('#choice-filter-template'),
-    itemTemplate: getTemplate('#choice-filter-item-template'),
+    template: Templates['choice-filter'],
+    itemTemplate: Templates['choice-filter-item'],
 
 
     events: function() {
diff --git a/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js b/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
index eda16b3cb66..4852e30a666 100644
--- a/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
@@ -3,11 +3,12 @@ define([
   'backbone.marionette',
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
+  'templates/navigator',
   'common/handlebars-extensions'
-], function (Backbone, Marionette, BaseFilters, ChoiceFilters) {
+], function (Backbone, Marionette, BaseFilters, ChoiceFilters, Templates) {
 
   var DetailsFavoriteFilterView = BaseFilters.DetailsFilterView.extend({
-    template: getTemplate('#favorite-details-filter-template'),
+    template: Templates['favorite-details-filter'],
 
 
     events: {
@@ -46,7 +47,7 @@ define([
 
 
   var FavoriteFilterView = ChoiceFilters.ChoiceFilterView.extend({
-    template: getTemplate('#favorite-filter-template'),
+    template: Templates['favorite-filter'],
     className: 'navigator-filter navigator-filter-favorite',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/filter-bar.js b/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
index b753bd6ff09..4bcec144adf 100644
--- a/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
+++ b/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
@@ -9,7 +9,6 @@ define(
     function (Marionette, BaseFilters) {
 
       return Marionette.CompositeView.extend({
-        template: getTemplate('#filter-bar-template'),
         itemViewContainer: '.navigator-filters-list',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
index f2e7663b380..0bb84819e0b 100644
--- a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
@@ -1,7 +1,11 @@
-define(['navigator/filters/base-filters', 'common/handlebars-extensions'], function (BaseFilters) {
+define([
+  'navigator/filters/base-filters',
+  'templates/navigator',
+  'common/handlebars-extensions'
+], function (BaseFilters, Templates) {
 
   var DetailsMetricFilterView = BaseFilters.DetailsFilterView.extend({
-    template: getTemplate('#metric-filter-template'),
+    template: Templates['metric-filter'],
 
 
     events: {
diff --git a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
index 384c9281367..8a376d5f751 100644
--- a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
@@ -1,11 +1,12 @@
 define([
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
+  'templates/navigator',
   'common/handlebars-extensions'
-], function (BaseFilters, ChoiceFilters) {
+], function (BaseFilters, ChoiceFilters, Templates) {
 
   var DetailsMoreCriteriaFilterView = ChoiceFilters.DetailsChoiceFilterView.extend({
-    template: getTemplate('#more-criteria-details-filter-template'),
+    template: Templates['more-criteria-details-filter'],
 
 
     events: {
@@ -58,7 +59,7 @@ define([
 
 
   var MoreCriteriaFilterView = ChoiceFilters.ChoiceFilterView.extend({
-    template: getTemplate('#more-criteria-filter-template'),
+    template: Templates['more-criteria-filter'],
     className: 'navigator-filter navigator-filter-more-criteria',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/range-filters.js b/server/sonar-web/src/main/js/navigator/filters/range-filters.js
index 5d42e5f3d03..7056df81352 100644
--- a/server/sonar-web/src/main/js/navigator/filters/range-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/range-filters.js
@@ -1,7 +1,11 @@
-define(['navigator/filters/base-filters', 'common/handlebars-extensions'], function (BaseFilters) {
+define([
+  'navigator/filters/base-filters',
+  'templates/navigator',
+  'common/handlebars-extensions'
+], function (BaseFilters, Templates) {
 
   var DetailsRangeFilterView = BaseFilters.DetailsFilterView.extend({
-    template: getTemplate('#range-filter-template'),
+    template: Templates['range-filter'],
 
 
     events: {
diff --git a/server/sonar-web/src/main/js/navigator/filters/string-filters.js b/server/sonar-web/src/main/js/navigator/filters/string-filters.js
index 2e1278f350f..252d0675082 100644
--- a/server/sonar-web/src/main/js/navigator/filters/string-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/string-filters.js
@@ -1,7 +1,11 @@
-define(['navigator/filters/base-filters', 'common/handlebars-extensions'], function (BaseFilters) {
+define([
+  'navigator/filters/base-filters',
+  'templates/navigator',
+  'common/handlebars-extensions'
+], function (BaseFilters, Templates) {
 
   var DetailsStringFilterView = BaseFilters.DetailsFilterView.extend({
-    template: getTemplate('#string-filter-template'),
+    template: Templates['string-filter'],
 
 
     events: {
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
index 4bafe530c12..0d190ef7d3c 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
@@ -6,6 +6,3 @@
 <div id="coding-rules-page-loader" class="navigator-page-loader">
   <i class="spinner"></i>
 </div>
-
-
-<%= render :partial => '/navigator/filter_templates' -%>
\ No newline at end of file
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index cb04ad4c7a6..c76a3a81826 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -21,21 +21,6 @@
   </div>
 </div>
 
-<%= render :partial => '/navigator/filter_templates' -%>
-<%= render :partial => '/issues/templates/filter_bar_template.hbs' -%>
-<%= render :partial => '/issues/templates/header.hbs' -%>
-<%= render :partial => '/issues/templates/issue.hbs' -%>
-<%= render :partial => '/issues/templates/issues_actions.hbs' -%>
-<%= render :partial => '/issues/templates/issues.hbs' -%>
-<%= render :partial => '/issues/templates/no_issues.hbs' -%>
-<%= render :partial => '/issues/templates/issues_details_favorite_filter.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_inner.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_comment_form.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_rule.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_set_severity_form.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_assign_form.hbs' -%>
-<%= render :partial => '/issues/templates/issue_detail_plan_form.hbs' -%>
 
 <script>
   window.SS = {};
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb
deleted file mode 100644
index 88577059fd8..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<script id="filter-bar-template" type="text/x-handlebars-template">
-  <div class="navigator-filters-list"></div>
-  <button class="navigator-filter-submit"><%= message('search_verb') -%></button>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb
deleted file mode 100644
index e2187aa7baf..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<script id="issues-header-template" type="text/x-handlebars-template">
-  <h1 class="navigator-header-title">
-    {{#if name}}
-      {{name}}
-      <span class="navigator-header-title-note">
-        {{#unless shared}}
-          [<%= message 'issue_filter.private' -%>]
-        {{else}}
-          {{#eq user currentUser}}
-            [<%= message 'issue_filter.shared_with_all_users' -%>]
-          {{else}}
-            {{#if user}}
-              [<%= message 'issue_filter.shared' -%>]
-            {{/if}}
-          {{/eq}}
-        {{/unless}}
-      </span>
-    {{else}}
-      <%= message ('issues') -%>
-    {{/if}}
-  </h1>
-
-    <div class="navigator-header-actions button-group">
-      <button id="issues-new-search"><%= message ('issue_filter.new_search') -%></button>
-
-      {{#if appState.canManageFilters}}
-        {{#if canModify}}
-          {{#if canSave}}<button id="issues-filter-save"><%= message('save') -%></button>{{/if}}
-        {{/if}}
-        {{#unless id}}<button id="issues-filter-save-as"><%= message('save_as') -%></button>{{/unless}}
-        {{#if id}}<button id="issues-filter-copy"><%= message('copy') -%></button>{{/if}}
-        {{#if canModify}}
-          {{#if id}}<button id="issues-filter-edit"><%= message('edit') -%></button>{{/if}}
-        {{/if}}
-      {{/if}}
-    </div>
-
-  {{#if description}}
-    <div class="navigator-header-description">{{description}}</div>
-  {{/if}}
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
deleted file mode 100644
index 3ae908cfed7..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="issue-template" type="text/x-handlebars-template">
-  <div class="line line-small">
-      {{severityIcon severity}}{{translate "severities" severity}}&nbsp;
-      {{statusIcon status}}{{translate "statuses" status}}
-      {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
-
-      <div class="line-right">
-        {{fUpdateAge}}
-      </div>
-    </div>
-
-    <div class="line line-nowrap" title="{{message}}">
-      {{message}}
-    </div>
-
-    <div class="line">
-      {{#unless singleProject}}
-        <div class="subtitle line-nowrap">{{default projectLongName projectName}}</div>
-      {{/unless}}
-      <div class="subtitle line-nowrap">{{componentLongName}}</div>
-    </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
deleted file mode 100644
index b2fa6c427ea..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<script id="issue-detail-template" type="text/x-handlebars-template">
-  <div class="source_title">
-    <div class="subtitle">{{projectName}} {{#if subProjectName}}/ {{subProjectName}}{{/if}}</div>
-    <span class="h1">
-      {{#if componentQualifier}}
-        {{qualifierIcon componentQualifier}}
-      {{/if}}
-
-      {{#if componentLongName}}
-        {{#if componentQualifier}}
-          <a target="_blank" href="<%= ApplicationController.root_context -%>{{dashboardUrl component componentQualifier}}">{{componentLongName}}</a>
-        {{else}}
-          {{componentLongName}}
-        {{/if}}
-      {{else}}
-        {{component}}
-      {{/if}}
-    </span>
-  </div>
-
-  {{#if source}}
-    {{#unless line}}
-      {{> detailInnerTemplate }}
-    {{/unless}}
-
-    <div class="source">
-      <table id="sources_{{key}}" class="sources2 code" cellpadding="0" cellspacing="0">
-        {{#sources source scm}}
-          <tr class="row">
-            <td class="scm {{#if scm}}revision{{/if}}" {{#if first}}style="border-top:none;"{{/if}}>
-              <span class="date"><a>{{scm.date}}</a></span>
-              <span class="author" title="{{scm.author}}">{{scm.author}}</span>
-            </td>
-            <td class="lid L{{lineNumber}}"><a>{{lineNumber}}</a></td>
-            <td class="line {{#eq ../line lineNumber}}ko{{/eq}}"><pre>{{{code}}}</pre></td>
-          </tr>
-          {{#eq ../line lineNumber}}
-            <tr>
-              <td class="scm"></td>
-              <td class="lid"></td>
-              <td class="code-issues">{{> detailInnerTemplate ../..}}</td>
-            </tr>
-          {{/eq}}
-        {{/sources}}
-      </table>
-    </div>
-  {{else}}
-    {{> detailInnerTemplate}}
-  {{/if}}
-
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
deleted file mode 100644
index e7c78994625..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<script id="issue-detail-assign-form-template" type="text/x-handlebars-template">
-  <table class="width100">
-    <tr>
-      <td>
-        <input type="text" id="issue-assignee-select">
-        <input id="issue-assign-submit" type="submit" value="<%= message('issue.assign.submit') -%>">&nbsp;
-        <a id="issue-assign-cancel" class="action"><%= message('cancel') -%></a>
-      </td>
-    </tr>
-  </table>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
deleted file mode 100644
index f408ed8a10f..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<script id="issue-detail-comment-form-template" type="text/x-handlebars-template">
-  <table class="width100">
-    <tr>
-      <td style="vertical-align:top" colspan="2">
-        <textarea id="issue-comment-text" rows="4" name="text"style="width: 100%">{{raw}}</textarea>
-      </td>
-    </tr>
-    <tr>
-      <td style="padding-top: 5px">
-        <input id="issue-comment-submit" type="submit" value="{{#if id}}<%= message('save') -%>{{else}}<%= message('issue.comment.submit') -%>{{/if}}" disabled>
-        <a id="issue-comment-cancel" class="action"><%= message('cancel') -%></a>
-      </td>
-      <td align="right">
-        <%= render :partial => 'markdown/tips' -%>
-      </td>
-    </tr>
-  </table>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
deleted file mode 100644
index 50575b82d4d..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ /dev/null
@@ -1,166 +0,0 @@
-<script id="issue-detail-inner-template" type="text/x-handlebars-template">
-  <div class="code-issue code-issue-collapsed" data-issue-key="{{key}}" data-issue-component="{{component}}" data-issue-rule="{{rule}}">
-    <div class="code-issue-name code-issue-toggle">
-      <div class="code-issue-name-rule">
-        {{severityIcon severity}}&nbsp;<span class="rulename">{{message}}</span>
-      </div>
-
-      <div class="code-issue-permalink">
-        <a target="_blank" href="<%= ApplicationController.root_context -%>/issue/show/{{key}}?layout=false"><img src="<%= ApplicationController.root_context -%>/images/new-window-16.gif"></a>
-      </div>
-    </div>
-
-
-    <ul class="code-issue-actions code-issue-list">
-      {{#inArray actions "comment"}}
-        <li>
-          <a id="issue-comment" class="link-action">{{translate "actions.comment" }}</a>
-        </li>
-      {{/inArray}}
-
-
-      <li>
-        {{statusIcon status}}{{translate "statuses" status}}
-        {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
-
-        {{#ifNotEmpty transitions}}
-          {{#withFirst transitions}}
-            <a class="link-action issue-transition spacer-left" data-transition="{{this}}">{{translate "transitions" this}}</a>
-          {{/withFirst}}
-
-          {{#ifHasExtraTransitions transitions}}
-            <div class="dropdown">
-              <a class="link-action link-more" onclick="showDropdownMenuOnElement($j(this).next('.dropdown-menu')); return false;"></a>
-              <ul style="display: none" class="dropdown-menu">
-                {{#withoutFirst transitions}}
-                  <li>
-                    <a class="link-action issue-transition" data-transition="{{this}}">{{translate "transitions" this}}</a>
-                  </li>
-                {{/withoutFirst}}
-              </ul>
-            </div>
-
-          {{/ifHasExtraTransitions}}
-        {{/ifNotEmpty}}
-      </li>
-
-
-      {{#inArray actions "assign"}}
-      <li>
-        {{#if assigneeName}}
-          <a id="issue-assign" class="link-action"><%= message('assigned_to') -%></a> {{assigneeName}}</li>
-        {{else}}
-          <a id="issue-assign" class="link-action">{{translate "actions.assign" }}</a>
-          {{#inArray actions "assign_to_me"}}
-            [<a id="issue-assign-to-me" class="link-action">{{translate "actions.assign_to_me" }}</a>]
-          {{/inArray}}
-        {{/if}}
-        </li>
-      {{else}}
-        {{#if assigneeName}}
-          <li><%= message('assigned_to') -%> <strong>{{assigneeName}}</strong></li>
-        {{/if}}
-      {{/inArray}}
-
-
-      {{#inArray actions "plan"}}
-        <li>
-          {{#if actionPlanName}}
-            <a id="issue-plan" class="link-action"><%= message('issue.planned_for') -%></a> {{actionPlanName}}
-          {{else}}
-            <a id="issue-plan" class="link-action"><%= message('issue.do_plan') -%></a>
-          {{/if}}
-        </li>
-      {{else}}
-        {{#if actionPlanName}}
-          <li><%= message('issue.planned_for') -%> <strong>{{actionPlanName}}</strong></li>
-        {{/if}}
-      {{/inArray}}
-
-
-      {{#ifHasExtraActions actions}}
-        <li>
-          <div class="dropdown">
-            <a class="link-action link-more" onclick="showDropdownMenuOnElement($j(this).next('.dropdown-menu')); return false;"><%= message('more_actions') -%></a>
-            <ul style="display: none" class="dropdown-menu">
-              {{#inArray actions "set_severity"}}
-                <li>
-                  <a id="issue-set-severity" class="link-action spacer-right">{{translate "actions.set_severity"}}</a>
-                </li>
-              {{/inArray}}
-              {{#pluginActions actions}}
-                <li>
-                  <a class="link-action spacer-right issue-action" data-action="{{this}}">{{translate "actions" this}}</a>
-                </li>
-              {{/pluginActions}}
-            </ul>
-          </div>
-        </li>
-      {{/ifHasExtraActions}}
-
-      {{#if debt}}
-        <li><%= message('issue.technical_debt_short') -%>: {{debt}}</li>
-      {{/if}}
-
-      {{#if reporterName}}<li><%= message('reporter') -%>: {{reporterName}}</li>{{/if}}
-      {{#if author}}<li><%= message('author') -%>: {{author}}</li>{{/if}}
-    </ul>
-
-    <div class="code-issue-form"></div>
-
-
-    <div class="code-issue-details">
-      <ul class="tabs">
-        <li>
-          <a href="#tab-issue-rule"><%= message('rule') -%></a>
-        </li>
-        <li>
-          <a href="#tab-issue-changelog"><%= message('changelog') -%></a>
-        </li>
-      </ul>
-
-      <div id="tab-issue-rule">
-        <div class="rule-desc"></div>
-      </div>
-
-      <div id="tab-issue-changelog">
-        <table class="spaced">
-          <tbody>
-          {{#each changelog}}
-            <tr>
-              <td class="thin left top" nowrap>{{fCreationDate}}</td>
-              <td class="thin left top" nowrap>{{userName}}</td>
-              <td class="left top">
-                {{#each diffs}}
-                  {{this}}<br>
-                {{/each}}
-              </td>
-            </tr>
-          {{/each}}
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-
-    <div class="code-issue-comments">
-      {{#each comments}}
-        <div class="code-issue-comment" data-comment-key="{{key}}">
-          <h4>
-            <%= image_tag('reviews/comment.png') -%>
-            <b>{{userName}}</b>
-            ({{fCreatedAge}})
-
-            {{#if updatable}}
-              &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
-              <a class="link-action issue-comment-edit"><%= message('edit') -%></a>
-              <a class="link-action link-red spacer-right issue-comment-delete"
-                 data-confirm-msg="<%= h message('issue.comment.delete_confirm_message') -%>"><%= message('delete') -%></a>
-            {{/if}}
-          </h4>
-          {{{html}}}
-        </div>
-      {{/each}}
-    </div>
-  </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
deleted file mode 100644
index 33e24157cbe..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<script id="issue-detail-plan-form-template" type="text/x-handlebars-template">
-  {{#if items}}
-    <select id="issue-detail-plan-select">
-      {{#if issue.actionPlan}}
-        <option value="#unplan"><%= message('issue.unplan.submit') -%></option>
-      {{/if}}
-      {{#each items}}
-        {{#notEq this.status 'CLOSED'}}
-          <option value="{{this.key}}">{{this.name}} {{#if this.fDeadLine}}({{this.fDeadLine}}){{/if}}</option>
-        {{/notEq}}
-      {{/each}}
-    </select>
-    <input id="issue-plan-submit" type="submit" value="<%= message('issue.plan.submit') -%>">&nbsp;
-  {{else}}
-    <% if is_admin? %>
-      <span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_admin') -%></span>
-    <% else %>
-      <span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_other') -%></span>
-    <% end %>
-  {{/if}}
-  <a id="issue-plan-cancel" class="action"><%= message('cancel') -%></a>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb
deleted file mode 100644
index cf8b173b6fd..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<script id="issue-detail-rule-template" type="text/x-handlebars-template">
-  <h1 class="marginbottom10">{{name}}</h1>
-  <div class="marginbottom10">{{{description}}}</div>
-  <p class="note">
-    <span class="spacer-right">{{key}}</span>
-    <%= image_tag 'sep12.png', :class => 'spacer-right' -%>
-    {{#all characteristic subCharacteristic}}{{characteristic}} > {{subCharacteristic}}{{else}}<%= message('issue.technical_debt_deleted') -%>{{/all}}
-  </p>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb
deleted file mode 100644
index cba491c8916..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<script id="issue-detail-set-severity-form-template" type="text/x-handlebars-template">
-  <table class="width100">
-    <tr>
-      <td style="vertical-align:top">
-        <select id="issue-set-severity-select" autofocus>
-          <% Severity::KEYS.each do |severity| %>
-          <option class="sev_<%= severity -%>" value="<%= severity -%>" <%= 'selected' if severity==Severity::MAJOR -%>><%= message("severity.#{severity}") -%></option>
-          <% end %>
-        </select>
-
-        <input id="issue-set-severity-submit" type="submit" value="<%= message('issue.set_severity.submit') -%>">
-        <a id="issue-set-severity-cancel" class="action"><%= message('cancel') -%></a>
-      </td>
-    </tr>
-  </table>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb
deleted file mode 100644
index a4c8b45b907..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<script id="issues-template" type="text/x-handlebars-template">
-  <ol class="navigator-results-list"></ol>
-  <div class="navigator-results-loader">
-    <i class="spinner"></i>
-  </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
deleted file mode 100644
index b7c75c9c80a..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<script id="issues-actions-template" type="text/x-handlebars-template">
-  {{#unless maxResultsReached}}
-    <div class="navigator-actions-order">
-      {{#if sorting}}
-        <%= message('issues.ordered_by') -%> <strong class="navigator-actions-ordered-by">{{sorting.sortText}}</strong> {{#if sorting.asc}}<i class="icon-sort-asc"></i>{{else}}<i class="icon-sort-desc"></i>{{/if}}
-      {{else}}
-        Order
-      {{/if}}
-    </div>
-    <ul class="navigator-actions-order-choices">
-      <li data-sort="UPDATE_DATE" data-asc="true"><%= message('issues.sort.update_date') -%> <i class="icon-sort-asc"></i></li>
-      <li data-sort="UPDATE_DATE" data-asc="false"><%= message('issues.sort.update_date') -%> <i class="icon-sort-desc"></i></li>
-      <li data-sort="SEVERITY" data-asc="true"><%= message('issues.sort.severity') -%> <i class="icon-sort-asc"></i></li>
-      <li data-sort="SEVERITY" data-asc="false"><%= message('issues.sort.severity') -%> <i class="icon-sort-desc"></i></li>
-      <li data-sort="STATUS" data-asc="true"><%= message('issues.sort.status') -%> <i class="icon-sort-asc"></i></li>
-      <li data-sort="STATUS" data-asc="false"><%= message('issues.sort.status') -%> <i class="icon-sort-desc"></i></li>
-    </ul>
-  {{/unless}}
-  <div class="navigator-actions-total">
-    <%= message('issues.found') -%>: <strong>{{paging.fTotal}}</strong>
-    {{#notEq paging.fTotal 0}}
-      {{#if appState.canBulkChange}}
-        <a href="<%= url_for params.merge({:action => 'bulk_change_form'}) -%>?{{query}}"
-           class="navigator-actions-bulk"
-           title="<%= message('bulk_change') -%>"><i class="icon-bulk-change"></i></a>
-      {{/if}}
-    {{/notEq}}
-  </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb
deleted file mode 100644
index 19019dd8eee..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<script id="issues-details-favorite-filter-template" type="text/x-handlebars-template">
-  <ul class="navigator-filter-select-list">
-    {{#if items}}
-      {{#each items}}
-        <li>
-          <label data-id="{{id}}">{{{name}}}</label>
-        </li>
-      {{/each}}
-      <li class="line"></li>
-    {{/if}}
-    <li class="manage">
-      <label id="manage-favorites"><%= message('manage') -%></label>
-    </li>
-  </ul>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb
deleted file mode 100644
index fe956141c56..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<script id="no-issues-template" type="text/x-handlebars-template">
-  <%= message('issue_filter.no_issues') -%>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index f2794919597..13fbbdfdbf1 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -48,8 +48,6 @@
 </script>
 
 
-<%= render :partial => '/navigator/filter_templates' -%>
-
 
 <script>
   jQuery('html').addClass('navigator-page measures-page');
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
deleted file mode 100644
index de889064f3d..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= render :partial => '/navigator/templates/base_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/base_details_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/choice_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/choice_filter_item_template.hbs' -%>
-<%= render :partial => '/navigator/templates/ajax_select_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/range_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/checkbox_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/string_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/metric_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/favorite_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/favorite_details_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/more_criteria_filter_template.hbs' -%>
-<%= render :partial => '/navigator/templates/more_criteria_details_filter_template.hbs' -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb
deleted file mode 100644
index f3b18bb2bb7..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<script id="ajax-select-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-search">
-    <input type="text">
-  </div>
-  <ul class="navigator-filter-select-list choices"></ul>
-  <ul class="navigator-filter-select-list opposite"></ul>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb
deleted file mode 100644
index 1b9dd5a85b0..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<script id="base-details-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-details-inner"></div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb
deleted file mode 100644
index bf2ffbac5d0..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<script id="base-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-label">{{name}}</div>
-  <div class="navigator-filter-value {{#if defaultValue}}default{{/if}}">{{value}}</div>
-  {{#if optional}}
-    <div class="navigator-filter-disable">&times;</div>
-  {{/if}}
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb
deleted file mode 100644
index 2671fbb640e..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<script id="checkbox-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-label">{{name}}</div>
-  {{#if optional}}
-    <div class="navigator-filter-disable">&times;</div>
-  {{/if}}
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb
deleted file mode 100644
index e2a6152b76c..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<script id="choice-filter-item-template" type="text/x-handlebars-template">
-  <li>
-    <label title="{{text}}" data-id="{{id}}">
-      <i class="icon-checkbox {{#if checked}}icon-checkbox-checked{{/if}} {{#unless multiple}}icon-checkbox-single{{/unless}}"></i>
-      {{#if icon}}<i class="icon-{{icon}}"></i>{{/if}}
-      <span>
-        {{text}}
-        {{#if category}}
-          <br>
-          <span class="subtitle">{{category}}</span>
-        {{/if}}
-      </span>
-    </label>
-  </li>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb
deleted file mode 100644
index dc8b90da5b8..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<script id="choice-filter-template" type="text/x-handlebars-template">
-  <ul class="navigator-filter-select-list choices"></ul>
-  <ul class="navigator-filter-select-list opposite"></ul>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb
deleted file mode 100644
index cdc70e6b77c..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<script id="favorite-details-filter-template" type="text/x-handlebars-template">
-  <ul class="navigator-filter-select-list">
-    {{#ifNotEmpty choicesArray}}
-      {{#each choicesArray}}
-        <li>
-          <label data-id="{{k}}">{{v}}</label>
-        </li>
-      {{/each}}
-      <li class="line"></li>
-    {{/ifNotEmpty}}
-    <li class="manage">
-      <label id="manage-favorites">{{translate "manage" }}</label>
-    </li>
-  </ul>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb
deleted file mode 100644
index 8848d04c7dd..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<script id="favorite-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-favorite-toggle" title="{{translate 'filtersList' }}"></div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb
deleted file mode 100644
index 414e81d385f..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<script id="metric-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-details-inner">
-    <select name="metric">
-      <option></option>
-      {{#each groupedMetrics}}
-        <optgroup label="{{domain}}">
-          {{#each metrics}}
-            <option value="{{name}}">{{short_name}}</option>
-          {{/each}}
-        </optgroup>
-      {{/each}}
-    </select>
-
-    <select name="period">
-      <option value="0">{{translate "value"}}</option>
-      {{#each periods}}
-        <option value="{{@key}}">{{this}}</option>
-      {{/each}}
-    </select>
-
-    <select name="op">
-      {{#each operations}}
-        <option value="{{@key}}">{{this}}</option>
-      {{/each}}
-    </select>
-
-    <input type="text" name="val">
-  </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb
deleted file mode 100644
index 2817d01a17b..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<script id="more-criteria-details-filter-template" type="text/x-handlebars-template">
-  <ul class="navigator-filter-select-list">
-    {{#each filters}}
-      <li>
-        <label data-id="{{id}}" {{#if inactive}}class="inactive"{{/if}} {{#if title}}title="{{title}}"{{/if}}>
-          {{name}}
-        </label>
-      </li>
-    {{/each}}
-  </ul>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb
deleted file mode 100644
index c1159abf464..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<script id="more-criteria-filter-template" type="text/x-handlebars-template">
-  {{t "moreCriteria"}}
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb
deleted file mode 100644
index 0b9992df5e3..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<script id="range-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-details-inner">
-    <input class="navigator-filter-range-input" type="text" name="{{propertyFrom}}" placeholder="{{placeholder}}">
-    <label>{{translate "to"}}</label>
-    <input class="navigator-filter-range-input" type="text" name="{{propertyTo}}" placeholder="{{placeholder}}">
-  </div>
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb
deleted file mode 100644
index 62693a407f1..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<script id="string-filter-template" type="text/x-handlebars-template">
-  <div class="navigator-filter-details-inner">
-    <input type="text" name="{{property}}" value="{{value}}">
-  </div>
-</script>
-- 
2.39.5