Minor touch-ups to the front page HTML

diff --git a/index.php b/index.php
index c65396613b1a69a626546893e5efd9e4af192545..e4f18776021d651ff5fea3fd245cfe3c1d7a439f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
     }
 
     print_header("$site->fullname", "$site->fullname", "home", "",
-                 "<META NAME=\"Description\" CONTENT=\"".stripslashes(strip_tags($site->summary))."\">",
+                 "<meta name=\"description\" content=\"".stripslashes(strip_tags($site->summary))."\">",
                  true, "", "<div align=right>$loginstring$langmenu</div>");
 
     $firstcolumn = false;  // for now

diff --git a/lib/javascript.php b/lib/javascript.php
index ae8e0d0195525d32bf26c6d1ecf6a29d0a9a9638..1577dfc79276e49fb79c676baa05783ebc3f530d 100644 (file)
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -1,5 +1,5 @@
 \r
-<SCRIPT LANGUAGE="JavaScript">\r
+<script language="JavaScript">\r
 <!-- //hide\r
 \r
 function popUpProperties(inobj) {\r
@@ -16,7 +16,7 @@ function fillmessagebox(text) {
 }\r
 \r
 function openpopup(url,name,height,width) {\r
-  fullurl = "<?=$CFG->wwwroot ?>" + url;\r
+  fullurl = "<?php echo $CFG->wwwroot ?>" + url;\r
   options = "menubar=0,location=0,scrollbars,resizable,width="+width+",height="+height;\r
   windowobj = window.open(fullurl,name, options);\r
   windowobj.focus();\r
@@ -35,7 +35,7 @@ function checkall() {
 }\r
 \r
 function inserttext(text) {\r
-<?PHP \r
+<?php \r
     if (!empty($SESSION->inserttextform)) {\r
         $insertfield = "opener.document.forms['$SESSION->inserttextform'].$SESSION->inserttextfield";\r
     } else {\r
@@ -52,8 +52,8 @@ function inserttext(text) {
 ?>\r
 }\r
 \r
-<?PHP if ($focus) { echo "function setfocus() { document.$focus.focus() }\n"; } ?>\r
+<?php if ($focus) { echo "function setfocus() { document.$focus.focus() }\n"; } ?>\r
 \r
 // done hiding -->\r
-</SCRIPT>\r
+</script>\r
 \r

diff --git a/lib/weblib.php b/lib/weblib.php
index fcfa1392a44a735cd7d2ccb564b85a897742035b..b0eba3b8d9ecfdf7fd04a163bd2933d01896db9d 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -665,9 +665,9 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
 
     if (!$menu and $navigation) {
         if (isset($USER->id)) {
-            $menu = "<font size=2><a target=_parent href=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</a></font>";
+            $menu = "<font size=2><a target=\"$CFG->framename\" href=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</a></font>";
         } else {
-            $menu = "<font size=2><a target=_parent href=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</a></font>";
+            $menu = "<font size=2><a target=\"$CFG->framename\" href=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</a></font>";
         }
     }