Permalink
Browse files

Merged from 1.5. Changed $CFG-theme to current_theme() to make the th…

…eme working as course or session theme, see Bug #4315
  • Loading branch information...
1 parent c6eb9eb commit e236ac3c7c17f80b9c646967df51ed43efdd36bc urs_hunkler committed Nov 13, 2005
View
90 theme/formal_white/header.html
@@ -1,45 +1,45 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html<?php echo $direction ?>>
-<head>
- <?php echo $meta ?>
- <meta name="keywords" content="moodle, <?php echo $title ?> " />
- <title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
- <?php include("$CFG->javascript"); ?>
-</head>
-
-<body<?php
- echo " $bodytags";
- if ($focus) {
- echo " onload=\"setfocus()\"";
- }
- ?>>
-
-<div id="page">
-
-<?php if ($home) { // This is what gets printed on the home page only
-?>
- <div id="header-home">
- <div class="headermain"><img src='<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/logo.jpg' /></div>
- <div class="headermenu"><?php echo $menu ?></div>
- </div>
-<?php } else if ($heading) { // This is what gets printed on any other page with a heading
-?>
- <div id="header">
- <div class="headermain"><img src='<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/logo_small.jpg' /></div>
- <div class="headermenu"><?php echo $menu ?></div>
- </div>
-<?php } ?>
- <div class="clearer">&nbsp;</div>
-<?php if ($navigation) { // This is the navigation table with breadcrumbs ?>
- <div class="navbar">
- <div class="breadcrumb"><?php print_navigation("$navigation"); ?></div>
- <div class="navbutton"><?php echo $button; ?></div>
- </div>
-<?php } else if ($heading) { // If no navigation, but a heading, then print a line
-?>
- <hr size="1" noshade="noshade" />
-<?php } ?>
- <div class="clearer">&nbsp;</div>
- <!-- END OF HEADER -->
- <div id="content">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html<?php echo $direction ?>>
+
+<head>
+
+ <?php echo $meta ?>
+
+ <meta name="keywords" content="moodle, <?php echo $title ?> " />
+
+ <title><?php echo $title ?></title>
+
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
+
+ <?php include("$CFG->javascript"); ?>
+
+</head>
+
+
+
+<body<?php
+
+ echo " $bodytags";
+
+ if ($focus) {
+
+ echo " onload=\"setfocus()\"";
+
+ }
+
+ ?>>
+
+
+
+<div id="page">
+
+
+
+<?php if ($home) { // This is what gets printed on the home page only
+
+?>
+
+ <div id="header-home">
+
+ <div class="headermain"><img src='<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/logo.jpg' /></div>
View
2 theme/metal/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/oceanblue/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
4 theme/orangewhite/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
@@ -13,7 +13,7 @@
if ($focus) {
echo " onload=\"setfocus()\"";
};
- ?>
+ ?>>
<div id="page">
View
2 theme/orangewhitepda/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/standard/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/standardblue/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/standardgreen/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
4 theme/standardlogo/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
@@ -35,7 +35,7 @@
$standardlogo = $CFG->wwwroot.'/file.php/1/logo.gif';
}
} else {
- $standardlogo = $CFG->wwwroot.'/theme/'.$CFG->theme.'/logo.gif';
+ $standardlogo = $CFG->wwwroot.'/theme/'.current_theme().'/logo.gif';
}
?>
<div id="header-home">
View
2 theme/standardred/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/standardwhite/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
View
2 theme/wood/header.html
@@ -4,7 +4,7 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>

0 comments on commit e236ac3

Please sign in to comment.