From 229dfc34c8fd595374fe0c3530e48c91c7a94d9d Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 9 Jan 2015 11:53:40 +0100 Subject: [PATCH] change the way to use requirejs --- .../src/main/js/common/select-list.js | 745 +++++++++--------- .../app/views/analysis_reports/index.html.erb | 2 +- .../views/api_documentation/index.html.erb | 2 +- .../app/views/coding_rules/index.html.erb | 2 +- .../app/views/coding_rules/show.html.erb | 2 +- .../app/views/component/index.html.erb | 2 +- .../app/views/dashboard/no_dashboard.html.erb | 2 +- .../WEB-INF/app/views/design/index.html.erb | 2 +- .../app/views/drilldown/measures.html.erb | 2 +- .../WEB-INF/app/views/groups/index.html.erb | 2 +- .../WEB-INF/app/views/issues/search.html.erb | 2 +- .../WEB-INF/app/views/layouts/_head.html.erb | 4 + .../app/views/libraries/index.html.erb | 2 +- .../app/views/measures/search.html.erb | 2 +- .../views/permission_templates/index.html.erb | 2 +- .../app/views/project_roles/index.html.erb | 2 +- .../app/views/quality_gates/index.html.erb | 2 +- .../WEB-INF/app/views/roles/global.html.erb | 2 +- .../WEB-INF/app/views/roles/projects.html.erb | 2 +- .../WEB-INF/app/views/users/index.html.erb | 2 +- 20 files changed, 391 insertions(+), 394 deletions(-) diff --git a/server/sonar-web/src/main/js/common/select-list.js b/server/sonar-web/src/main/js/common/select-list.js index 7c1013c54c5..c1bcab2cb92 100644 --- a/server/sonar-web/src/main/js/common/select-list.js +++ b/server/sonar-web/src/main/js/common/select-list.js @@ -1,427 +1,420 @@ -requirejs.config({ - baseUrl: baseUrl + '/js' -}); - -requirejs(function () { - - (function ($) { - - var showError = null; - - /* - * SelectList Collection - */ - - var SelectListCollection = Backbone.Collection.extend({ - - parse: function (r) { - this.more = r.more; - return r.results; - }, - - fetch: function (options) { - var data = $.extend({ - page: 1, - pageSize: 100 - }, options.data || {}), - settings = $.extend({}, options, { data: data }); - - this.settings = { - url: settings.url, - data: data - }; - - Backbone.Collection.prototype.fetch.call(this, settings); - }, - - fetchNextPage: function (options) { - if (this.more) { - var nextPage = this.settings.data.page + 1, - settings = $.extend(this.settings, options); - - settings.data.page = nextPage; - settings.remove = false; - this.fetch(settings); - } else { - options.error(); - } +define(function () { + + var $ = jQuery, + showError = null; + + /* + * SelectList Collection + */ + + var SelectListCollection = Backbone.Collection.extend({ + + parse: function (r) { + this.more = r.more; + return r.results; + }, + + fetch: function (options) { + var data = $.extend({ + page: 1, + pageSize: 100 + }, options.data || {}), + settings = $.extend({}, options, { data: data }); + + this.settings = { + url: settings.url, + data: data + }; + + Backbone.Collection.prototype.fetch.call(this, settings); + }, + + fetchNextPage: function (options) { + if (this.more) { + var nextPage = this.settings.data.page + 1, + settings = $.extend(this.settings, options); + + settings.data.page = nextPage; + settings.remove = false; + this.fetch(settings); + } else { + options.error(); } + } - }); + }); - /* - * SelectList Item View - */ + /* + * SelectList Item View + */ - var SelectListItemView = Backbone.View.extend({ - tagName: 'li', + var SelectListItemView = Backbone.View.extend({ + tagName: 'li', - template: function (d) { - return '' + - '
' + d + '
'; - }, + template: function (d) { + return '' + + '
' + d + '
'; + }, - events: { - 'change .select-list-list-checkbox': 'toggle' - }, + events: { + 'change .select-list-list-checkbox': 'toggle' + }, - initialize: function (options) { - this.listenTo(this.model, 'change', this.render); - this.settings = options.settings; - }, + initialize: function (options) { + this.listenTo(this.model, 'change', this.render); + this.settings = options.settings; + }, - render: function () { - this.$el.html(this.template(this.settings.format(this.model.toJSON()))); - this.$('input').prop('name', this.model.get('name')); - this.$el.toggleClass('selected', this.model.get('selected')); - this.$('.select-list-list-checkbox') - .prop('title', - this.model.get('selected') ? - this.settings.tooltips.deselect : - this.settings.tooltips.select) - .prop('checked', this.model.get('selected')); + render: function () { + this.$el.html(this.template(this.settings.format(this.model.toJSON()))); + this.$('input').prop('name', this.model.get('name')); + this.$el.toggleClass('selected', this.model.get('selected')); + this.$('.select-list-list-checkbox') + .prop('title', + this.model.get('selected') ? + this.settings.tooltips.deselect : + this.settings.tooltips.select) + .prop('checked', this.model.get('selected')); - if (this.settings.readOnly) { - this.$('.select-list-list-checkbox').prop('disabled', true); - } - }, - - remove: function (postpone) { - if (postpone) { - var that = this; - that.$el.addClass(this.model.get('selected') ? 'added' : 'removed'); - setTimeout(function () { - Backbone.View.prototype.remove.call(that, arguments); - }, 500); - } else { - Backbone.View.prototype.remove.call(this, arguments); - } - }, - - toggle: function () { - var selected = this.model.get('selected'), - that = this, - url = selected ? this.settings.deselectUrl : this.settings.selectUrl, - data = $.extend({}, this.settings.extra || {}); - - data[this.settings.selectParameter] = this.model.get(this.settings.selectParameterValue); - - that.$el.addClass('progress'); - $.ajax({ - url: url, - type: 'POST', - data: data - }) - .done(function () { - that.model.set('selected', !selected); - }) - .fail(showError) - .always(function () { - that.$el.removeClass('progress'); - }); + if (this.settings.readOnly) { + this.$('.select-list-list-checkbox').prop('disabled', true); } - }); - - - /* - * SelectList View - */ - - var SelectListView = Backbone.View.extend({ - template: function (l) { - return '
' + - '
' + - '
' + - '' + l.selected + '' + - '' + l.deselected + '' + - '' + l.all + '' + - '
' + - '
' + - '' + - '×' + - '
' + - '
' + - '
' + - '
    ' + - '
    ' + - '
    '; - }, - - events: { - 'click .select-list-control-button[name=selected]': 'showSelected', - 'click .select-list-control-button[name=deselected]': 'showDeselected', - 'click .select-list-control-button[name=all]': 'showAll', - - 'click .select-list-search-control-clear': 'clearSearch' - }, - - initialize: function (options) { - this.listenTo(this.collection, 'add', this.renderListItem); - this.listenTo(this.collection, 'reset', this.renderList); - this.listenTo(this.collection, 'remove', this.removeModel); - this.listenTo(this.collection, 'change:selected', this.confirmFilter); - this.settings = options.settings; + }, + remove: function (postpone) { + if (postpone) { var that = this; - this.showFetchSpinner = function () { - that.$listContainer.addClass('loading'); - }; - this.hideFetchSpinner = function () { - that.$listContainer.removeClass('loading'); - }; - - var onScroll = function () { - that.showFetchSpinner(); - - that.collection.fetchNextPage({ - success: function () { - that.hideFetchSpinner(); - }, - error: function () { - that.hideFetchSpinner(); - } + that.$el.addClass(this.model.get('selected') ? 'added' : 'removed'); + setTimeout(function () { + Backbone.View.prototype.remove.call(that, arguments); + }, 500); + } else { + Backbone.View.prototype.remove.call(this, arguments); + } + }, + + toggle: function () { + var selected = this.model.get('selected'), + that = this, + url = selected ? this.settings.deselectUrl : this.settings.selectUrl, + data = $.extend({}, this.settings.extra || {}); + + data[this.settings.selectParameter] = this.model.get(this.settings.selectParameterValue); + + that.$el.addClass('progress'); + $.ajax({ + url: url, + type: 'POST', + data: data + }) + .done(function () { + that.model.set('selected', !selected); + }) + .fail(showError) + .always(function () { + that.$el.removeClass('progress'); }); - }; - this.onScroll = _.throttle(onScroll, 1000); - }, - - render: function () { - var that = this, - keyup = function () { - that.search(); - }; - - this.$el.html(this.template(this.settings.labels)) - .width(this.settings.width); - - this.$listContainer = this.$('.select-list-list-container'); - if (!this.settings.readOnly) { - this.$listContainer - .height(this.settings.height) - .css('overflow', 'auto') - .on('scroll', function () { - that.scroll(); - }); - } else { - this.$listContainer.addClass('select-list-list-container-readonly'); - } + } + }); + + + /* + * SelectList View + */ + + var SelectListView = Backbone.View.extend({ + template: function (l) { + return '
    ' + + '
    ' + + '
    ' + + '' + l.selected + '' + + '' + l.deselected + '' + + '' + l.all + '' + + '
    ' + + '
    ' + + '' + + '×' + + '
    ' + + '
    ' + + '
    ' + + '
      ' + + '
      ' + + '
      '; + }, + + events: { + 'click .select-list-control-button[name=selected]': 'showSelected', + 'click .select-list-control-button[name=deselected]': 'showDeselected', + 'click .select-list-control-button[name=all]': 'showAll', + + 'click .select-list-search-control-clear': 'clearSearch' + }, + + initialize: function (options) { + this.listenTo(this.collection, 'add', this.renderListItem); + this.listenTo(this.collection, 'reset', this.renderList); + this.listenTo(this.collection, 'remove', this.removeModel); + this.listenTo(this.collection, 'change:selected', this.confirmFilter); + this.settings = options.settings; + + var that = this; + this.showFetchSpinner = function () { + that.$listContainer.addClass('loading'); + }; + this.hideFetchSpinner = function () { + that.$listContainer.removeClass('loading'); + }; + + var onScroll = function () { + that.showFetchSpinner(); + + that.collection.fetchNextPage({ + success: function () { + that.hideFetchSpinner(); + }, + error: function () { + that.hideFetchSpinner(); + } + }); + }; + this.onScroll = _.throttle(onScroll, 1000); + }, + + render: function () { + var that = this, + keyup = function () { + that.search(); + }; + + this.$el.html(this.template(this.settings.labels)) + .width(this.settings.width); + + this.$listContainer = this.$('.select-list-list-container'); + if (!this.settings.readOnly) { + this.$listContainer + .height(this.settings.height) + .css('overflow', 'auto') + .on('scroll', function () { + that.scroll(); + }); + } else { + this.$listContainer.addClass('select-list-list-container-readonly'); + } - this.$list = this.$('.select-list-list'); + this.$list = this.$('.select-list-list'); - var searchInput = this.$('.select-list-search-control input') - .on('keyup', _.debounce(keyup, 250)); + var searchInput = this.$('.select-list-search-control input') + .on('keyup', _.debounce(keyup, 250)); - if (this.settings.focusSearch) { - setTimeout(function () { - searchInput.focus(); - }, 250); - } + if (this.settings.focusSearch) { + setTimeout(function () { + searchInput.focus(); + }, 250); + } - this.listItemViews = []; + this.listItemViews = []; - showError = function () { - $('
      ') - .addClass('error').text(that.settings.errorMessage) - .insertBefore(that.$el); - }; + showError = function () { + $('
      ') + .addClass('error').text(that.settings.errorMessage) + .insertBefore(that.$el); + }; + if (this.settings.readOnly) { + this.$('.select-list-control').remove(); + } + }, + + renderList: function () { + this.listItemViews.forEach(function (view) { + view.remove(); + }); + this.listItemViews = []; + if (this.collection.length > 0) { + this.collection.each(this.renderListItem, this); + } else { if (this.settings.readOnly) { - this.$('.select-list-control').remove(); + this.renderEmpty(); } - }, + } + this.$listContainer.scrollTop(0); + }, - renderList: function () { - this.listItemViews.forEach(function (view) { - view.remove(); + renderListItem: function (item) { + var itemView = new SelectListItemView({ + model: item, + settings: this.settings + }); + this.listItemViews.push(itemView); + this.$list.append(itemView.el); + itemView.render(); + }, + + renderEmpty: function () { + this.$list.append('
    • ' + this.settings.labels.noResults + '
      • '); + }, + + confirmFilter: function (model) { + if (this.currentFilter !== 'all') { + this.collection.remove(model); + } + }, + + removeModel: function (model, collection, options) { + this.listItemViews[options.index].remove(true); + this.listItemViews.splice(options.index, 1); + }, + + filterBySelection: function (filter) { + var that = this; + filter = this.currentFilter = filter || this.currentFilter; + + if (filter != null) { + this.$('.select-list-check-control').toggleClass('disabled', false); + this.$('.select-list-search-control').toggleClass('disabled', true); + this.$('.select-list-search-control input').val(''); + + this.$('.select-list-control-button').removeClass('active') + .filter('[name=' + filter + ']').addClass('active'); + + this.showFetchSpinner(); + + this.collection.fetch({ + url: this.settings.searchUrl, + reset: true, + data: { selected: filter }, + success: function () { + that.hideFetchSpinner(); + }, + error: showError }); - this.listItemViews = []; - if (this.collection.length > 0) { - this.collection.each(this.renderListItem, this); - } else { - if (this.settings.readOnly) { - this.renderEmpty(); - } - } - this.$listContainer.scrollTop(0); - }, - - renderListItem: function (item) { - var itemView = new SelectListItemView({ - model: item, - settings: this.settings + } + }, + + showSelected: function () { + this.filterBySelection('selected'); + }, + + showDeselected: function () { + this.filterBySelection('deselected'); + }, + + showAll: function () { + this.filterBySelection('all'); + }, + + search: function () { + var query = this.$('.select-list-search-control input').val(), + hasQuery = query.length > 0, + that = this; + + this.$('.select-list-check-control').toggleClass('disabled', hasQuery); + this.$('.select-list-search-control').toggleClass('disabled', !hasQuery); + + if (hasQuery) { + this.showFetchSpinner(); + this.currentFilter = 'all'; + + this.collection.fetch({ + url: this.settings.searchUrl, + reset: true, + data: { query: query }, + success: function () { + that.hideFetchSpinner(); + }, + error: showError }); - this.listItemViews.push(itemView); - this.$list.append(itemView.el); - itemView.render(); - }, - - renderEmpty: function () { - this.$list.append('
    • ' + this.settings.labels.noResults + '
      • '); - }, - - confirmFilter: function (model) { - if (this.currentFilter !== 'all') { - this.collection.remove(model); - } - }, - - removeModel: function (model, collection, options) { - this.listItemViews[options.index].remove(true); - this.listItemViews.splice(options.index, 1); - }, - - filterBySelection: function (filter) { - var that = this; - filter = this.currentFilter = filter || this.currentFilter; - - if (filter != null) { - this.$('.select-list-check-control').toggleClass('disabled', false); - this.$('.select-list-search-control').toggleClass('disabled', true); - this.$('.select-list-search-control input').val(''); - - this.$('.select-list-control-button').removeClass('active') - .filter('[name=' + filter + ']').addClass('active'); - - this.showFetchSpinner(); - - this.collection.fetch({ - url: this.settings.searchUrl, - reset: true, - data: { selected: filter }, - success: function () { - that.hideFetchSpinner(); - }, - error: showError - }); - } - }, - - showSelected: function () { - this.filterBySelection('selected'); - }, - - showDeselected: function () { - this.filterBySelection('deselected'); - }, - - showAll: function () { - this.filterBySelection('all'); - }, - - search: function () { - var query = this.$('.select-list-search-control input').val(), - hasQuery = query.length > 0, - that = this; - - this.$('.select-list-check-control').toggleClass('disabled', hasQuery); - this.$('.select-list-search-control').toggleClass('disabled', !hasQuery); - - if (hasQuery) { - this.showFetchSpinner(); - this.currentFilter = 'all'; - - this.collection.fetch({ - url: this.settings.searchUrl, - reset: true, - data: { query: query }, - success: function () { - that.hideFetchSpinner(); - }, - error: showError - }); - } else { - this.filterBySelection(); - } - }, + } else { + this.filterBySelection(); + } + }, - searchByQuery: function (query) { - this.$('.select-list-search-control input').val(query); - this.search(); - }, + searchByQuery: function (query) { + this.$('.select-list-search-control input').val(query); + this.search(); + }, - clearSearch: function () { - this.filterBySelection(); - }, + clearSearch: function () { + this.filterBySelection(); + }, - scroll: function () { - var scrollBottom = this.$listContainer.scrollTop() >= - this.$list[0].scrollHeight - this.$listContainer.outerHeight(); + scroll: function () { + var scrollBottom = this.$listContainer.scrollTop() >= + this.$list[0].scrollHeight - this.$listContainer.outerHeight(); - if (scrollBottom && this.collection.more) { - this.onScroll(); - } + if (scrollBottom && this.collection.more) { + this.onScroll(); } + } - }); + }); - /* - * SelectList Entry Point - */ + /* + * SelectList Entry Point + */ - window.SelectList = function (options) { - this.settings = $.extend(window.SelectList.defaults, options); + window.SelectList = function (options) { + this.settings = $.extend(window.SelectList.defaults, options); - this.collection = new SelectListCollection(); + this.collection = new SelectListCollection(); - this.view = new SelectListView({ - el: this.settings.el, - collection: this.collection, - settings: this.settings - }); - - this.view.render(); - this.filter('selected'); - return this; - }; + this.view = new SelectListView({ + el: this.settings.el, + collection: this.collection, + settings: this.settings + }); + this.view.render(); + this.filter('selected'); + return this; + }; - /* - * SelectList API Methods - */ - window.SelectList.prototype.filter = function (filter) { - this.view.filterBySelection(filter); - return this; - }; + /* + * SelectList API Methods + */ - window.SelectList.prototype.search = function (query) { - this.view.searchByQuery(query); - return this; - }; + window.SelectList.prototype.filter = function (filter) { + this.view.filterBySelection(filter); + return this; + }; + window.SelectList.prototype.search = function (query) { + this.view.searchByQuery(query); + return this; + }; - /* - * SelectList Defaults - */ - window.SelectList.defaults = { - width: '50%', - height: 400, + /* + * SelectList Defaults + */ - readOnly: false, - focusSearch: true, + window.SelectList.defaults = { + width: '50%', + height: 400, - format: function (item) { - return item.value; - }, + readOnly: false, + focusSearch: true, - labels: { - selected: 'Selected', - deselected: 'Deselected', - all: 'All', - noResults: '' - }, + format: function (item) { + return item.value; + }, - tooltips: { - select: 'Click this to select item', - deselect: 'Click this to deselect item' - }, + labels: { + selected: 'Selected', + deselected: 'Deselected', + all: 'All', + noResults: '' + }, - errorMessage: 'Something gone wrong, try to reload the page and try again.' - }; + tooltips: { + select: 'Click this to select item', + deselect: 'Click this to deselect item' + }, - })(jQuery); + errorMessage: 'Something gone wrong, try to reload the page and try again.' + }; }); diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/analysis_reports/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/analysis_reports/index.html.erb index e514d33537d..6943f95ee60 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/analysis_reports/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/analysis_reports/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb index da8a834d102..2ba2ac6afc3 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% 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 3d13e30672a..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 @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/show.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/show.html.erb index 629a4a120d0..97027663c63 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/show.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/show.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/component/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/component/index.html.erb index b48c2601929..f9f2b8941a9 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/component/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/component/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>
      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb index 05cc887a166..605a8e1ed96 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>
      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/design/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/design/index.html.erb index b3cc6bdd839..5a2d7843739 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/design/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/design/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb index 117ae080c94..b6f12ce75fa 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %> <%= render :partial => 'header' -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb index 3d75fcbfdba..81652c64959 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% 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 0a1423d24f2..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 @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% 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 1d51642aa7d..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 @@ -37,6 +37,10 @@ moment.lang(window.pageLang); numeral.language(window.pageLang); + + <%= yield :script -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/libraries/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/libraries/index.html.erb index 6c1608bc39a..0f1ab2d49b0 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/libraries/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/libraries/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb index ea6def26e02..bf9ad6c0345 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb index fa44944563a..fd0c7f6343f 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>

      <%= message 'roles.page' -%>

      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb index 5aee7f30416..0fa80b59de1 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>
      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb index 470dab4c24e..4a1ee1605e2 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>
      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/global.html.erb index 82b820b1e21..fb22230e8e6 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/global.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/global.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>

      <%= h message 'global_permissions.page' -%>

      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb index 64e2f4483fd..8af1a9730e6 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>

      <%= message 'roles.page' -%>

      diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb index 11369d6ed8f..d4270d08c1a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb @@ -1,5 +1,5 @@ <% content_for :script do %> - + <% end %>
      -- 2.39.5