diff options
Diffstat (limited to 'sonar-server/src')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb | 41 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/javascripts/build.js | 3 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/less/sonar-colorizer.less (renamed from sonar-server/src/main/webapp/stylesheets/sonar-colorizer.less) | 0 |
3 files changed, 9 insertions, 35 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index 73203be4237..1043f454da3 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -18,42 +18,15 @@ end %> <title><%= title -%></title> - <%= stylesheet_link_tag 'sonar', :media => 'all' -%> - <%= yield :style -%> - - <% if ENV['RAILS_ENV'] == 'production' %> - <%= javascript_include_tag 'sonar' -%> - <% else %> - <%= javascript_include_tag 'third-party/jquery' %> - <%= javascript_include_tag 'third-party/jquery-ui' %> - <%= javascript_include_tag 'third-party/d3' %> - <%= javascript_include_tag 'third-party/underscore' %> - <%= javascript_include_tag 'third-party/select2' %> - <%= javascript_include_tag 'select2-jquery-ui-fix' %> - - <%= javascript_include_tag 'translate' %> - <%= javascript_include_tag 'widgets/widget' %> - <%= javascript_include_tag 'widgets/bubble-chart' %> - <%= javascript_include_tag 'widgets/timeline' %> - <%= javascript_include_tag 'widgets/stack-area' %> - <%= javascript_include_tag 'widgets/pie-chart' %> - <%= javascript_include_tag 'widgets/histogram' %> - - <%= javascript_include_tag 'top-search' %> - <%= javascript_include_tag 'sortable' %> - <%= javascript_include_tag 'common/inputs' %> + <link href="<%= ApplicationController.root_context -%>/css/sonar.css" rel="stylesheet" media="all"> + <%= yield :style -%> - <%= javascript_include_tag 'application' %> - <%= javascript_include_tag 'dashboard' %> - <%= javascript_include_tag 'duplication' %> - <%= javascript_include_tag 'resource' %> - <%= javascript_include_tag 'issue' %> - <%= javascript_include_tag 'recent-history' %> - <% end %> - <script>var baseUrl = '<%= ApplicationController.root_context -%>'; - var $j = jQuery.noConflict(); - $j(document).ready(function () {$j('.open-modal').modal()}); + <script src="<%= ApplicationController.root_context -%>/js/sonar.js"></script> + <script> + var baseUrl = '<%= ApplicationController.root_context -%>'; + var $j = jQuery.noConflict(); + $j(document).ready(function () {$j('.open-modal').modal()}); </script> <%= yield :script -%> </head> diff --git a/sonar-server/src/main/webapp/javascripts/build.js b/sonar-server/src/main/webapp/javascripts/build.js index bda21470856..3f238b9080c 100644 --- a/sonar-server/src/main/webapp/javascripts/build.js +++ b/sonar-server/src/main/webapp/javascripts/build.js @@ -1,8 +1,9 @@ ({ appDir: '.', baseUrl: '.', - dir: 'DEFINED IN POM.XML', + dir: 'build', preserveLicenseComments: false, + skipDirOptimize: true, modules: [ { name: 'quality-gate/app' }, diff --git a/sonar-server/src/main/webapp/stylesheets/sonar-colorizer.less b/sonar-server/src/main/webapp/less/sonar-colorizer.less index dd924b9ea5e..dd924b9ea5e 100644 --- a/sonar-server/src/main/webapp/stylesheets/sonar-colorizer.less +++ b/sonar-server/src/main/webapp/less/sonar-colorizer.less |