diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-28 18:06:35 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-28 18:06:35 +0000 |
commit | d892f121e1b9a34edfa49288a20b99d4d4b65f6b (patch) | |
tree | c669678e56cd717d6dfc8de7ca5147f1a67710dc /views/default/page_elements | |
parent | 8e98d9d3ffce3d77fe756c300151aa1ac60d805c (diff) | |
download | elgg-d892f121e1b9a34edfa49288a20b99d4d4b65f6b.tar.gz elgg-d892f121e1b9a34edfa49288a20b99d4d4b65f6b.tar.bz2 |
Refs #2173 #2160 #2507 added a css page handler to support multiple css files
git-svn-id: http://code.elgg.org/elgg/trunk@7463 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/page_elements')
-rw-r--r-- | views/default/page_elements/html_begin.php | 4 | ||||
-rw-r--r-- | views/default/page_elements/html_begin_admin.php | 39 |
2 files changed, 2 insertions, 41 deletions
diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php index 68607f1ec..a673d8ff6 100644 --- a/views/default/page_elements/html_begin.php +++ b/views/default/page_elements/html_begin.php @@ -67,11 +67,11 @@ foreach ($css as $link) { } ?> <!--[if IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie6.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie6.css" /> <![endif]--> <!--[if gt IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie.css" /> <![endif]--> <?php diff --git a/views/default/page_elements/html_begin_admin.php b/views/default/page_elements/html_begin_admin.php deleted file mode 100644 index fcb61c25c..000000000 --- a/views/default/page_elements/html_begin_admin.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/** -* Start html output. -* The standard HTML header for admin pages -*/ - -// we won't trust server configuration but specify utf-8 -header('Content-type: text/html; charset=utf-8'); - -$version = get_version(); -$release = get_version(true); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta name="ElggRelease" content="<?php echo $release; ?>" /> - <meta name="ElggVersion" content="<?php echo $version; ?>" /> - <title><?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></title> - <link rel="shortcut icon" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> - - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> - - <?php - echo elgg_view('scripts/initialize_elgg'); - echo $feedref; - - if (elgg_view_exists('metatags')) { - echo elgg_view('metatags', $vars); - } -?> - <!-- include the admin css file - <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>views/default/css_admin.php" type="text/css" />--> -</head> - -<body> |