From cc181b8b100ffe35424217bfcb07f946938d32f0 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 5 May 2015 15:15:16 +0200 Subject: [PATCH] apply new navigation WS --- .../src/main/hbs/nav/nav-context-navbar.hbs | 95 +++++++--- .../src/main/hbs/nav/nav-global-navbar.hbs | 2 +- .../src/main/hbs/nav/nav-settings-navbar.hbs | 6 +- .../main/js/common/handlebars-extensions.js | 17 ++ server/sonar-web/src/main/js/nav/app.js | 36 ++-- .../src/main/js/nav/context-navbar-view.js | 4 +- .../src/main/js/nav/global-navbar-view.js | 4 + .../sonar-web/src/main/js/nav/search-view.js | 2 +- .../src/main/js/nav/settings-navbar-view.js | 6 +- server/sonar-web/src/main/js/nav/state.js | 51 ++++++ .../app/views/layouts/_navbar_conf.html.erb | 43 ++--- .../layouts/_navbar_conf_context.html.erb | 168 ------------------ .../layouts/_navbar_conf_global.html.erb | 44 ----- .../layouts/_navbar_conf_settings.html.erb | 25 --- server/sonar-web/src/test/js/nav-spec.js | 80 +++------ .../src/test/json/nav-spec/component.json | 37 ++++ .../src/test/json/nav-spec/global.json | 39 ++++ 17 files changed, 293 insertions(+), 366 deletions(-) create mode 100644 server/sonar-web/src/main/js/nav/state.js delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_context.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb create mode 100644 server/sonar-web/src/test/json/nav-spec/component.json create mode 100644 server/sonar-web/src/test/json/nav-spec/global.json diff --git a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs index 4d639ec0351..730f20a001c 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs @@ -1,40 +1,89 @@
- {{# if canFavoriteContext}} + {{#if component.canBeFavorite}} {{/if}}