diff options
Diffstat (limited to 'views/default')
-rw-r--r-- | views/default/js/initialize_elgg.php | 4 | ||||
-rw-r--r-- | views/default/page/elements/head.php | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php index b967a0914..9032d8a63 100644 --- a/views/default/js/initialize_elgg.php +++ b/views/default/js/initialize_elgg.php @@ -4,7 +4,6 @@ */ ?> -<script type="text/javascript"> /** * Don't want to cache these -- they could change for every request */ @@ -41,5 +40,4 @@ if ($user instanceof ElggUser) { echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; } -?>; -</script>
\ No newline at end of file +?> diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index 5772d0d24..43a5fbd54 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -42,15 +42,13 @@ $release = get_version(true); <title><?php echo $title; ?></title> <link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> -<?php -foreach ($css as $link) { -?> +<?php foreach ($css as $link) { ?> <link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" /> -<?php -} +<?php } ?> -$ie_url = elgg_view_get_simplecache_url('css', 'ie'); -$ie6_url = elgg_view_get_simplecache_url('css', 'ie6'); +<?php + $ie_url = elgg_view_get_simplecache_url('css', 'ie'); + $ie6_url = elgg_view_get_simplecache_url('css', 'ie6'); ?> <!--[if gt IE 6]> <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> @@ -59,14 +57,15 @@ $ie6_url = elgg_view_get_simplecache_url('css', 'ie6'); <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" /> <![endif]--> -<?php -foreach ($js as $script) { -?> +<?php foreach ($js as $script) { ?> <script type="text/javascript" src="<?php echo $script; ?>"></script> -<?php -} +<?php } ?> -echo elgg_view('js/initialize_elgg'); +<script type="text/javascript"> + <?php echo elgg_view('js/initialize_elgg'); ?> +</script> + +<?php echo $feedref; $metatags = elgg_view('metatags', $vars); |