diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-28 22:03:18 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-28 22:03:18 +0000 |
| commit | 71dc8cbf9eecb4de149bc96bb5758b866116b1c8 (patch) | |
| tree | ee3d99eb82fe42d0dfaee6d63003ca753001d03b /views | |
| parent | a1b7808dea79b3a547aa805b86d829fa1f5f19db (diff) | |
| download | elgg-71dc8cbf9eecb4de149bc96bb5758b866116b1c8.tar.gz elgg-71dc8cbf9eecb4de149bc96bb5758b866116b1c8.tar.bz2 | |
Fixes #2173 #2507 integrated the ie and admin stylesheets into the new simplecache code
git-svn-id: http://code.elgg.org/elgg/trunk@7465 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/friends/picker.php | 3 | ||||
| -rw-r--r-- | views/default/page_elements/html_begin.php | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index b8cc1560c..6a9551732 100644 --- a/views/default/friends/picker.php +++ b/views/default/friends/picker.php @@ -12,7 +12,8 @@ $base = elgg_get_site_url(); $viewtype = elgg_get_viewtype(); elgg_register_js("{$base}vendors/jquery/jquery.easing.1.3.packed.js", 'jquery.easing'); -elgg_register_js("{$base}cache/js/friendsPickerv1/default/friendsPickerv1.{$vars['config']->lastcache}.js", 'friendsPicker'); +$url = elgg_view_get_simplecache_url('js', 'friendsPickerv1'); +elgg_register_js($url, 'friendsPicker'); $chararray = elgg_echo('friendspicker:chararray'); diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php index a673d8ff6..23879dde8 100644 --- a/views/default/page_elements/html_begin.php +++ b/views/default/page_elements/html_begin.php @@ -65,13 +65,16 @@ foreach ($css as $link) { <link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" /> <?php } + +$ie_url = elgg_view_get_simplecache_url('css', 'ie'); +$ie6_url = elgg_view_get_simplecache_url('css', 'ie6'); ?> <!--[if IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie6.css" /> + <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> <![endif]--> <!--[if gt IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie.css" /> + <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" /> <![endif]--> <?php |