From 353f5f049e5a42149cce2133f48b38529eeec678 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 23:11:50 -0800 Subject: Empty commit message. --- view/php/theme_init.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0867c989d..1fefa110e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,6 +1,7 @@ get_channel(); +if($channel && file_exists($channel['channel_address'] . '.js')) + head_add_js('/' . $channel['channel_address'] . '.js'); + -- cgit v1.2.3 From 34f8b215114f1041094784c9f931d185b78b0ec2 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Nov 2013 11:52:38 -0800 Subject: init_groups_visitor() was still using old array of id output (not the newer array of hash which we need for permission queries) --- view/php/theme_init.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1fefa110e..69d99893a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -42,6 +42,9 @@ head_add_js('library/colorbox/jquery.colorbox-min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. + * Eventually this functionality needs to be provided by a module + * such that permissions can be enforced. At the moment it's + * more of a proof of concept; but sufficient for our immediate needs. */ $channel = get_app()->get_channel(); -- cgit v1.2.3 From 95824642a643ccee269f7bf1a5ac570bc966a2e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 19:07:58 -0800 Subject: make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit. --- view/php/theme_init.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 69d99893a..c33187797 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,20 +1,17 @@ Date: Tue, 26 Nov 2013 13:24:36 -0800 Subject: create jquery-compat to hold deprecated jquery functions, load it before all the dependent js scripts --- view/php/theme_init.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index c33187797..1ba8d18a4 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -11,7 +11,8 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); -// head_add_js('js/jquery-migrate-1.1.1.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'); -- cgit v1.2.3 From e3f5c4458bc637ca304b807d2125f332965e4126 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Nov 2013 00:48:17 -0800 Subject: re-enable jquery migration tool until we sort out all the issues --- view/php/theme_init.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1ba8d18a4..f49b9c043 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -11,8 +11,8 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); -//head_add_js('js/jquery-migrate-1.1.1.js'); -head_add_js('js/jquery-compat.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'); -- cgit v1.2.3 From 82388465e4d87816a01fc93fa062b722515256a0 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 4 Dec 2013 23:32:49 +0100 Subject: split conversation.css out of style.css --- view/php/theme_init.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f49b9c043..42badc01d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -9,6 +9,7 @@ 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_js('js/jquery.js'); head_add_js('js/jquery-migrate-1.1.1.js'); -- cgit v1.2.3 From 2dfd65f90b23e92da692311f2c5b7c6503e0ce25 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 18:49:48 +0100 Subject: override bootstrap in bootstrap-red so theme developers are not forced to change anything --- view/php/theme_init.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e0992f0f0..e2c536812 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -12,6 +12,7 @@ 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_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); -- cgit v1.2.3 From 9f185b95f5a35b841a0c1ba9b49a0b7de47cda5e Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 19:06:43 +0100 Subject: Minified bootstrap css --- view/php/theme_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e2c536812..ffbc02e48 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -3,7 +3,7 @@ require_once('include/plugin.php'); head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); -head_add_css('library/bootstrap/css/bootstrap.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'); -- cgit v1.2.3 From 860966ce421210e9f48d36dee72b8aa10a39c7c6 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 9 Dec 2013 10:07:24 +0100 Subject: this reduces pageloadsize by 355,93KB --- view/php/theme_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/php/theme_init.php') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index ffbc02e48..a2024d658 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -29,7 +29,7 @@ head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); -head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); +head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); 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'); -- cgit v1.2.3 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/theme_init.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