Move HighCharts to RedmineBootstrapKit, use new assets loader method

Author: root

Diff for: app/views/common/_git_hosting_js_headers.html.haml

@@ -1,12 +1,12 @@
 - content_for :header_tags do
-  = redmine_bootstrap_kit_load(:redmine_bootstrap_kit)
-  = redmine_bootstrap_kit_load(:bootstrap_alerts)
-  = redmine_bootstrap_kit_load(:bootstrap_label)
-  = redmine_bootstrap_kit_load(:bootstrap_modals)
-  = redmine_bootstrap_kit_load(:bootstrap_switch)
-  = redmine_bootstrap_kit_load(:bootstrap_tables)
-  = redmine_bootstrap_kit_load(:jquery_tag_it)
-  = redmine_bootstrap_kit_load(:font_awesome)
+  = bootstrap_load_base
+  = bootstrap_load_module(:alerts)
+  = bootstrap_load_module(:label)
+  = bootstrap_load_module(:modals)
+  = bootstrap_load_module(:switch)
+  = bootstrap_load_module(:tables)
+  = bootstrap_load_module(:tag_it)
+  = bootstrap_load_module(:font_awesome)
 
   = stylesheet_link_tag    'application', plugin: 'redmine_git_hosting'
   = javascript_include_tag 'application', plugin: 'redmine_git_hosting'

Diff for: app/views/common/_git_urls.html.haml

@@ -1,6 +1,8 @@
 - content_for :header_tags do
-  = redmine_bootstrap_kit_load(:redmine_bootstrap_kit)
-  = redmine_bootstrap_kit_load(:zero_clipboard)
+  = bootstrap_load_base
+  = bootstrap_load_module(:tooltip)
+  = zero_clipboard_load_base
+
   = stylesheet_link_tag    'git_urls',    plugin: 'redmine_git_hosting'
   = javascript_include_tag 'application', plugin: 'redmine_git_hosting'
 

Diff for: app/views/gitolite_public_keys/_ssh_keys.html.erb

@@ -1,5 +1,5 @@
 <% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'font_awesome', :plugin => 'redmine_bootstrap_kit' %>
+  <%= bootstrap_load_module(:font_awesome) %>
 <% end %>
 
 <table class="list">

Diff for: app/views/projects/settings/_repositories.html.haml

@@ -53,7 +53,7 @@
   %p= link_to l(:label_repository_new), new_project_repository_path(@project), class: 'icon icon-add'
 
 - content_for :header_tags do
-  = stylesheet_link_tag 'bootstrap/bootstrap_custom',  plugin: 'redmine_bootstrap_kit'
-  = stylesheet_link_tag 'bootstrap/bootstrap_label',   plugin: 'redmine_bootstrap_kit'
-  = stylesheet_link_tag 'bootstrap/bootstrap_tables',  plugin: 'redmine_bootstrap_kit'
-  = stylesheet_link_tag 'font_awesome',                plugin: 'redmine_bootstrap_kit'
+  = bootstrap_load_base
+  = bootstrap_load_module(:label)
+  = bootstrap_load_module(:tables)
+  = bootstrap_load_module(:font_awesome)

Diff for: app/views/repositories/_download_revision.html.haml

@@ -21,4 +21,4 @@
                     :class => 'button'
 
     - content_for :header_tags do
-      = stylesheet_link_tag 'font_awesome', :plugin => 'redmine_bootstrap_kit'
+      = bootstrap_load_module(:font_awesome)

Diff for: app/views/repositories/stats.html.erb

@@ -1,11 +1,12 @@
 <h2><%= l(:label_statistics) %></h2>
 
 <% content_for :header_tags do %>
-  <%= stylesheet_link_tag    'application',                  :plugin => 'redmine_git_hosting' %>
-  <%= stylesheet_link_tag    'bootstrap/bootstrap_custom',   :plugin => 'redmine_bootstrap_kit' %>
-  <%= javascript_include_tag 'highcharts/highcharts',        :plugin => 'redmine_git_hosting' %>
-  <%= javascript_include_tag 'highcharts/modules/drilldown', :plugin => 'redmine_git_hosting' %>
-  <%= javascript_include_tag 'set_highcharts',               :plugin => 'redmine_git_hosting' %>
+  <%= bootstrap_load_base %>
+  <%= high_charts_load_base %>
+  <%= high_charts_load_module(:drilldown) %>
+
+  <%= stylesheet_link_tag    'application',    plugin: 'redmine_git_hosting' %>
+  <%= javascript_include_tag 'set_highcharts', plugin: 'redmine_git_hosting' %>
 <% end %>
 
 <div id="statistics-tabs">