From dd7fea10c1b70534b76bc4d5ea044187cd4cb77b Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 21:28:42 +0100 Subject: split out widgets.css --- view/php/theme_init.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index a2024d658..e1625b3e5 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -13,6 +13,7 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.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_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); -- cgit v1.2.3 From 98b0e0221d66fe93104328e7027efe77f9c84008 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Dec 2013 20:03:45 -0800 Subject: more comanche stuff --- view/php/mod_new_channel.php | 3 --- view/php/mod_register.php | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 view/php/mod_new_channel.php delete mode 100644 view/php/mod_register.php (limited to 'view/php') diff --git a/view/php/mod_new_channel.php b/view/php/mod_new_channel.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_new_channel.php +++ /dev/null @@ -1,3 +0,0 @@ -page['template'] = 'full'; diff --git a/view/php/mod_register.php b/view/php/mod_register.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_register.php +++ /dev/null @@ -1,3 +0,0 @@ -page['template'] = 'full'; -- cgit v1.2.3 From 25a533bd72c34e9775af71c010a39db6caf7b633 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:21:57 +0100 Subject: New modal dialog for item expiry --- view/php/theme_init.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f2f0af5f1..da64ce08e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,7 +10,12 @@ head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); + // head_add_css('library/font_awesome/css/font-awesome.min.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('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); @@ -40,7 +45,8 @@ head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.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. * Those who don't, won't. -- cgit v1.2.3 From 0f4b6ba3718445e17de0d56017e55ab099b6f61d Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 15:05:56 +0100 Subject: Merge correction --- view/php/theme_init.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 509df8fef..4aecb8ecf 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,10 +15,7 @@ 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 head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); -======= ->>>>>>> upstream/master head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); -- cgit v1.2.3 From 0c85c9748096d625ae9baa29fb9aad48bab3a208 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 4 Jan 2014 03:58:21 -0800 Subject: move js files from core --- view/php/theme_init.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 4aecb8ecf..da50144dc 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -17,15 +17,15 @@ 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('js/jquery.js'); +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('js/jquery-migrate-1.1.1.js'); -//head_add_js('js/jquery-compat.js'); -head_add_js('js/spin.js'); -head_add_js('js/jquery.spin.js'); -head_add_js('js/jquery.textinputs.js'); -head_add_js('js/fk.autocomplete.js'); +head_add_js('jquery-migrate-1.1.1.js'); +//head_add_js('jquery-compat.js'); +head_add_js('spin.js'); +head_add_js('jquery.spin.js'); +head_add_js('jquery.textinputs.js'); +head_add_js('fk.autocomplete.js'); head_add_js('library/fancybox/jquery.fancybox-1.3.4.js'); head_add_js('library/jquery.timeago.js'); head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); @@ -37,10 +37,10 @@ head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/tripledes.js'); -head_add_js('js/acl.js'); -head_add_js('js/webtoolkit.base64.js'); -head_add_js('js/main.js'); -head_add_js('js/crypto.js'); +head_add_js('acl.js'); +head_add_js('webtoolkit.base64.js'); +head_add_js('main.js'); +head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); -- cgit v1.2.3 From 3869b16298041887d0c90c884ffb5b22df8d56e9 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Jan 2014 14:35:32 -0800 Subject: prettyphoto (js|css) not found --- view/php/theme_init.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index a8edb0673..0e473f728 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -8,10 +8,8 @@ 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'); head_add_css('library/jslider/css/jslider.css'); -head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); -// head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); @@ -43,7 +41,6 @@ head_add_js('main.js'); head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); -head_add_js('library/prettyphoto/js/jquery.prettyPhoto.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'); -- cgit v1.2.3 From d6a9497e4a3839d9fb4dba4634167f006bb3fe87 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 14:46:39 -0800 Subject: cleanup include/menu in preparation for the next phase of bookmarking --- view/php/theme_init.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0e473f728..b6aa5de0f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -44,6 +44,7 @@ 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. * Those who don't, won't. -- cgit v1.2.3