aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-25 16:29:00 -0800
committerfriendica <info@friendica.com>2014-02-25 16:29:00 -0800
commit9a2e73ae1522c7e69d7d6e0ca6c1089189c6e697 (patch)
treed945e505dbbe62200c1bf4d89f8728c7fff8e1f2
parent8fd12eb122b2ca45f71ff30ce02f2544bed15a85 (diff)
downloadvolse-hubzilla-9a2e73ae1522c7e69d7d6e0ca6c1089189c6e697.tar.gz
volse-hubzilla-9a2e73ae1522c7e69d7d6e0ca6c1089189c6e697.tar.bz2
volse-hubzilla-9a2e73ae1522c7e69d7d6e0ca6c1089189c6e697.zip
move bootstrap to theme and out of core.
-rw-r--r--view/php/theme_init.php9
-rw-r--r--view/theme/redbasic/php/theme_init.php9
2 files changed, 10 insertions, 8 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index b6aa5de0f..45eb2fc1d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -2,8 +2,6 @@
require_once('include/plugin.php');
-head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
-head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
head_add_css('library/tiptip/tipTip.css');
head_add_css('library/jgrowl/jquery.jgrowl.css');
@@ -11,13 +9,10 @@ head_add_css('library/jslider/css/jslider.css');
head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
-head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+
head_add_js('jquery.js');
-head_add_js('library/bootstrap/js/bootstrap.min.js');
-head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('jquery-migrate-1.1.1.js');
//head_add_js('jquery-compat.js');
head_add_js('spin.js');
@@ -42,8 +37,6 @@ head_add_js('crypto.js');
head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');
head_add_js('library/colorbox/jquery.colorbox-min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
/**
* Those who require this feature will know what to do with it.
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index ccb85a070..12f49efa7 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,5 +1,14 @@
<?php
head_add_css('library/font_awesome/css/font-awesome.min.css');
+head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
+head_add_css('library/bootstrap/css/bootstrap.min.css');
+head_add_css('view/css/bootstrap-red.css');
+head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+
require_once('view/php/theme_init.php');
+head_add_js('library/bootstrap/js/bootstrap.min.js');
+head_add_js('library/bootstrap/js/bootbox.min.js');
+head_add_js('library/bootstrap-datetimepicker/js/moment.js');
+head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');