Merge branch 'devel' into v1.x

jbox-web · Mar 23, 2015 · 193fbbc · 193fbbc
2 parents a9cfbce + 9e7f0a6
commit 193fbbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -29,5 +29,3 @@ You can contribute to this plugin in many ways such as :
 * Submitting translations
 
 You can also donate :)
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FBT7E7DAVVEEU)
diff --git a/app/views/common/_jenkins_js_headers.html.haml b/app/views/common/_jenkins_js_headers.html.haml
@@ -1,11 +1,11 @@
 - content_for :header_tags do
-  = redmine_bootstrap_kit_load(:redmine_bootstrap_kit)
-  = redmine_bootstrap_kit_load(:bootstrap_label)
-  = redmine_bootstrap_kit_load(:bootstrap_modals)
-  = redmine_bootstrap_kit_load(:bootstrap_pagination)
-  = redmine_bootstrap_kit_load(:bootstrap_switch)
-  = redmine_bootstrap_kit_load(:bootstrap_tables)
-  = redmine_bootstrap_kit_load(:font_awesome)
+  = bootstrap_load_base
+  = bootstrap_load_module(:label)
+  = bootstrap_load_module(:modals)
+  = bootstrap_load_module(:pagination)
+  = bootstrap_load_module(:switch)
+  = bootstrap_load_module(:tables)
+  = bootstrap_load_module(:font_awesome)
 
   = stylesheet_link_tag 'application', plugin: 'redmine_jenkins'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,5 +29,3 @@ You can contribute to this plugin in many ways such as :
		* Submitting translations

		You can also donate :)

		[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FBT7E7DAVVEEU)