From 0a06380c47424d6fd7958f3b2cf6ef28b5c8116d Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 20 Jan 2015 13:28:52 +0100 Subject: [PATCH] Reverse "SONAR-6041 New webapp layout" --- server/sonar-web/.jshintrc | 2 - server/sonar-web/Gruntfile.coffee | 11 - .../issues/component-viewer/main.coffee | 1 + .../issues/facets/severity-facet.coffee | 2 +- .../coffee/issues/facets/status-facet.coffee | 2 +- .../main/coffee/issues/filters-view.coffee | 5 + .../src/main/coffee/issues/layout.coffee | 25 +- .../issues/workspace-header-view.coffee | 5 - .../main/coffee/quality-gate/layout.coffee | 14 ++ .../hbs/coding-rules/coding-rules-filters.hbs | 9 + .../hbs/coding-rules/coding-rules-layout.hbs | 14 +- .../coding-rules-workspace-header.hbs | 10 +- .../facets/issues-creation-date-facet.hbs | 2 +- .../src/main/hbs/issues/issues-filters.hbs | 2 + .../src/main/hbs/issues/issues-layout.hbs | 14 +- .../hbs/issues/issues-workspace-header.hbs | 7 +- .../sonar-web/src/main/hbs/nav/_nav-logo.hbs | 18 -- .../src/main/hbs/nav/_nav-navbar-label.hbs | 1 - .../sonar-web/src/main/hbs/nav/nav-navbar.hbs | 84 ------- .../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 - .../quality-gates/quality-gates-layout.hbs | 18 +- server/sonar-web/src/main/js/application.js | 21 +- .../src/main/js/coding-rules/controller.js | 1 + .../js/coding-rules/facets/severity-facet.js | 2 +- .../src/main/js/coding-rules/filters-view.js | 18 +- .../src/main/js/coding-rules/layout.js | 23 ++ .../main/js/coding-rules/rule-details-view.js | 1 + .../js/coding-rules/workspace-header-view.js | 17 +- .../js/common/selectable-collection-view.js | 62 ----- server/sonar-web/src/main/js/nav/app.js | 21 -- server/sonar-web/src/main/js/nav/navbar.js | 86 ------- .../sonar-web/src/main/js/nav/search-view.js | 154 ------------ .../main/js/third-party/bootstrap/dropdown.js | 161 ------------- server/sonar-web/src/main/js/translate.js | 8 +- .../sonar-web/src/main/less/components.less | 2 - .../src/main/less/components/dropdowns.less | 119 ---------- .../src/main/less/components/facets.less | 3 + .../src/main/less/components/issues.less | 5 +- .../src/main/less/components/menu.less | 53 ----- .../less/components/search-navigator.less | 73 +++++- server/sonar-web/src/main/less/icons.less | 3 - server/sonar-web/src/main/less/issues.less | 9 + .../sonar-web/src/main/less/layout-new.less | 90 ------- server/sonar-web/src/main/less/layout.less | 158 +++++++------ server/sonar-web/src/main/less/navbar.less | 223 ------------------ .../src/main/less/quality-gates.less | 12 +- server/sonar-web/src/main/less/style.less | 69 ++++-- server/sonar-web/src/main/less/ui.less | 34 +-- server/sonar-web/src/main/less/variables.less | 12 - .../controllers/api/components_controller.rb | 2 +- .../app/controllers/comparison_controller.rb | 2 +- .../controllers/dependencies_controller.rb | 2 +- .../webapp/WEB-INF/app/models/navigation.rb | 1 - .../app/views/coding_rules/index.html.erb | 2 - .../WEB-INF/app/views/issues/search.html.erb | 2 - .../app/views/layouts/_breadcrumb.html.erb | 162 +++++++------ .../WEB-INF/app/views/layouts/_head.html.erb | 2 +- .../app/views/layouts/_layout.html.erb | 223 +++++++++++++++--- .../WEB-INF/app/views/layouts/_logo.html.erb | 18 -- .../app/views/layouts/_menu_projects.html.erb | 46 ++++ .../app/views/layouts/_navbar.html.erb | 5 - .../app/views/layouts/_navbar_conf.html.erb | 29 --- .../layouts/_navbar_conf_global.html.erb | 76 ------ .../layouts/_navbar_conf_project.html.erb | 167 ------------- .../layouts/_navbar_conf_settings.html.erb | 109 --------- .../views/layouts/_recent_history.html.erb | 9 - .../app/views/layouts/_small_logo.html.erb | 9 - .../app/views/layouts/application.html.erb | 3 +- .../resources/org/sonar/l10n/core.properties | 1 - 71 files changed, 697 insertions(+), 1882 deletions(-) delete mode 100644 server/sonar-web/src/main/hbs/nav/_nav-logo.hbs delete mode 100644 server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs delete mode 100644 server/sonar-web/src/main/hbs/nav/nav-navbar.hbs delete mode 100644 server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs delete mode 100644 server/sonar-web/src/main/hbs/nav/nav-search-item.hbs delete mode 100644 server/sonar-web/src/main/hbs/nav/nav-search.hbs delete mode 100644 server/sonar-web/src/main/js/common/selectable-collection-view.js delete mode 100644 server/sonar-web/src/main/js/nav/app.js delete mode 100644 server/sonar-web/src/main/js/nav/navbar.js delete mode 100644 server/sonar-web/src/main/js/nav/search-view.js delete mode 100644 server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js delete mode 100644 server/sonar-web/src/main/less/components/dropdowns.less delete mode 100644 server/sonar-web/src/main/less/components/menu.less delete mode 100644 server/sonar-web/src/main/less/layout-new.less delete mode 100644 server/sonar-web/src/main/less/navbar.less delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_logo.html.erb create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.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_project.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_small_logo.html.erb diff --git a/server/sonar-web/.jshintrc b/server/sonar-web/.jshintrc index 5b2eb1b387b..2d6820a4d4c 100644 --- a/server/sonar-web/.jshintrc +++ b/server/sonar-web/.jshintrc @@ -82,9 +82,7 @@ "baseUrl": true, "key": true, "Backbone": true, - "Marionette": true, "Handlebars": true, - "Templates": true, "t": true, "tp": true, "moment": true, diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 809f748df89..60b9b6b3e87 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -14,7 +14,6 @@ module.exports = (grunt) -> '<%= pkg.sources %>less/select2.less' '<%= pkg.sources %>less/select2-sonar.less' '<%= pkg.sources %>less/layout.less' - '<%= pkg.sources %>less/layout-new.less' '<%= pkg.sources %>less/style.less' '<%= pkg.sources %>less/icons.less' '<%= pkg.sources %>less/ui.less' @@ -34,7 +33,6 @@ module.exports = (grunt) -> '<%= pkg.sources %>less/select2.less' '<%= pkg.sources %>less/select2-sonar.less' '<%= pkg.sources %>less/layout.less' - '<%= pkg.sources %>less/layout-new.less' '<%= pkg.sources %>less/style.less' '<%= pkg.sources %>less/icons.less' '<%= pkg.sources %>less/ui.less' @@ -93,7 +91,6 @@ 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' @@ -137,7 +134,6 @@ 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' @@ -239,10 +235,6 @@ 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: @@ -293,9 +285,6 @@ 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/coffee/issues/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee index 5e4acec7525..9979b1ad5ba 100644 --- a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee +++ b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee @@ -175,6 +175,7 @@ define [ scrollToLine: (line) -> row = @$("[data-line-number=#{line}]") goal = if row.length > 0 then row.offset().top - 200 else 0 + goal = Math.max goal, 30 $(window).scrollTop goal diff --git a/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee index 17d1fabaa9e..b0b605c6a09 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee @@ -11,6 +11,6 @@ define [ sortValues: (values) -> - order = ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'] + order = ['BLOCKER', 'MINOR', 'CRITICAL', 'INFO', 'MAJOR'] _.sortBy values, (v) -> order.indexOf v.val diff --git a/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee index e3f4d0015b4..8b35191eabf 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee @@ -11,5 +11,5 @@ define [ sortValues: (values) -> - order = ['OPEN', 'REOPENED', 'CONFIRMED', 'RESOLVED', 'CLOSED'] + order = ['OPEN', 'RESOLVED', 'REOPENED', 'CLOSED', 'CONFIRMED'] _.sortBy values, (v) -> order.indexOf v.val diff --git a/server/sonar-web/src/main/coffee/issues/filters-view.coffee b/server/sonar-web/src/main/coffee/issues/filters-view.coffee index 0b79214e605..c8ce1732134 100644 --- a/server/sonar-web/src/main/coffee/issues/filters-view.coffee +++ b/server/sonar-web/src/main/coffee/issues/filters-view.coffee @@ -12,6 +12,7 @@ define [ events: 'click .js-toggle-filters': 'toggleFilters' 'click .js-filter': 'applyFilter' + 'click .js-new-search': 'newSearch' 'click .js-filter-save-as': 'saveAs' 'click .js-filter-save': 'save' 'click .js-filter-copy': 'copy' @@ -47,6 +48,10 @@ define [ filter.fetch().done => @options.app.controller.applyFilter filter + newSearch: -> + @options.app.controller.newSearch() + + saveAs: -> query = @options.app.controller.getQuery '&' url = "#{baseUrl}/issues/save_as_form?#{query}" diff --git a/server/sonar-web/src/main/coffee/issues/layout.coffee b/server/sonar-web/src/main/coffee/issues/layout.coffee index f1854358794..6d2a60fe82b 100644 --- a/server/sonar-web/src/main/coffee/issues/layout.coffee +++ b/server/sonar-web/src/main/coffee/issues/layout.coffee @@ -18,13 +18,34 @@ define [ workspaceComponentViewerRegion: '.issues-workspace-component-viewer' + initialize: -> + $(window).on 'scroll.issues-layout', (=> @onScroll()) + + + onClose: -> + $(window).off 'scroll.issues-layout' + + + onRender: -> + @$('.search-navigator-side').isolatedScroll() + + + onScroll: -> + scrollTop = $(window).scrollTop() + $('.search-navigator').toggleClass 'sticky', scrollTop >= @topOffset + @$('.search-navigator-side').css top: Math.max(0, Math.min(@topOffset - scrollTop, @topOffset)) + + + showSpinner: (region) -> + @[region].show new Marionette.ItemView + template: _.template('') + + showComponentViewer: -> @scroll = $(window).scrollTop() $('.issues').addClass 'issues-extended-view' - @$el.closest('.container').addClass 'container-full-width' hideComponentViewer: -> $('.issues').removeClass 'issues-extended-view' $(window).scrollTop @scroll if @scroll? - @$el.closest('.container').removeClass 'container-full-width' diff --git a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee index 2d376f362b8..b60ed4da24b 100644 --- a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee +++ b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee @@ -14,7 +14,6 @@ define [ events: -> _.extend super, - 'click .js-new-search': 'newSearch' 'click .js-back': 'returnToList' @@ -30,10 +29,6 @@ define [ window.onBulkIssues = @_onBulkIssues - newSearch: -> - @options.app.controller.newSearch() - - returnToList: -> @options.app.controller.closeComponentViewer() diff --git a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee index 5a362787850..9a982cf1e02 100644 --- a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee +++ b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee @@ -26,6 +26,20 @@ define [ onResize: -> + footerEl = jQuery('#footer') + footerHeight = footerEl.outerHeight true + + resultsEl = jQuery('.navigator-results') + resultsHeight = jQuery(window).height() - resultsEl.offset().top - + parseInt(resultsEl.css('margin-bottom'), 10) - footerHeight + resultsEl.height resultsHeight + + detailsEl = jQuery('.navigator-details') + detailsWidth = jQuery(window).width() - detailsEl.offset().left - + parseInt(detailsEl.css('margin-right'), 10) + detailsHeight = jQuery(window).height() - detailsEl.offset().top - + parseInt(detailsEl.css('margin-bottom'), 10) - footerHeight + detailsEl.width(detailsWidth).height detailsHeight onRender: -> diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-filters.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-filters.hbs index 234ff85b91e..dc97d68a6fe 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-filters.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-filters.hbs @@ -1,3 +1,12 @@
{{t 'coding_rules.page'}}
+ +
+
+ + {{#if canWrite}} + + {{/if}} +
+
diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs index 01a9f34d8b4..8f46e4f8fb1 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs @@ -1,14 +1,10 @@ -
+
-
-
-
+
-
+
-
-
-
-
+
+
diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-header.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-header.hbs index 39fbca9aeb9..bcf70f5d3ab 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-header.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-workspace-header.hbs @@ -21,11 +21,9 @@
{{/notNull}} -
- - {{#if canWrite}} - + {{#if canWrite}} +
- {{/if}} -
+
+ {{/if}}
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs index b5a65ed7145..c5b3e5dd47e 100644 --- a/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs +++ b/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs @@ -6,7 +6,7 @@ {{dt createdAt}} ({{fromNow createdAt}}) {{else}} -
+
to diff --git a/server/sonar-web/src/main/hbs/issues/issues-filters.hbs b/server/sonar-web/src/main/hbs/issues/issues-filters.hbs index 234c3996579..cd51e685651 100644 --- a/server/sonar-web/src/main/hbs/issues/issues-filters.hbs +++ b/server/sonar-web/src/main/hbs/issues/issues-filters.hbs @@ -21,6 +21,8 @@
+ + {{#if state.canManageFilters}} {{#if filter.canModify}} {{#if state.changed}}{{/if}} diff --git a/server/sonar-web/src/main/hbs/issues/issues-layout.hbs b/server/sonar-web/src/main/hbs/issues/issues-layout.hbs index b9a344806cb..f60fecfb03f 100644 --- a/server/sonar-web/src/main/hbs/issues/issues-layout.hbs +++ b/server/sonar-web/src/main/hbs/issues/issues-layout.hbs @@ -1,14 +1,10 @@ -
+
-
-
-
+
-
+
-
-
-
-
+
+
diff --git a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs index 09a852bd550..93175e7c99b 100644 --- a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs +++ b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs @@ -1,6 +1,12 @@
{{#if state.component}} {{t 'issues.return_to_list'}}    + + {{#with state.component}} + {{qualifierIcon 'TRK'}} {{projectName}} +    + {{qualifierIcon qualifier}} {{name}} + {{/with}} {{else}}   {{/if}} @@ -22,7 +28,6 @@
- {{#if state.canBulkChange}} diff --git a/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs b/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs deleted file mode 100644 index fcb273a09ae..00000000000 --- a/server/sonar-web/src/main/hbs/nav/_nav-logo.hbs +++ /dev/null @@ -1,18 +0,0 @@ - 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 deleted file mode 100644 index df44ac06af2..00000000000 --- a/server/sonar-web/src/main/hbs/nav/_nav-navbar-label.hbs +++ /dev/null @@ -1 +0,0 @@ -{{#if labelLocalized}}{{labelLocalized}}{{else}}{{t label}}{{/if}} diff --git a/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs deleted file mode 100644 index 192aa010195..00000000000 --- a/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs +++ /dev/null @@ -1,84 +0,0 @@ -
-
- - {{#eq space 'project'}} -
- {{#if navbarCanFavoriteProject}} - - - {{/if}} - {{projectName}} -
- {{/eq}} - {{#eq space 'settings'}} -
- {{t 'layout.settings'}} -
- {{/eq}} -
- - - - - -
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 deleted file mode 100644 index ccac4831661..00000000000 --- a/server/sonar-web/src/main/hbs/nav/nav-search-empty.hbs +++ /dev/null @@ -1 +0,0 @@ -{{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 deleted file mode 100644 index 1de73f23eab..00000000000 --- a/server/sonar-web/src/main/hbs/nav/nav-search-item.hbs +++ /dev/null @@ -1,16 +0,0 @@ - - {{#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 deleted file mode 100644 index a5059642f99..00000000000 --- a/server/sonar-web/src/main/hbs/nav/nav-search.hbs +++ /dev/null @@ -1,6 +0,0 @@ - - - - -
diff --git a/server/sonar-web/src/main/hbs/quality-gates/quality-gates-layout.hbs b/server/sonar-web/src/main/hbs/quality-gates/quality-gates-layout.hbs index 84e5825a118..22f6fba05e7 100644 --- a/server/sonar-web/src/main/hbs/quality-gates/quality-gates-layout.hbs +++ b/server/sonar-web/src/main/hbs/quality-gates/quality-gates-layout.hbs @@ -1,8 +1,10 @@ -
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/server/sonar-web/src/main/js/application.js b/server/sonar-web/src/main/js/application.js index ca0bf4dab29..a1c209a82b6 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 (urlHasSomething) { +function dashboardParameters() { var queryString = window.location.search; - var parameters = []; + var parameters = ''; var matchDashboard = queryString.match(/did=\d+/); if (matchDashboard && $j('#is-project-dashboard').length === 1) { - parameters.push(matchDashboard[0]); + parameters += (matchDashboard[0] + '&'); } var matchPeriod = queryString.match(/period=\d+/); @@ -35,15 +35,14 @@ function dashboardParameters (urlHasSomething) { // 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.push(matchPeriod[0]); + parameters += matchPeriod[0] + '&'; } } - var query = parameters.join('&'); - if (query !== '') { - query = (urlHasSomething ? '&' : '?') + query; + if (parameters !== '') { + parameters = '?' + parameters; } - return query; + return parameters; } @@ -341,7 +340,11 @@ jQuery(function () { // Define global shortcuts key('s', function () { - jQuery('.js-search-dropdown-toggle').dropdown('toggle'); + jQuery('#searchInput').focus().on('keydown', function (e) { + if (e.keyCode === 27) { + jQuery('#searchInput').blur(); + } + }); return false; }); }); diff --git a/server/sonar-web/src/main/js/coding-rules/controller.js b/server/sonar-web/src/main/js/coding-rules/controller.js index 168fece4780..6a502e4a0e8 100644 --- a/server/sonar-web/src/main/js/coding-rules/controller.js +++ b/server/sonar-web/src/main/js/coding-rules/controller.js @@ -127,6 +127,7 @@ define([ this.app.layout.workspaceDetailsRegion.reset(); this.app.layout.hideDetails(); this.app.workspaceListView.bindScrollEvents(); + this.app.workspaceListView.scrollTo(); } }); diff --git a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js index cf466543361..3623762bd26 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js @@ -5,7 +5,7 @@ define([ return BaseFacet.extend({ template: Templates['coding-rules-severity-facet'], - severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'], + severities: ['BLOCKER', 'MINOR', 'CRITICAL', 'INFO', 'MAJOR'], sortValues: function (values) { var order = this.severities; diff --git a/server/sonar-web/src/main/js/coding-rules/filters-view.js b/server/sonar-web/src/main/js/coding-rules/filters-view.js index 0c0c74a9ce3..451790ea2b6 100644 --- a/server/sonar-web/src/main/js/coding-rules/filters-view.js +++ b/server/sonar-web/src/main/js/coding-rules/filters-view.js @@ -1,10 +1,26 @@ define([ + 'coding-rules/rule/manual-rule-creation-view', 'templates/coding-rules' -], function () { +], function (ManualRuleCreationView) { return Marionette.ItemView.extend({ template: Templates['coding-rules-filters'], + events: { + 'click .js-new-search': 'newSearch', + 'click .js-create-manual-rule': 'createManualRule' + }, + + newSearch: function () { + this.options.app.controller.newSearch(); + }, + + createManualRule: function() { + new ManualRuleCreationView({ + app: this.options.app + }).render(); + }, + serializeData: function () { return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), { canWrite: this.options.app.canWrite diff --git a/server/sonar-web/src/main/js/coding-rules/layout.js b/server/sonar-web/src/main/js/coding-rules/layout.js index b71a89ad59a..412b832f9b9 100644 --- a/server/sonar-web/src/main/js/coding-rules/layout.js +++ b/server/sonar-web/src/main/js/coding-rules/layout.js @@ -16,6 +16,29 @@ define([ workspaceDetailsRegion: '.search-navigator-workspace-details' }, + initialize: function () { + var that = this; + $(window).on('scroll.search-navigator-layout', function () { + that.onScroll(); + }); + }, + + onClose: function () { + $(window).off('scroll.search-navigator-layout'); + }, + + onRender: function () { + this.$('.search-navigator-side').isolatedScroll(); + }, + + onScroll: function () { + var scrollTop = $(window).scrollTop(); + $('.search-navigator').toggleClass('sticky', scrollTop >= this.topOffset); + this.$('.search-navigator-side').css({ + top: Math.max(0, Math.min(this.topOffset - scrollTop, this.topOffset)) + }); + }, + showDetails: function () { this.scroll = $(window).scrollTop(); $('.search-navigator').addClass('search-navigator-extended-view'); diff --git a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js index ef550bb876d..95475fe7b5a 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js @@ -73,6 +73,7 @@ define([ app: this.options.app, model: this.model })); + this.$el.scrollParent().scrollTop(30); }, onClose: function () { diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js index 7d40501f109..cbcebe2db72 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js @@ -1,9 +1,8 @@ define([ 'components/navigator/workspace-header-view', 'coding-rules/bulk-change-popup-view', - 'coding-rules/rule/manual-rule-creation-view', 'templates/coding-rules' -], function (WorkspaceHeaderView, BulkChangePopup, ManualRuleCreationView) { +], function (WorkspaceHeaderView, BulkChangePopup) { var $ = jQuery; @@ -13,9 +12,7 @@ define([ events: function () { return _.extend(WorkspaceHeaderView.prototype.events.apply(this, arguments), { 'click .js-back': 'onBackClick', - 'click .js-bulk-change': 'onBulkChangeClick', - 'click .js-new-search': 'newSearch', - 'click .js-create-manual-rule': 'createManualRule' + 'click .js-bulk-change': 'onBulkChangeClick' }); }, @@ -33,16 +30,6 @@ define([ }).render(); }, - newSearch: function () { - this.options.app.controller.newSearch(); - }, - - createManualRule: function() { - new ManualRuleCreationView({ - app: this.options.app - }).render(); - }, - serializeData: function () { return _.extend(WorkspaceHeaderView.prototype.serializeData.apply(this, arguments), { canWrite: this.options.app.canWrite 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 deleted file mode 100644 index 6ddce02f574..00000000000 --- a/server/sonar-web/src/main/js/common/selectable-collection-view.js +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index f6295eea637..00000000000 --- a/server/sonar-web/src/main/js/nav/app.js +++ /dev/null @@ -1,21 +0,0 @@ -define([ - 'nav/navbar' -], function (NavbarView) { - - var $ = jQuery, - App = new Marionette.Application(); - - App.addInitializer(function () { - this.navbarView = new NavbarView({ - app: App, - el: $('.navbar'), - collection: new Backbone.Collection(window.navbarItems) - }); - this.navbarView.render(); - }); - - window.requestMessages().done(function () { - App.start(); - }); - -}); diff --git a/server/sonar-web/src/main/js/nav/navbar.js b/server/sonar-web/src/main/js/nav/navbar.js deleted file mode 100644 index e39268e321a..00000000000 --- a/server/sonar-web/src/main/js/nav/navbar.js +++ /dev/null @@ -1,86 +0,0 @@ -define([ - 'nav/search-view', - 'templates/nav' -], function (SearchView) { - - var $ = jQuery; - - return Marionette.Layout.extend({ - tagName: 'nav', - template: Templates['nav-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, - - space: window.navbarSpace, - - 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 deleted file mode 100644 index 6efd0ca8f92..00000000000 --- a/server/sonar-web/src/main/js/nav/search-view.js +++ /dev/null @@ -1,154 +0,0 @@ -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 deleted file mode 100644 index 980424d635e..00000000000 --- a/server/sonar-web/src/main/js/third-party/bootstrap/dropdown.js +++ /dev/null @@ -1,161 +0,0 @@ -/* ======================================================================== - * 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/js/translate.js b/server/sonar-web/src/main/js/translate.js index 7123c876141..9daa77f8899 100644 --- a/server/sonar-web/src/main/js/translate.js +++ b/server/sonar-web/src/main/js/translate.js @@ -62,14 +62,14 @@ window.requestMessages = function() { - var currentLocale = window.pageLang, - cachedLocale = localStorage.getItem('l10n.locale'); + var currentLocale = (navigator.language || navigator.userLanguage).replace('-', '_'); + var cachedLocale = localStorage.getItem('l10n.locale'); if (cachedLocale !== currentLocale) { localStorage.removeItem('l10n.timestamp'); } - var bundleTimestamp = localStorage.getItem('l10n.timestamp'), - params = { locale: currentLocale }; + var bundleTimestamp = localStorage.getItem('l10n.timestamp'); + var params = {}; if (bundleTimestamp !== null) { params.ts = bundleTimestamp; } diff --git a/server/sonar-web/src/main/less/components.less b/server/sonar-web/src/main/less/components.less index 860b68b0540..12c41821334 100644 --- a/server/sonar-web/src/main/less/components.less +++ b/server/sonar-web/src/main/less/components.less @@ -8,5 +8,3 @@ @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 deleted file mode 100644 index 756622d3a53..00000000000 --- a/server/sonar-web/src/main/less/components/dropdowns.less +++ /dev/null @@ -1,119 +0,0 @@ -@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/facets.less b/server/sonar-web/src/main/less/components/facets.less index 33bd7f023e9..ae37e075184 100644 --- a/server/sonar-web/src/main/less/components/facets.less +++ b/server/sonar-web/src/main/less/components/facets.less @@ -9,6 +9,7 @@ padding: 4px 5px; border: 1px solid @barBorderColor; border-radius: 2px; + background-color: lighten(@barBackgroundColor, 2%); font-size: 0; cursor: pointer; white-space: nowrap; @@ -36,6 +37,7 @@ } .facet-name { + background-color: lighten(@barBackgroundColor, 2%); font-size: @smallFontSize; } @@ -43,6 +45,7 @@ margin-left: 5px; padding-left: 5px; border-left: 1px solid @barBorderColor; + background-color: lighten(@barBackgroundColor, 2%); color: @secondFontColor; font-size: @smallFontSize; } diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less index 5bcac573202..e4029858dde 100644 --- a/server/sonar-web/src/main/less/components/issues.less +++ b/server/sonar-web/src/main/less/components/issues.less @@ -24,8 +24,7 @@ .issue-list, .issue { - width: 780px; - .box-sizing(border-box); + max-width: 920px; } .issue.selected { @@ -63,8 +62,6 @@ line-height: 1.5; font-size: @baseFontSize; font-weight: 500; - word-break: break-all; - word-break: break-word; } .issue-tags { diff --git a/server/sonar-web/src/main/less/components/menu.less b/server/sonar-web/src/main/less/components/menu.less deleted file mode 100644 index 0b78b90f030..00000000000 --- a/server/sonar-web/src/main/less/components/menu.less +++ /dev/null @@ -1,53 +0,0 @@ -@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 9b55df03892..f73ff56db1e 100644 --- a/server/sonar-web/src/main/less/components/search-navigator.less +++ b/server/sonar-web/src/main/less/components/search-navigator.less @@ -2,18 +2,49 @@ @import (reference) "../mixins"; @import (reference) "../ui"; -@sideWidth: 180px; +@sideWidth: 300px; .search-navigator { - .clearfix; + + &.sticky { + + .search-navigator-workspace-header { + position: fixed; + z-index: 4; + top: 0; + left: @sideWidth; + right: 0; + } + + .search-navigator-workspace-list, + .search-navigator-workspace-details { + padding-top: 22px + 5px + 5px + 1px + 10px; + } + + .search-navigator-side { + position: fixed; + z-index: 4; + top: 0; + bottom: 0; + overflow-y: auto; + } + + } } .search-navigator-side { + position: fixed; + z-index: 100; + width: @sideWidth; + top: 30px; left: 0; bottom: 0; .box-sizing(border-box); + background-color: @barBorderColor; overflow-x: hidden; } .search-navigator-facet-box { + border-top: 1px solid @barBorderColor; + background-color: @barBackgroundColor; font-size: @baseFontSize; } @@ -50,11 +81,13 @@ margin: 0 0 1px 0; border-color: transparent; .box-sizing(border-box); + background-color: @barBackgroundColor; white-space: normal; overflow: hidden; .facet-name { white-space: nowrap; + background-color: @barBackgroundColor; color: @baseFontColor; } @@ -63,13 +96,14 @@ top: 0; right: 0; padding: 4px 5px; border: none; + background-color: @barBackgroundColor; &:before { content: " "; position: absolute; top: 0; bottom: 0; right: 100%; width: 10px; - background-image: linear-gradient(to right, fade(#fff, 0%), #fff 75%); + background-image: linear-gradient(to right, fade(@barBackgroundColor, 0%), @barBackgroundColor 75%); } } @@ -83,19 +117,24 @@ } .search-navigator-facet-half { + width: 45%; + + &:nth-child(odd) { + margin-right: 10%; + } } .search-navigator-facet-header { display: block; - padding: 6px 0; + padding: 6px 10px; border-bottom: none; color: @baseFontColor; font-weight: 500; } .search-navigator-facet-list { - margin: 0; - padding: 0 0 10px; + margin: 0 0 0 0; + padding: 0 10px 10px; font-size: 0; } @@ -129,7 +168,7 @@ } .search-navigator-facet-query { - padding: 6px 0; + padding: 6px 10px; input { width: 100%; @@ -142,13 +181,14 @@ } .search-navigator-facet-input { - width: 100%; + width: @sideWidth * 0.4; } .search-navigator-filters { - .clearfix; position: relative; - padding: 5px 0; + .clearfix; + padding: 5px 10px; + background-color: @barBackgroundColor; } .search-navigator-filters-selected { @@ -218,7 +258,7 @@ } .search-navigator-workspace { - + padding-left: @sideWidth; } .search-navigator-workspace-header { @@ -226,6 +266,8 @@ margin-bottom: 10px; padding: 5px 0; line-height: 22px; + border-bottom: 1px solid @barBorderColor; + background-color: @barBackgroundColor; font-size: @smallFontSize; .button-group, @@ -244,7 +286,8 @@ position: absolute; top: 0; right: 0; - padding: 5px 0; + padding: 5px 10px; + background-color: @barBackgroundColor; font-size: 0; white-space: nowrap; @@ -253,7 +296,7 @@ position: absolute; top: 0; bottom: 0; right: 100%; width: 10px; - background-image: linear-gradient(to right, fade(#fff, 0%), #fff 75%); + background-image: linear-gradient(to right, fade(@barBackgroundColor, 0%), @barBackgroundColor 75%); } } @@ -269,7 +312,11 @@ } .search-navigator-workspace-list { + padding: 0 5px; + .issue { + max-width: none; + } } .search-navigator-workspace-details { diff --git a/server/sonar-web/src/main/less/icons.less b/server/sonar-web/src/main/less/icons.less index c4489efa00c..189dfd35795 100644 --- a/server/sonar-web/src/main/less/icons.less +++ b/server/sonar-web/src/main/less/icons.less @@ -541,9 +541,6 @@ a[class^="icon-"], a[class*=" icon-"] { content: "\f002"; font-size: @iconFontSize; } -.icon-user:before { - content: "\e60a"; -} /* diff --git a/server/sonar-web/src/main/less/issues.less b/server/sonar-web/src/main/less/issues.less index 88b13ff20aa..1bb3b601012 100644 --- a/server/sonar-web/src/main/less/issues.less +++ b/server/sonar-web/src/main/less/issues.less @@ -7,6 +7,14 @@ .issues { + &.sticky { + + .issues-workspace-list, + .issues-workspace-component-viewer { + padding-top: 22px + 5px + 5px + 1px + 10px; + } + + } } .issues-workspace-list-component { @@ -28,6 +36,7 @@ .issues-workspace-component-viewer { display: none; + padding: 1px 10px; min-height: 100vh; .code-issue-modern { diff --git a/server/sonar-web/src/main/less/layout-new.less b/server/sonar-web/src/main/less/layout-new.less deleted file mode 100644 index 330ea4f1a4d..00000000000 --- a/server/sonar-web/src/main/less/layout-new.less +++ /dev/null @@ -1,90 +0,0 @@ -@import (reference) "mixins"; -@import (reference) "variables"; -@import (reference) "ui"; - -@pageWidth: 1020px; -@containerWidth: 980px; -@contentWidth: 780px; -@sideMargin: 10px; -@sideWidth: @containerWidth - @contentWidth - @sideMargin; - -html { - overflow-y: scroll; -} - -body { - min-width: @pageWidth; - min-height: 100vh; -} - -.wrapper { - min-height: ~"calc(100vh - 60px)"; -} - -.container { - width: @containerWidth; - margin: 0 auto; - .box-sizing(border-box); -} - -.container-full-width { - width: ~"calc(100% - 40px)"; - - .container-main { - width: 100%; - } - - .container-side { - display: none; - } -} - -.container-one-third { - width: @containerWidth / 3; -} - -.container-two-thirds { - width: @containerWidth / 3 * 2; -} - -.container-one-half { - width: @containerWidth / 2; -} - -.container-side { - width: @sideWidth; - .box-sizing(border-box); -} - -.container-side-left { - float: left; - padding-right: @sideMargin; - border-right: 1px solid @barBackgroundColor; -} - -.container-side-left + .container-main { - padding-left: @sideMargin; -} - -.container-side-right { - float: right; - padding-left: @sideMargin; - border-left: 1px solid @barBackgroundColor; -} - -.container-side-right + .container-main { - padding-right: @sideMargin; -} - -.container-main { - float: left; - width: @contentWidth; -} - -.face-bar { - -} - -.face-main { - background-color: #fff; -} diff --git a/server/sonar-web/src/main/less/layout.less b/server/sonar-web/src/main/less/layout.less index ba327da05d8..7ccf1d683c1 100644 --- a/server/sonar-web/src/main/less/layout.less +++ b/server/sonar-web/src/main/less/layout.less @@ -2,17 +2,83 @@ @import (reference) "variables"; @import (reference) "ui"; +@media print { + /* ------------------- PRINT ------------------- */ + html, body { + font-size: 8pt; + } + + a, a:link, a:visited { + text-decoration: none; + border-bottom: 0; + } + + .noprint { + display: none !important; + } + + .print { + display: inline; + position: static; + left: 0; + } + + #hd, #sidebar, #crumbs { + display: none; + } + + .with_sidebar, .wo_sidebar { + padding: 0 !important; + margin: 0; + } + + #content { + margin-left: 0 !important; + } + + .widget thead, .widget tfoot { + // Fix for phantomjs bug about wrapping tables + display: table-row-group; + } +} + +@media screen { + .print { + display: none; + } +} + +body, a { + color: #444; +} + +/* LAYOUT */ +#container { + height: auto !important; + min-width: 940px; + min-height: 500px; +} + #hd { + color: #FFF; + background: #262626; + padding: 0 10px; + height: 30px; + line-height: 30px; + font-size: 93%; + margin: 0; position: relative; - background: @darkColor; - height: 40px; - line-height: 40px; - color: @lightColor; +} + +#hd #nav-left > ul > li { + height: 30px; } #hd a { color: #fff; .link-no-underline; + + &.selected, &:hover, &:focus { color: @blue; } } #nav-left { @@ -31,28 +97,12 @@ #nav-left > ul > li { float: left; -} - -#nav-left > ul > li > a { - display: block; - height: 40px; - padding: 0 10px; - .box-sizing(border-box); -} - -#nav-left > ul > li > a:hover, -#nav-left > ul > li > a:focus, -#nav-left > ul > li > a.selected { - background-color: #000; -} - -#nav-left > ul > li > a.selected { - color: @blue !important; + padding: 0 20px 0 0; } #nav-left > ul > li > a, #nav > ul > li > a { - font-size: @baseFontSize; + font-size: @smallFontSize; font-weight: 300; letter-spacing: 0.05em; } @@ -131,17 +181,12 @@ } #footer { - position: relative; - min-height: 60px; - .box-sizing(border-box); - background-color: @barBackgroundColor; + padding: 4px 0; clear: both; } #body { position: relative; - padding-top: 10px; - padding-bottom: 10px; } .with_sidebar { @@ -154,7 +199,13 @@ } #sidebar { - margin-bottom: 10px; + position: absolute; + top: 0; left: 10px; + width: 150px; + + &.sticky { + position: fixed; + } } ul.sidebar { @@ -164,7 +215,6 @@ ul.sidebar { } ul.sidebar li { - display: inline-block; list-style-type: none; padding: 3px 10px; } @@ -218,7 +268,7 @@ ul.sidebar select, ul.sidebar input { } .page { - padding: 10px 0; + padding: 10px; } .page-split-left { min-width: 200px; @@ -258,49 +308,3 @@ ul.sidebar select, ul.sidebar input { .nolayout { padding: 10px; } - -@media print { - /* ------------------- PRINT ------------------- */ - html, body { - font-size: 8pt; - } - - a, a:link, a:visited { - text-decoration: none; - border-bottom: 0; - } - - .noprint { - display: none !important; - } - - .print { - display: inline; - position: static; - left: 0; - } - - #hd, #sidebar, #crumbs { - display: none; - } - - .with_sidebar, .wo_sidebar { - padding: 0 !important; - margin: 0; - } - - #content { - margin-left: 0 !important; - } - - .widget thead, .widget tfoot { - // Fix for phantomjs bug about wrapping tables - display: table-row-group; - } -} - -@media screen { - .print { - display: none; - } -} diff --git a/server/sonar-web/src/main/less/navbar.less b/server/sonar-web/src/main/less/navbar.less deleted file mode 100644 index 34fa99e4a6a..00000000000 --- a/server/sonar-web/src/main/less/navbar.less +++ /dev/null @@ -1,223 +0,0 @@ -@import (reference) "mixins"; -@import (reference) "variables"; -@import (reference) "ui"; - -@navbarBackground: #151515; -@navbarProjectBackground: @navbarBackground; -@navbarSettingsBackground: #591500; - -@navbarHeight: 36px; -@navbarLineHeight: 20px; -@navbarTopPadding: (@navbarHeight - @navbarLineHeight) / 2; - -.navbar-sticky { - padding-top: @navbarHeight !important; - - .navbar { - position: fixed; - z-index: 10; - top: 0; - left: 0; - right: 0; - margin-bottom: 0; - .trans(background-color, 0.5s ease); - } -} - -.navbar, [class^="navbar-"], [class*=" navbar-"] { - .box-sizing(border-box); -} - -.navbar { - .clearfix; -} - -.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-brand { - position: relative; - float: left; - height: @navbarHeight; - padding: @navbarTopPadding 10px; - font-size: @bigFontSize; - line-height: @navbarLineHeight; - color: @lightColor; - - max-width: 240px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - a, a:hover, a:focus { - color: @lightColor; - } -} - -.navbar-logo { - @topPadding: (@navbarHeight - 25) / 2; - padding-top: @topPadding !important; - padding-bottom: @topPadding !important; -} - -.navbar-nav { - float: left; -} - -.navbar-nav > li { - float: left; -} - -.navbar-nav > li > a { - padding: @navbarTopPadding 10px; - line-height: @navbarLineHeight; - color: @lightColor; - font-size: 12px; - font-weight: 300; - letter-spacing: 0.05em; - - &:hover, &:focus { - color: @lightColor; - } -} - -.navbar-nav > .active > a, -.navbar-nav > .dropdown.open > a { - color: @lightColor; -} - - -.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: @navbarBackground; - - .navbar-sticky & { - background-color: fade(@navbarBackground, 90%); - } - - .navbar-nav > li > a:hover, - .navbar-nav > li > a:focus, - .navbar-nav > .active > a, - .navbar-nav > .dropdown.open > a { - background-color: darken(@navbarBackground, 10%); - } -} - - -.navbar-project { - background-color: @navbarProjectBackground; - - .navbar-sticky & { - background-color: fade(@navbarProjectBackground, 90%); - } - - .navbar-nav > li > a:hover, - .navbar-nav > li > a:focus, - .navbar-nav > .active > a, - .navbar-nav > .dropdown.open > a { - background-color: darken(@navbarProjectBackground, 10%); - } - - .sq-logo { - margin-left: -78px; - } - - .sq-logo .sq-logo-letter { - display: none; - } -} - - -.navbar-settings { - background-color: @navbarSettingsBackground; - - .navbar-sticky & { - background-color: fade(@navbarSettingsBackground, 90%); - } - - .navbar-nav > li > a:hover, - .navbar-nav > li > a:focus, - .navbar-nav > .active > a, - .navbar-nav > .dropdown.open > a { - background-color: darken(@navbarSettingsBackground, 10%); - } - - .sq-logo { - margin-left: -78px; - } - - .sq-logo .sq-logo-letter { - display: none; - } -} diff --git a/server/sonar-web/src/main/less/quality-gates.less b/server/sonar-web/src/main/less/quality-gates.less index cc6de6730c7..070216d1b21 100644 --- a/server/sonar-web/src/main/less/quality-gates.less +++ b/server/sonar-web/src/main/less/quality-gates.less @@ -2,8 +2,17 @@ @import (reference) "mixins"; @import (reference) "navigator/config"; +@qualityGateSidebarWidth: 230px; + .quality-gates-navigator { + .navigator-side { + display: table-cell; + vertical-align: top; + width: @qualityGateSidebarWidth + 2 * @navigatorPadding; + min-width: 0; + } + .navigator-header { margin-left: 0; .spinner { margin-top: 9px; } @@ -11,6 +20,7 @@ .navigator-actions { height: @navigatorHeaderHeight; + width: @qualityGateSidebarWidth; margin: @navigatorPadding; padding: 0 @navigatorPadding; @@ -23,8 +33,8 @@ } .navigator-results { + width: @qualityGateSidebarWidth; min-width: 0; - width: auto; } .navigator-details { margin-left: 0; } diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less index 11b53fbc9d1..5db86117768 100644 --- a/server/sonar-web/src/main/less/style.less +++ b/server/sonar-web/src/main/less/style.less @@ -35,10 +35,10 @@ FOOTER */ #ftlinks { - background: @barBackgroundColor; + background: #fff; color: #262626; text-align: center; - border-top: 1px solid @barBackgroundColor; + border-top: 1px solid #fff; font-size: 85%; padding: 10px 0; line-height: 1.4; @@ -1971,6 +1971,54 @@ 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; @@ -2357,7 +2405,7 @@ div.rule-title { .sonar-d3 .plot .arc:hover, .sonar-d3 .plot .arc.hover { - fill: #4f9ed3; + opacity: 1; } .sonar-d3 .plot .line { @@ -2522,10 +2570,10 @@ text.max-results-reached-message { top: 5px; right: 5px; line-height: @iconSmallFontSize; color: #fff; - fill: #fff; + opacity: 0.5; .link-no-underline; - &:hover { fill: #4f9ed3; } + &:hover { opacity: 1; } } .sonar-d3 .treemap-link i, @@ -2711,14 +2759,3 @@ text.max-results-reached-message { } } - - -.sq-logo { - .sq-logo-arc { - fill: @blue; - } - - .sq-logo-letter { - fill: #fff; - } -} diff --git a/server/sonar-web/src/main/less/ui.less b/server/sonar-web/src/main/less/ui.less index 3ac51687ff0..5081ad535c1 100644 --- a/server/sonar-web/src/main/less/ui.less +++ b/server/sonar-web/src/main/less/ui.less @@ -184,7 +184,6 @@ a { input[type=text], input[type=password], input[type=email], -input[type=search], textarea { border: 1px solid @darkGrey; .box-sizing(border-box); @@ -204,16 +203,11 @@ textarea { input[type=text], input[type=password], -input[type=email], -input[type=search] { - height: @formControlHeight; +input[type=email] { + height: 22px; padding: 0 3px; } -input[type=search] { - -webkit-appearance: none; -} - textarea { padding: 3px; } @@ -224,7 +218,7 @@ input[type=submit], input[type=button] { display: inline-block; vertical-align: baseline; - height: @formControlHeight; + height: 22px; margin: 0 1px; padding: 0 10px; @@ -270,7 +264,7 @@ input[type=button] { } } -.button { line-height: @formControlHeight; } +.button { line-height: 22px; } .button-red { &:hover, &:focus { @@ -425,7 +419,7 @@ input[type=button] { max-width: 900px; margin-left: -150px; padding: 0 10px; - line-height: @formControlHeight; + line-height: 22px; background-color: #f0e8ac; border-radius: 0 0 3px 3px; text-align: center; @@ -464,21 +458,3 @@ 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 bcb64f77280..37e5e29e364 100644 --- a/server/sonar-web/src/main/less/variables.less +++ b/server/sonar-web/src/main/less/variables.less @@ -35,9 +35,6 @@ @darkBlue: darken(@blue, 20%); -@darkColor: #262626; -@lightColor: #fff; - @highlighted: @blue; @highlightedBackground: @lightBlue; @contextBackground: lighten(@purple, 40%); @@ -50,15 +47,6 @@ @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 e4e8bd713d8..410d59f601f 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,7 +69,7 @@ class Api::ComponentsController < Api::ApiController qualifier_results['items']=resource_indexes.map do |resource_index| resource=resources_by_id[resource_index.resource_id] { - 'key' => resource.key, + 'id' => resource.id, 'name' => resource.name(true) } end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb index 4b5a6d0e6c1..8966df0f57a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb @@ -20,7 +20,7 @@ class ComparisonController < ApplicationController - SECTION=Navigation::SECTION_TOOLS + SECTION=Navigation::SECTION_HOME def index snapshots = [] diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb index 485592ea4ad..16de4c40c8b 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb @@ -19,7 +19,7 @@ # class DependenciesController < ApplicationController - SECTION=Navigation::SECTION_TOOLS + SECTION=Navigation::SECTION_HOME SEARCH_MINIMUM_SIZE=3 QUALIFIERS=['TRK', 'BRC', 'LIB'] diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb index ceb6678cb38..4b690d90178 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb @@ -36,5 +36,4 @@ class Navigation SECTION_QUALITY_PROFILES = Navigation.new('quality_profiles', false) SECTION_QUALITY_GATES = Navigation.new('quality_gates', false) SECTION_CODING_RULES = Navigation.new('coding_rules', false) - SECTION_TOOLS = Navigation.new('tools', false) end 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 bd4e8d94197..a7d9e3027b1 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 @@ -2,7 +2,5 @@ <% end %> -<% content_for :body_class do %>face-bar<% end %> -
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 d7cc60c36bd..5741c2c169a 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 @@ -2,6 +2,4 @@ <% end %> -<% content_for :body_class do %>face-bar<% end %> -
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb index bceb1df63ab..7b8d6f680e8 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb @@ -6,91 +6,105 @@ <% if @breadcrumbs %>
-
-
    - <% - @breadcrumbs.each do |breadcrumb| - %> -
  • - <% if breadcrumb.is_a?(String) %> - <%= h breadcrumb -%> - <% - elsif breadcrumb.is_a?(Hash) - name = breadcrumb[:name] - url = breadcrumb[:url] - icon = breadcrumb[:icon] - %> - <% if icon %> - - <% end %> - <%= link_to_if url, h(name), url -%> - <% elsif breadcrumb.respond_to?(:html) %> - <%= breadcrumb.html -%> - <% end %> -
    • +
      + <% if displayed_resource && !display_only_root %> +
    • + <%= link_to_favourite(displayed_resource) -%> +
      • + <% if has_role?(:admin, displayed_resource) && !displayed_resource.entity? %> + <%= render 'layouts/menu_resource_settings' -%> <% end %> -
    -
+ <% end %> + +
    + <% + @breadcrumbs.each do |breadcrumb| + %> +
  • + <% if breadcrumb.is_a?(String) %> + <%= h breadcrumb -%> + <% + elsif breadcrumb.is_a?(Hash) + name = breadcrumb[:name] + url = breadcrumb[:url] + icon = breadcrumb[:icon] + %> + <% if icon %><% end %> + <%= link_to_if url, h(name), url -%> + <% elsif breadcrumb.respond_to?(:html) %> + <%= breadcrumb.html -%> + <% end %> +
    • + <% end %> +
<% elsif displayed_resource %> - <% - resource_link = {:controller => params[:controller], :action => params[:action]} - if display_only_root - resource_link = {:controller => 'dashboard', :action => 'index'} - end - - # ======== Path for resources ======== - - if displayed_resource - if displayed_resource.last_snapshot - resources=[] - s=displayed_resource.last_snapshot - while (s!=nil) do - resources.insert(0, s.project) - s=s.parent - end - else - resources = [displayed_resource] - end - %> - <% if resources.length > 1 %> -
-
-
    - <% - resources.each do |resource| - %> -
  • - <%= qualifier_icon(resource) -%> -   - <%= - root = "#{ApplicationController.root_context}/#{u resource_link[:controller]}/#{u resource_link[:action]}?" - path = '' - query = request.query_parameters - query[:id] = resource.key - query.each do |key, value| - path += '&' unless path.empty? - path += "#{u key}=#{u value}" - end - "#{h(resource.name)}" - -%> -
    • +
    +
      + <% if displayed_resource && !display_only_root %> +
    • + <%= link_to_favourite(displayed_resource) -%> +
      • + <% if (has_role?(:admin, displayed_resource) || profiles_administrator?) && !displayed_resource.entity? %> + <%= render 'layouts/menu_resource_settings' -%> + <% end %> + <% end %> +
    +
      <% + resource_link = {:controller => params[:controller], :action => params[:action]} + if display_only_root + resource_link = {:controller => 'dashboard', :action => 'index'} end - end + + # ======== Path for resources ======== + + if displayed_resource + if displayed_resource.last_snapshot + resources=[] + s=displayed_resource.last_snapshot + while (s!=nil) do + resources.insert(0, s.project) + s=s.parent + end + else + resources = [displayed_resource] + end + %> + <% + resources.each do |resource| + %> +
    • + <%= qualifier_icon(resource) -%> +   + <%= + root = "#{ApplicationController.root_context}/#{u resource_link[:controller]}/#{u resource_link[:action]}?" + path = '' + query = request.query_parameters + query[:id] = resource.key + query.each do |key, value| + path += '&' unless path.empty? + path += "#{u key}=#{u value}" + end + "#{h(resource.name)}" + -%> +
      • + <% + end + end # ======== Path for issue ======== if @issue %> -
    • - <%= link_to message('issue') + ' #' + @issue.key.to_s -%> -
      • +
    • + <%= link_to message('issue') + ' #' + @issue.key.to_s -%> +
      • + <% + end + %>
    -
    -
- <% end %> - <% end %> +
<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index 95eb64911bd..be7b6ade97e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -43,4 +43,4 @@ <%= yield :script -%> - + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index 92db26a7312..fb83ec46c99 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -6,46 +6,198 @@ @project=@resource unless @project || selected_section==Navigation::SECTION_HOME period_param = "period=#{u(params[:period])}" if params[:period] %> - + <%= render 'layouts/breadcrumb' if @breadcrumbs || selected_section==Navigation::SECTION_RESOURCE -%> +
+ <% if selected_section && selected_section.show_sidebar && !@hide_sidebar %> + + <% end %> + <% + html_id_class = '' + html_id_class = "id='content' class='with_sidebar'" if selected_section && selected_section.show_sidebar + html_id_class = "id='content'" if @hide_sidebar || (selected_section && !selected_section.show_sidebar) + %> +
> + <% if @project %> +

<%= h @project.name() %>

+ <% end %> + + + + <%= yield %>
@@ -73,8 +225,7 @@

The embedded database will not scale, it will not support upgrading to newer versions of SonarQube, and there is no support for migrating your data out of it into a different database engine. <% end %>
- +
<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_logo.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_logo.html.erb deleted file mode 100644 index 51f0c126f18..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_logo.html.erb +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb new file mode 100644 index 00000000000..4d18b7b330c --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb @@ -0,0 +1,46 @@ + + +
  • + + <%= message('layout.projects') -%> + + + + + +
    • + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar.html.erb deleted file mode 100644 index fd8d74e7348..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%= render 'layouts/navbar_conf' -%> -<%= render 'layouts/recent_history' -%> - 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 deleted file mode 100644 index d2a4eca1461..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -<% - 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 -%> - -<% if selected_section==Navigation::SECTION_RESOURCE %> - <%= render :partial => 'layouts/navbar_conf_project' %> -<% elsif selected_section==Navigation::SECTION_CONFIGURATION %> - <%= render :partial => 'layouts/navbar_conf_settings' %> -<% else %> - <%= render :partial => 'layouts/navbar_conf_global' %> -<% end %> - - - 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 deleted file mode 100644 index 6c196369401..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb +++ /dev/null @@ -1,76 +0,0 @@ -<% - 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_project.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_project.html.erb deleted file mode 100644 index a2841ae3a2c..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_project.html.erb +++ /dev/null @@ -1,167 +0,0 @@ -<% - @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_settings.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb deleted file mode 100644 index 910fdfcc639..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb +++ /dev/null @@ -1,109 +0,0 @@ -<% - 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 deleted file mode 100644 index 51b81a44d3f..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_recent_history.html.erb +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_small_logo.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_small_logo.html.erb deleted file mode 100644 index a7029b5ae50..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_small_logo.html.erb +++ /dev/null @@ -1,9 +0,0 @@ - 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 52e8974dc14..3c67adf30b2 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,10 +10,9 @@ 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' %> +<%= render :partial => 'layouts/footer' unless params[:hd]=='false' %> \ No newline at end of file diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 9b39bc3135a..8e3508a85d4 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -427,7 +427,6 @@ layout.sonar.slogan=Embrace Quality layout.dashboards=Dashboards layout.configuration=Project Configuration layout.projects=Projects -layout.tools=Tools layout.recent_projects=Recent Projects layout.user_panel.my_profile=My profile -- 2.39.5