From b11a042d089c55e7b9326270dfb2b1937eb5ae5d Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 20 Jan 2015 16:39:07 +0100 Subject: [PATCH] SONAR-6041 New webapp layout --- server/sonar-web/Gruntfile.coffee | 9 + .../sonar-web/src/main/hbs/nav/_nav-logo.hbs | 18 ++ .../src/main/hbs/nav/_nav-navbar-label.hbs | 1 + .../src/main/hbs/nav/nav-context-navbar.hbs | 38 ++++ .../src/main/hbs/nav/nav-global-navbar.hbs | 63 ++++++ .../src/main/hbs/nav/nav-search-empty.hbs | 1 + .../src/main/hbs/nav/nav-search-item.hbs | 16 ++ .../sonar-web/src/main/hbs/nav/nav-search.hbs | 6 + server/sonar-web/src/main/js/application.js | 23 +- .../js/common/selectable-collection-view.js | 62 ++++++ server/sonar-web/src/main/js/nav/app.js | 34 +++ .../src/main/js/nav/context-navbar-view.js | 17 ++ .../src/main/js/nav/global-navbar-view.js | 83 +++++++ .../sonar-web/src/main/js/nav/search-view.js | 154 +++++++++++++ .../main/js/third-party/bootstrap/dropdown.js | 161 ++++++++++++++ .../sonar-web/src/main/less/components.less | 2 + .../src/main/less/components/dropdowns.less | 119 ++++++++++ .../src/main/less/components/menu.less | 53 +++++ .../less/components/search-navigator.less | 2 +- server/sonar-web/src/main/less/dashboard.less | 1 + server/sonar-web/src/main/less/layout.less | 6 +- server/sonar-web/src/main/less/navbar.less | 183 +++++++++++++++ server/sonar-web/src/main/less/style.less | 48 ---- server/sonar-web/src/main/less/ui.less | 58 +++-- server/sonar-web/src/main/less/variables.less | 12 + .../controllers/api/components_controller.rb | 4 +- .../WEB-INF/app/views/account/index.html.erb | 2 +- .../app/views/comparison/index.html.erb | 2 +- .../app/views/dependencies/index.html.erb | 126 +++++------ .../app/views/layouts/_breadcrumb.html.erb | 104 +-------- .../app/views/layouts/_layout.html.erb | 182 +-------------- .../app/views/layouts/_navbar.html.erb | 5 + .../app/views/layouts/_navbar_conf.html.erb | 29 +++ .../layouts/_navbar_conf_context.html.erb | 208 ++++++++++++++++++ .../layouts/_navbar_conf_global.html.erb | 75 +++++++ .../layouts/_navbar_conf_settings.html.erb | 109 +++++++++ .../views/layouts/_recent_history.html.erb | 9 + .../app/views/layouts/application.html.erb | 3 +- .../WEB-INF/app/views/settings/index.html.erb | 4 +- 39 files changed, 1607 insertions(+), 425 deletions(-) create mode 100644 server/sonar-web/src/main/hbs/nav/_nav-logo.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/nav-search-item.hbs create mode 100644 server/sonar-web/src/main/hbs/nav/nav-search.hbs create mode 100644 server/sonar-web/src/main/js/common/selectable-collection-view.js create mode 100644 server/sonar-web/src/main/js/nav/app.js create mode 100644 server/sonar-web/src/main/js/nav/context-navbar-view.js create mode 100644 server/sonar-web/src/main/js/nav/global-navbar-view.js create mode 100644 server/sonar-web/src/main/js/nav/search-view.js create mode 100644 server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js create mode 100644 server/sonar-web/src/main/less/components/dropdowns.less create mode 100644 server/sonar-web/src/main/less/components/menu.less create mode 100644 server/sonar-web/src/main/less/navbar.less create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar.html.erb create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.html.erb create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_context.html.erb create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb create 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/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 60b9b6b3e87..2ce259390f6 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -91,6 +91,7 @@ module.exports = (grunt) -> '<%= pkg.assets %>js/third-party/numeral.js' '<%= pkg.assets %>js/third-party/numeral-languages.js' '<%= pkg.assets %>js/third-party/bootstrap/tooltip.js' + '<%= pkg.assets %>js/third-party/bootstrap/dropdown.js' '<%= pkg.assets %>js/select2-jquery-ui-fix.js' '<%= pkg.assets %>js/widgets/base.js' '<%= pkg.assets %>js/widgets/widget.js' @@ -134,6 +135,7 @@ module.exports = (grunt) -> '<%= pkg.assets %>js/third-party/numeral.js' '<%= pkg.assets %>js/third-party/numeral-languages.js' '<%= pkg.assets %>js/third-party/bootstrap/tooltip.js' + '<%= pkg.assets %>js/third-party/bootstrap/dropdown.js' '<%= pkg.assets %>js/select2-jquery-ui-fix.js' '<%= pkg.assets %>js/widgets/base.js' '<%= pkg.assets %>js/widgets/widget.js' @@ -235,6 +237,10 @@ module.exports = (grunt) -> name: 'analysis-reports/app' out: '<%= pkg.assets %>build/js/analysis-reports/app.js' + nav: options: + name: 'nav/app' + out: '<%= pkg.assets %>build/js/nav/app.js' + handlebars: options: @@ -285,6 +291,9 @@ module.exports = (grunt) -> '<%= pkg.assets %>js/templates/analysis-reports.js': [ '<%= pkg.sources %>hbs/analysis-reports/**/*.hbs' ] + '<%= pkg.assets %>js/templates/nav.js': [ + '<%= pkg.sources %>hbs/nav/**/*.hbs' + ] clean: diff --git a/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs b/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs new file mode 100644 index 00000000000..fcb273a09ae --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs @@ -0,0 +1,18 @@ + diff --git a/server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs b/server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs new file mode 100644 index 00000000000..df44ac06af2 --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs @@ -0,0 +1 @@ +{{#if labelLocalized}}{{labelLocalized}}{{else}}{{t label}}{{/if}} 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 new file mode 100644 index 00000000000..df091ff766e --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/nav-context-navbar.hbs @@ -0,0 +1,38 @@ +
+ + + +
diff --git a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs new file mode 100644 index 00000000000..5b000361c48 --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs @@ -0,0 +1,63 @@ +
+ + + + +
diff --git a/server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs b/server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs new file mode 100644 index 00000000000..ccac4831661 --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs @@ -0,0 +1 @@ +{{t 'no_results'}} diff --git a/server/sonar-web/src/main/hbs/nav/nav-search-item.hbs b/server/sonar-web/src/main/hbs/nav/nav-search-item.hbs new file mode 100644 index 00000000000..1de73f23eab --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/nav-search-item.hbs @@ -0,0 +1,16 @@ + + {{#if extra}} + {{extra}} + {{/if}} + {{#if q}}{{qualifierIcon q}}{{/if}} + {{#if subtitle}} + {{title}} +
+ {{#if extra}} +   + {{/if}} + {{subtitle}} + {{else}} + {{name}} + {{/if}} + diff --git a/server/sonar-web/src/main/hbs/nav/nav-search.hbs b/server/sonar-web/src/main/hbs/nav/nav-search.hbs new file mode 100644 index 00000000000..ed298aef314 --- /dev/null +++ b/server/sonar-web/src/main/hbs/nav/nav-search.hbs @@ -0,0 +1,6 @@ + + + + +
diff --git a/server/sonar-web/src/main/js/application.js b/server/sonar-web/src/main/js/application.js index a1c209a82b6..5b15d75608f 100644 --- a/server/sonar-web/src/main/js/application.js +++ b/server/sonar-web/src/main/js/application.js @@ -21,13 +21,13 @@ function toggleFav(resourceId, elt) { }}); } -function dashboardParameters() { +function dashboardParameters (urlHasSomething) { var queryString = window.location.search; - var parameters = ''; + var parameters = []; var matchDashboard = queryString.match(/did=\d+/); if (matchDashboard && $j('#is-project-dashboard').length === 1) { - parameters += (matchDashboard[0] + '&'); + parameters.push(matchDashboard[0]); } var matchPeriod = queryString.match(/period=\d+/); @@ -35,14 +35,15 @@ function dashboardParameters() { // If we have a match for period, check that it is not project-specific var period = parseInt(/period=(\d+)/.exec(queryString)[1]); if (period <= 3) { - parameters += matchPeriod[0] + '&'; + parameters.push(matchPeriod[0]); } } - if (parameters !== '') { - parameters = '?' + parameters; + var query = parameters.join('&'); + if (query !== '') { + query = (urlHasSomething ? '&' : '?') + query; } - return parameters; + return query; } @@ -90,7 +91,7 @@ Treemap.prototype.load = function () { $j.ajax({ type: 'GET', url: baseUrl + '/treemap/index?html_id=' + this.id + '&size_metric=' + this.sizeMetric + - '&color_metric=' + this.colorMetric + '&resource=' + context.rid, + '&color_metric=' + this.colorMetric + '&resource=' + context.rid, dataType: 'html', success: function (data) { if (data.length > 1) { @@ -340,11 +341,7 @@ jQuery(function () { // Define global shortcuts key('s', function () { - jQuery('#searchInput').focus().on('keydown', function (e) { - if (e.keyCode === 27) { - jQuery('#searchInput').blur(); - } - }); + jQuery('.js-search-dropdown-toggle').dropdown('toggle'); return false; }); }); diff --git a/server/sonar-web/src/main/js/common/selectable-collection-view.js b/server/sonar-web/src/main/js/common/selectable-collection-view.js new file mode 100644 index 00000000000..6ddce02f574 --- /dev/null +++ b/server/sonar-web/src/main/js/common/selectable-collection-view.js @@ -0,0 +1,62 @@ +define(function () { + + return Marionette.CollectionView.extend({ + + initialize: function () { + this.resetSelectedIndex(); + this.listenTo(this.collection, 'reset', this.resetSelectedIndex); + }, + + resetSelectedIndex: function () { + this.selectedIndex = 0; + }, + + onRender: function () { + this.selectCurrent(); + }, + + submitCurrent: function () { + var view = this.children.findByIndex(this.selectedIndex); + if (view != null) { + view.submit(); + } + }, + + selectCurrent: function () { + this.selectItem(this.selectedIndex); + }, + + selectNext: function () { + if (this.selectedIndex < this.collection.length - 1) { + this.deselectItem(this.selectedIndex); + this.selectedIndex++; + this.selectItem(this.selectedIndex); + } + }, + + selectPrev: function () { + if (this.selectedIndex > 0) { + this.deselectItem(this.selectedIndex); + this.selectedIndex--; + this.selectItem(this.selectedIndex); + } + }, + + selectItem: function (index) { + if (index >= 0 && index < this.collection.length) { + var view = this.children.findByIndex(index); + if (view != null) { + view.select(); + } + } + }, + + deselectItem: function (index) { + var view = this.children.findByIndex(index); + if (view != null) { + view.deselect(); + } + } + }); + +}); diff --git a/server/sonar-web/src/main/js/nav/app.js b/server/sonar-web/src/main/js/nav/app.js new file mode 100644 index 00000000000..1f3722c3465 --- /dev/null +++ b/server/sonar-web/src/main/js/nav/app.js @@ -0,0 +1,34 @@ +define([ + 'nav/global-navbar-view', + 'nav/context-navbar-view' +], function (GlobalNavbarView, ContextNavbarView) { + + var $ = jQuery, + App = new Marionette.Application(); + + App.addInitializer(function () { + this.navbarView = new GlobalNavbarView({ + app: App, + el: $('.navbar-global'), + collection: new Backbone.Collection(window.navbarGlobalMenu) + }); + this.navbarView.render(); + }); + + if (window.navbarBreadcrumbs != null) { + App.addInitializer(function () { + this.contextNavbarView = new ContextNavbarView({ + app: App, + el: $('.navbar-context'), + collection: new Backbone.Collection(window.navbarContextMenu), + breadcrumbs: new Backbone.Collection(window.navbarBreadcrumbs), + }); + this.contextNavbarView.render(); + }); + } + + window.requestMessages().done(function () { + App.start(); + }); + +}); diff --git a/server/sonar-web/src/main/js/nav/context-navbar-view.js b/server/sonar-web/src/main/js/nav/context-navbar-view.js new file mode 100644 index 00000000000..ec6f39fedf7 --- /dev/null +++ b/server/sonar-web/src/main/js/nav/context-navbar-view.js @@ -0,0 +1,17 @@ +define([ + 'templates/nav' +], function () { + + var $ = jQuery; + + return Marionette.ItemView.extend({ + template: Templates['nav-context-navbar'], + + serializeData: function () { + return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), { + breadcrumbs: this.options.breadcrumbs.toJSON() + }); + } + }); + +}); diff --git a/server/sonar-web/src/main/js/nav/global-navbar-view.js b/server/sonar-web/src/main/js/nav/global-navbar-view.js new file mode 100644 index 00000000000..e87ecc6d3f7 --- /dev/null +++ b/server/sonar-web/src/main/js/nav/global-navbar-view.js @@ -0,0 +1,83 @@ +define([ + 'nav/search-view', + 'templates/nav' +], function (SearchView) { + + var $ = jQuery; + + return Marionette.Layout.extend({ + template: Templates['nav-global-navbar'], + + regions: { + searchRegion: '.js-search-region' + }, + + events: { + 'click .js-login': 'onLoginClick', + 'click .js-favorite': 'onFavoriteClick', + 'show.bs.dropdown .js-search-dropdown': 'onSearchDropdownShow', + 'hidden.bs.dropdown .js-search-dropdown': 'onSearchDropdownHidden' + }, + + initialize: function () { + this.projectName = window.navbarProject; + this.projectKey = window.navbarProjectKey; + this.isProjectFavorite = window.navbarProjectFavorite; + }, + + onRender: function () { + var that = this; + this.$el.addClass('navbar-' + window.navbarSpace); + this.$el.addClass('navbar-fade'); + setTimeout(function () { + that.$el.addClass('in'); + }, 0); + }, + + onLoginClick: function () { + var returnTo = window.location.pathname + window.location.search; + window.location = baseUrl + '/sessions/new?return_to=' + encodeURIComponent(returnTo) + window.location.hash; + return false; + }, + + onFavoriteClick: function () { + var that = this, + p = window.process.addBackgroundProcess(), + url = baseUrl + '/favourites/toggle/' + window.navbarProjectId; + return $.post(url).done(function () { + that.isProjectFavorite = !that.isProjectFavorite; + that.render(); + window.process.finishBackgroundProcess(p); + }).fail(function () { + window.process.failBackgroundProcess(p); + }); + }, + + onSearchDropdownShow: function () { + var that = this; + this.searchRegion.show(new SearchView({ + hide: function () { + that.$('.js-search-dropdown-toggle').dropdown('toggle'); + } + })); + }, + + onSearchDropdownHidden: function () { + this.searchRegion.reset(); + }, + + serializeData: function () { + return _.extend(Marionette.Layout.prototype.serializeData.apply(this, arguments), { + user: window.SS.user, + userName: window.SS.userName, + isUserAdmin: window.SS.isUserAdmin, + + projectName: this.projectName, + projectKey: this.projectKey, + projectFavorite: this.isProjectFavorite, + navbarCanFavoriteProject: window.navbarCanFavoriteProject + }); + } + }); + +}); diff --git a/server/sonar-web/src/main/js/nav/search-view.js b/server/sonar-web/src/main/js/nav/search-view.js new file mode 100644 index 00000000000..6efd0ca8f92 --- /dev/null +++ b/server/sonar-web/src/main/js/nav/search-view.js @@ -0,0 +1,154 @@ +define([ + 'common/selectable-collection-view', + 'templates/nav' +], function (SelectableCollectionView) { + + var $ = jQuery, + + SearchItemView = Marionette.ItemView.extend({ + tagName: 'li', + template: Templates['nav-search-item'], + + select: function () { + this.$el.addClass('active'); + }, + + deselect: function () { + this.$el.removeClass('active'); + }, + + submit: function () { + this.$('a')[0].click(); + } + }), + + SearchEmptyView = Marionette.ItemView.extend({ + tagName: 'li', + template: Templates['nav-search-empty'] + }), + + SearchResultsView = SelectableCollectionView.extend({ + className: 'menu', + tagName: 'ul', + itemView: SearchItemView, + emptyView: SearchEmptyView + }); + + return Marionette.Layout.extend({ + className: 'navbar-search', + tagName: 'form', + template: Templates['nav-search'], + + regions: { + resultsRegion: '.js-search-results' + }, + + events: { + 'submit': 'onSubmit', + 'keydown .js-search-input': 'onKeyDown', + 'keyup .js-search-input': 'debouncedOnKeyUp' + }, + + initialize: function () { + this.results = new Backbone.Collection(); + this.resetResultsToDefault(); + this.resultsView = new SearchResultsView({ collection: this.results }); + this.debouncedOnKeyUp = _.debounce(this.onKeyUp, 400); + this._bufferedValue = ''; + }, + + onRender: function () { + var that = this; + this.resultsRegion.show(this.resultsView); + setTimeout(function () { + that.$('.js-search-input').focus(); + }, 0); + }, + + onKeyDown: function (e) { + if (e.keyCode === 38) { + this.resultsView.selectPrev(); + return false; + } + if (e.keyCode === 40) { + this.resultsView.selectNext(); + return false; + } + if (e.keyCode === 13) { + this.resultsView.submitCurrent(); + return false; + } + if (e.keyCode === 27) { + this.options.hide(); + return false; + } + }, + + onKeyUp: function () { + var value = this.$('.js-search-input').val(); + if (value === this._bufferedValue) { + return; + } + this._bufferedValue = this.$('.js-search-input').val(); + this.search(value); + }, + + onSubmit: function () { + return false; + }, + + resetResultsToDefault: function () { + var recentHistory = JSON.parse(localStorage.getItem('sonar_recent_history')), + history = (recentHistory || []).map(function (historyItem) { + return { + url: baseUrl + '/dashboard/index?id=' + encodeURIComponent(historyItem.key) + dashboardParameters(true), + name: historyItem.name, + q: historyItem.icon + }; + }), + qualifiers = window.navbarQualifiers.map(function (q) { + return { + url: baseUrl + '/all_projects?qualifier=' + encodeURIComponent(q), + name: t('qualifiers.all', q) + }; + }); + this.results.reset(history.concat(qualifiers)); + }, + + search: function (q) { + if (q.length < 2) { + this.resetResultsToDefault(); + return; + } + var that = this, + url = baseUrl + '/api/components/suggestions', + options = { s: q }, + p = window.process.addBackgroundProcess(); + return $.get(url, options).done(function (r) { + var collection = []; + r.results.forEach(function (domain) { + domain.items.forEach(function (item, index) { + var title = item.name, + subtitle = null; + if (domain.q === 'FIL' || domain.q === 'UTS') { + subtitle = title.substr(0, title.lastIndexOf('/') - 1); + title = title.substr(title.lastIndexOf('/') + 1); + } + collection.push(_.extend(item, { + q: domain.q, + title: title, + subtitle: subtitle, + extra: index === 0 ? domain.name : ' ', + url: baseUrl + '/dashboard/index?id=' + encodeURIComponent(item.key) + dashboardParameters(true) + })); + }); + }); + that.results.reset(collection); + window.process.finishBackgroundProcess(p); + }).fail(function() { + window.process.failBackgroundProcess(p); + }); + } + }); + +}); diff --git a/server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js b/server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js new file mode 100644 index 00000000000..69698bcd2c5 --- /dev/null +++ b/server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js @@ -0,0 +1,161 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.3.1 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle="dropdown"]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.VERSION = '3.3.1' + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this + .trigger('focus') + .attr('aria-expanded', 'true') + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown', relatedTarget) + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if ((!isActive && e.which != 27) || (isActive && e.which == 27)) { + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') + } + + var desc = ' li:not(.divider):visible a' + var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) + + if (!$items.length) return + + var index = $items.index(e.target) + + if (e.which == 38 && index > 0) index-- // up + if (e.which == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).trigger('focus') + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $this = $(this) + var $parent = getParent($this) + var relatedTarget = { relatedTarget: this } + + if (!$parent.hasClass('open')) return + + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.attr('aria-expanded', 'false') + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.dropdown + + $.fn.dropdown = Plugin + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown) + +}(jQuery); diff --git a/server/sonar-web/src/main/less/components.less b/server/sonar-web/src/main/less/components.less index 12c41821334..860b68b0540 100644 --- a/server/sonar-web/src/main/less/components.less +++ b/server/sonar-web/src/main/less/components.less @@ -8,3 +8,5 @@ @import "components/search-navigator"; @import "components/typography"; @import "components/tooltips"; +@import "components/dropdowns"; +@import "components/menu"; diff --git a/server/sonar-web/src/main/less/components/dropdowns.less b/server/sonar-web/src/main/less/components/dropdowns.less new file mode 100644 index 00000000000..756622d3a53 --- /dev/null +++ b/server/sonar-web/src/main/less/components/dropdowns.less @@ -0,0 +1,119 @@ +@import (reference) "../mixins"; +@import (reference) "../variables"; +@import (reference) "../ui"; + + +.dropdown { + position: relative; +} + +.dropdown-toggle:focus { + outline: 0; +} + +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; // none by default, but block on "open" of the menu + float: left; + min-width: 160px; + padding: 5px 0; + list-style: none; + font-size: @smallFontSize; + text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) + background-color: #fff; + border: 1px solid @barBorderColor; + box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + background-clip: padding-box; + + &.pull-right { + right: 0; + left: auto; + } + + // Links within the dropdown menu + > li > a { + display: block; + padding: 3px 20px; + line-height: 1.5; + clear: both; + font-weight: normal; + color: @baseFontColor; + white-space: nowrap; // prevent links from randomly breaking onto new lines + } +} + +// Hover/Focus state +.dropdown-menu > li > a { + &:hover, + &:focus { + text-decoration: none; + color: @baseFontColor; + background-color: @lightBlue; + } +} + +// Active state +.dropdown-menu > .active > a { + &, + &:hover, + &:focus { + color: @baseFontColor; + text-decoration: none; + outline: 0; + background-color: @lightBlue; + } +} + +// Open state for the dropdown +.open { + // Show the menu + > .dropdown-menu { + display: block; + } + + // Remove the outline when :focus is triggered + > a { + outline: 0; + } +} + +// Menu positioning +// +// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown +// menu with the parent. +.dropdown-menu-right { + left: auto; // Reset the default from `.dropdown-menu` + right: 0; +} +// With v3, we enabled auto-flipping if you have a dropdown within a right +// aligned nav component. To enable the undoing of that, we provide an override +// to restore the default dropdown menu alignment. +// +// This is only for left-aligning a dropdown menu within a `.navbar-right` or +// `.pull-right` nav component. +.dropdown-menu-left { + left: 0; + right: auto; +} + +// Dropdown section headers +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: @smallFontSize; + color: @baseFontColor; + white-space: nowrap; // as with > li > a +} + +// Backdrop to catch body clicks on mobile, etc. +.dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: (1000 - 10); +} diff --git a/server/sonar-web/src/main/less/components/menu.less b/server/sonar-web/src/main/less/components/menu.less new file mode 100644 index 00000000000..0b78b90f030 --- /dev/null +++ b/server/sonar-web/src/main/less/components/menu.less @@ -0,0 +1,53 @@ +@import (reference) "../mixins"; +@import (reference) "../variables"; +@import (reference) "../ui"; + +.menu { + min-width: 160px; + padding: 5px 0; + list-style: none; + font-size: @smallFontSize; + text-align: left; + background-color: #fff; + background-clip: padding-box; + + > li > a, + > li > span { + display: block; + padding: 3px 20px; + line-height: 1.5; + clear: both; + font-weight: normal; + .text-ellipsis; + } + + > li > a { + color: @baseFontColor; + } + + .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: @barBorderColor; + } +} + + +.menu > li > a { + &:hover, &:focus { + text-decoration: none; + color: @baseFontColor; + background-color: @lightBlue; + } +} + + +.menu > .active > a { + &, &:hover, &:focus { + color: @baseFontColor; + text-decoration: none; + outline: 0; + background-color: @lightBlue; + } +} diff --git a/server/sonar-web/src/main/less/components/search-navigator.less b/server/sonar-web/src/main/less/components/search-navigator.less index f73ff56db1e..e5c408df6fe 100644 --- a/server/sonar-web/src/main/less/components/search-navigator.less +++ b/server/sonar-web/src/main/less/components/search-navigator.less @@ -258,7 +258,7 @@ } .search-navigator-workspace { - padding-left: @sideWidth; + padding-left: @sideWidth - 10px; } .search-navigator-workspace-header { diff --git a/server/sonar-web/src/main/less/dashboard.less b/server/sonar-web/src/main/less/dashboard.less index a5bcb867a88..86dce3a54a7 100644 --- a/server/sonar-web/src/main/less/dashboard.less +++ b/server/sonar-web/src/main/less/dashboard.less @@ -15,6 +15,7 @@ #dashboard { position: relative; width: 100%; + padding: 10px 0; } #dashboard .transparent { diff --git a/server/sonar-web/src/main/less/layout.less b/server/sonar-web/src/main/less/layout.less index 7ccf1d683c1..6f0d08437d9 100644 --- a/server/sonar-web/src/main/less/layout.less +++ b/server/sonar-web/src/main/less/layout.less @@ -53,6 +53,10 @@ body, a { } /* LAYOUT */ +#content { + padding: 0 10px; +} + #container { height: auto !important; min-width: 940px; @@ -268,7 +272,7 @@ ul.sidebar select, ul.sidebar input { } .page { - padding: 10px; + padding: 10px 0; } .page-split-left { min-width: 200px; diff --git a/server/sonar-web/src/main/less/navbar.less b/server/sonar-web/src/main/less/navbar.less new file mode 100644 index 00000000000..c103662110a --- /dev/null +++ b/server/sonar-web/src/main/less/navbar.less @@ -0,0 +1,183 @@ +@import (reference) "mixins"; +@import (reference) "variables"; +@import (reference) "ui"; + +@navbarGlobalBackground: #262626; +@navbarContextBackground: @barBackgroundColor; + +@navbarHeight: 30px; +@navbarLineHeight: 20px; +@navbarTopPadding: (@navbarHeight - @navbarLineHeight) / 2; + +.navbar, [class^="navbar-"], [class*=" navbar-"] { + .box-sizing(border-box); +} + +.navbar { + .clearfix; + height: @navbarHeight; +} + +.navbar-fade { + .navbar-nav { + opacity: 0; + .trans(opacity); + } + + .navbar-favorite { + margin-right: -23px; + .trans(margin); + } + + &.in { + .navbar-nav { + opacity: 1; + } + + .navbar-favorite { + margin-right: 0; + } + } +} + +.navbar a { + .link-no-underline; +} + +.navbar-header { + float: left; +} + +.navbar-nav { + float: left; +} + +.navbar-nav > li { + float: left; +} + +.navbar-nav > li > a { + padding: @navbarTopPadding 10px; + line-height: @navbarLineHeight; + color: #fff; + font-size: 12px; + font-weight: 300; + letter-spacing: 0.05em; + + &:hover, &:focus { + color: #fff; + } +} + +.navbar-nav > .active > a, +.navbar-nav > .dropdown.open > a { + color: #fff; +} + + +.navbar-icon:before { + font-size: @iconFontSize; +} + +.navbar-favorite { + position: relative; + top: -2px; +} + +.navbar-right { + float: right; +} + +.navbar-search { + position: relative; + width: 400px; + .box-sizing(border-box); + .trans(width); +} + +.navbar-search-input { + width: 100%; + padding: 0 20px 0 40px !important; + border: none !important; +} + +.navbar-search-icon { + position: absolute; + top: 4px; + left: 20px; + color: @secondFontColor; + + &:before { + font-size: @iconSmallFontSize; + } +} + +.navbar-search-extra { + display: inline-block; + width: 90px; + margin-right: 10px; + text-align: right; +} + + +.navbar-global { + background-color: @navbarGlobalBackground; + + .navbar-nav > li > a:hover, + .navbar-nav > li > a:focus, + .navbar-nav > .active > a, + .navbar-nav > .dropdown.open > a { + background-color: darken(@navbarGlobalBackground, 10%); + } +} + + +.navbar-context { + background-color: @navbarContextBackground; + border-bottom: 1px solid @barBorderColor; + + .navbar-nav > li > a { + color: @baseFontColor; + font-weight: 400; + letter-spacing: 0; + } + + .navbar-nav > li > a:hover, + .navbar-nav > li > a:focus, + .navbar-nav > .active > a, + .navbar-nav > .dropdown.open > a { + color: @baseFontColor; + } +} + +.navbar-nav-pills { + padding-top: 4px; + padding-bottom: 4px; + + > li + li { + margin-left: 5px; + } + + > li > a { + padding-top: 0; + padding-bottom: 0; + border: 1px solid transparent; + border-radius: 3px; + color: @baseFontColor; + font-weight: 400; + letter-spacing: 0; + } + + > li > a:hover, + > li > a:focus, + > .active > a, + > .dropdown.open > a { + border-color: @blue; + color: @baseFontColor; + } + + > .active > a, + > .dropdown.open > a { + background-color: @lightBlue; + } +} diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less index 5db86117768..d14edf4f27f 100644 --- a/server/sonar-web/src/main/less/style.less +++ b/server/sonar-web/src/main/less/style.less @@ -1971,54 +1971,6 @@ table.nowrap td.small, td.nowrap.small, th.nowrap.small { cursor: pointer; } -.dropdown { - cursor: pointer; - display: inline-block; - text-decoration: none !important; - /* zoom and *display = ie7 hack for display:inline-block */ - zoom: 1; - *display: inline; -} - -.dropdown-menu { - background-clip: padding-box; - background-color: #FFFFFF; - border: 1px solid #DDD; - box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5); - float: left; - margin: 0; - max-width: 220px; - min-width: 160px; - padding: 0; - position: absolute; - z-index: 1000; -} - -.dropdown-menu h2 { - padding: 0 8px; - font-size: 100%; - font-weight: bold; -} - -.dropdown-menu li { - list-style-type: none !important; - line-height: 24px; - height: 24px; - padding: 0 8px; - cursor: pointer !important; - float: none !important; -} - -.dropdown-menu li:hover { - background-color: @lightBlue !important; -} - -.dropdown-menu a { - text-decoration: none !important; - border-bottom: none !important; - color: @baseFontColor !important; -} - .form-key-cell { padding: 2px 8px 4px 10px; text-align: right; diff --git a/server/sonar-web/src/main/less/ui.less b/server/sonar-web/src/main/less/ui.less index 5081ad535c1..f8fc1c1da66 100644 --- a/server/sonar-web/src/main/less/ui.less +++ b/server/sonar-web/src/main/less/ui.less @@ -7,9 +7,9 @@ font-family: 'Roboto'; src: url('../fonts/Roboto-Light-webfont.eot'); src: url('../fonts/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/Roboto-Light-webfont.woff') format('woff'), - url('../fonts/Roboto-Light-webfont.ttf') format('truetype'), - url('../fonts/Roboto-Light-webfont.svg#robotolight') format('svg'); + url('../fonts/Roboto-Light-webfont.woff') format('woff'), + url('../fonts/Roboto-Light-webfont.ttf') format('truetype'), + url('../fonts/Roboto-Light-webfont.svg#robotolight') format('svg'); font-weight: 300; font-style: normal; } @@ -17,9 +17,9 @@ font-family: 'Roboto'; src: url('../fonts/Roboto-Regular-webfont.eot'); src: url('../fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/Roboto-Regular-webfont.woff') format('woff'), - url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'), - url('../fonts/Roboto-Regular-webfont.svg#robotoregular') format('svg'); + url('../fonts/Roboto-Regular-webfont.woff') format('woff'), + url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'), + url('../fonts/Roboto-Regular-webfont.svg#robotoregular') format('svg'); font-weight: 400; font-style: normal; } @@ -27,9 +27,9 @@ font-family: 'Roboto'; src: url('../fonts/Roboto-Medium-webfont.eot'); src: url('../fonts/Roboto-Medium-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/Roboto-Medium-webfont.woff') format('woff'), - url('../fonts/Roboto-Medium-webfont.ttf') format('truetype'), - url('../fonts/Roboto-Medium-webfont.svg#robotomedium') format('svg'); + url('../fonts/Roboto-Medium-webfont.woff') format('woff'), + url('../fonts/Roboto-Medium-webfont.ttf') format('truetype'), + url('../fonts/Roboto-Medium-webfont.svg#robotomedium') format('svg'); font-weight: 500; font-style: normal; } @@ -37,9 +37,9 @@ font-family: 'Roboto'; src: url('../fonts/Roboto-Bold-webfont.eot'); src: url('../fonts/Roboto-Bold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/Roboto-Bold-webfont.woff') format('woff'), - url('../fonts/Roboto-Bold-webfont.ttf') format('truetype'), - url('../fonts/Roboto-Bold-webfont.svg#robotobold') format('svg'); + url('../fonts/Roboto-Bold-webfont.woff') format('woff'), + url('../fonts/Roboto-Bold-webfont.ttf') format('truetype'), + url('../fonts/Roboto-Bold-webfont.svg#robotobold') format('svg'); font-weight: 700; font-style: normal; } @@ -184,6 +184,7 @@ a { input[type=text], input[type=password], input[type=email], +input[type=search], textarea { border: 1px solid @darkGrey; .box-sizing(border-box); @@ -203,11 +204,16 @@ textarea { input[type=text], input[type=password], -input[type=email] { - height: 22px; +input[type=email], +input[type=search] { + height: @formControlHeight; padding: 0 3px; } +input[type=search] { + -webkit-appearance: none; +} + textarea { padding: 3px; } @@ -218,7 +224,7 @@ input[type=submit], input[type=button] { display: inline-block; vertical-align: baseline; - height: 22px; + height: @formControlHeight; margin: 0 1px; padding: 0 10px; @@ -264,7 +270,7 @@ input[type=button] { } } -.button { line-height: 22px; } +.button { line-height: @formControlHeight; } .button-red { &:hover, &:focus { @@ -419,7 +425,7 @@ input[type=button] { max-width: 900px; margin-left: -150px; padding: 0 10px; - line-height: 22px; + line-height: @formControlHeight; background-color: #f0e8ac; border-radius: 0 0 3px 3px; text-align: center; @@ -458,3 +464,21 @@ input[type=button] { font-weight: 500; text-align: center; } + + +.nav { + margin: 0; + padding: 0; + list-style: none; +} + +.nav > li { + position: relative; + display: block; +} + +.nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} diff --git a/server/sonar-web/src/main/less/variables.less b/server/sonar-web/src/main/less/variables.less index 37e5e29e364..bcb64f77280 100644 --- a/server/sonar-web/src/main/less/variables.less +++ b/server/sonar-web/src/main/less/variables.less @@ -35,6 +35,9 @@ @darkBlue: darken(@blue, 20%); +@darkColor: #262626; +@lightColor: #fff; + @highlighted: @blue; @highlightedBackground: @lightBlue; @contextBackground: lighten(@purple, 40%); @@ -47,6 +50,15 @@ @issueBorderColor: desaturate(darken(@issueBackgroundColor, 40%), 30%); + +/* + * Sizes + */ + +@formControlHeight: 22px; + + + /* * Icons */ diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb index 410d59f601f..6bc2267382f 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb @@ -69,8 +69,8 @@ class Api::ComponentsController < Api::ApiController qualifier_results['items']=resource_indexes.map do |resource_index| resource=resources_by_id[resource_index.resource_id] { - 'id' => resource.id, - 'name' => resource.name(true) + 'key' => resource.key, + 'name' => resource.name(true) } end json_results< <% end %> -
+

<%= message('my_profile.page') -%>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb index 78e2b2f6c8d..5c77019cf4f 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb @@ -65,7 +65,7 @@ <% end %> -
+
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb index adfcecbf1b6..5024d0a5605 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb @@ -25,76 +25,78 @@ padding: 5px; } <% end %> - - -
-

<%= message('dependencies.search_help') -%>

-
+
+
+ +
+

<%= message('dependencies.search_help') -%>

+
-
- <% if @resources %> -
-

<%= message('dependencies.select_library') -%> :

-
- - - <% if @resources.empty? %> - - <% end %> - <% @resources.each do |resource|%> - - - - <% end %> - -
<%= message('no_data') -%>
<%= qualifier_icon(resource) %> <%= h resource.name(true) -%>
<%= h resource.kee -%>
+
+ <% if @resources %> +
+

<%= message('dependencies.select_library') -%> :

+
+ + + <% if @resources.empty? %> + + <% end %> + <% @resources.each do |resource|%> + + + + <% end %> + +
<%= message('no_data') -%>
<%= qualifier_icon(resource) %> <%= h resource.name(true) -%>
<%= h resource.kee -%>
+
-
- <% end %> + <% end %> - <% if @versions %> -
-

<%= message('dependencies.select_version') -%> :

-
- - - <% if @versions.size>1 %> - - + <% if @versions %> +
+

<%= message('dependencies.select_version') -%> :

+
+
All
+ + <% if @versions.size>1 %> + + + + <% end %> + <% @versions.each do |version|%> + + - <% end %> - <% @versions.each do |version|%> - - - - <% end %> - -
All
<%= version -%>
<%= version -%>
+ <% end %> + + +
-
- <% end %> + <% end %> - <% if @project_snapshots %> -
-

<%= message('dependencies.used_by') -%> :

-
- - - <% if @project_snapshots.empty? %> - - <% end %> - <% @project_snapshots.each do |project_snapshot|%> - - - - <% end %> - -
<%= message('dependencies.not_used') -%>
- <%= qualifier_icon(project_snapshot.project) %> <%= link_to h(project_snapshot.project.name(true)), "#{ApplicationController.root_context}/libraries/index/#{project_snapshot.project_id}" -%>
- <%= h project_snapshot.project.kee -%>
+ <% if @project_snapshots %> +
+

<%= message('dependencies.used_by') -%> :

+
+ + + <% if @project_snapshots.empty? %> + + <% end %> + <% @project_snapshots.each do |project_snapshot|%> + + + + <% end %> + +
<%= message('dependencies.not_used') -%>
+ <%= qualifier_icon(project_snapshot.project) %> <%= link_to h(project_snapshot.project.name(true)), "#{ApplicationController.root_context}/libraries/index/#{project_snapshot.project_id}" -%>
+ <%= h project_snapshot.project.kee -%>
+
+ <% end %>
- <% end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.html.erb new file mode 100644 index 00000000000..98319a4caf5 --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.html.erb @@ -0,0 +1,29 @@ +<% + selected_section = controller.class::SECTION if defined?(controller.class::SECTION) + if selected_section==Navigation::SECTION_RESOURCE && !@project && !@resource + selected_section = Navigation::SECTION_HOME + end + @project=@resource unless @project || selected_section==Navigation::SECTION_HOME + period_param = "period=#{u(params[:period])}" if params[:period] + displayed_resource = @resource || @project + display_only_root = @issue + resource_id=displayed_resource ? (displayed_resource.is_a?(Fixnum) ? displayed_resource : displayed_resource.permanent_id) : nil +%> + +<%= render :partial => 'layouts/navbar_conf_global' %> + +<% if selected_section==Navigation::SECTION_RESOURCE %> + <%= render :partial => 'layouts/navbar_conf_context' %> +<% elsif selected_section==Navigation::SECTION_CONFIGURATION %> + <%= render :partial => 'layouts/navbar_conf_settings' %> +<% end %> + + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_context.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_context.html.erb new file mode 100644 index 00000000000..58d7c40b3d5 --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_context.html.erb @@ -0,0 +1,208 @@ +<% + @project=@resource unless @project || selected_section==Navigation::SECTION_HOME + period_param = "period=#{u(params[:period])}" if params[:period] + displayed_resource = @resource || @project + display_only_root = @issue + resource_id=displayed_resource ? (displayed_resource.is_a?(Fixnum) ? displayed_resource : displayed_resource.permanent_id) : nil +%> + + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb new file mode 100644 index 00000000000..9222f665efd --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb @@ -0,0 +1,75 @@ +<% + selected_section = controller.class::SECTION if defined?(controller.class::SECTION) + if selected_section==Navigation::SECTION_RESOURCE && !@project && !@resource + selected_section = Navigation::SECTION_HOME + end +%> + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb new file mode 100644 index 00000000000..e6268a263fd --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb @@ -0,0 +1,109 @@ +<% + selected_section = controller.class::SECTION if defined?(controller.class::SECTION) + if selected_section==Navigation::SECTION_RESOURCE && !@project && !@resource + selected_section = Navigation::SECTION_HOME + end +%> + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb new file mode 100644 index 00000000000..51b81a44d3f --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb @@ -0,0 +1,9 @@ + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb index 3c67adf30b2..52e8974dc14 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb @@ -10,9 +10,10 @@ end %> <%= render :partial => 'layouts/head' unless params[:hd]=='false' %> +<%= render :partial => 'layouts/navbar' %> <% if params[:layout]=='false' %> <%= render :partial => 'layouts/nolayout' %> <% else %> <%= render :partial => 'layouts/layout' %> <% end %> -<%= render :partial => 'layouts/footer' unless params[:hd]=='false' %> \ No newline at end of file +<%= render :partial => 'layouts/footer' unless params[:hd]=='false' %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/index.html.erb index d2c6ebcae2c..55ae2ad65ec 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/index.html.erb @@ -1 +1,3 @@ -<%= render 'settings', :project => nil %> \ No newline at end of file +
+ <%= render 'settings', :project => nil %> +
-- 2.39.5