[Cwispy-devel] cwispy2/admin cwispy.php, 1.67, 1.68 index.php, 1.27, 1.28 main.php, 1.31, 1.32
Status: Abandoned
Brought to you by:
cwispy
Menu
▾
▴
[Cwispy-devel] cwispy2/admin cwispy.php, 1.67, 1.68 index.php, 1.27, 1.28 main.php, 1.31, 1.32
|
From: Martin J. G. <mor...@us...> - 2008-03-26 10:03:01
|
Update of /cvsroot/cwispy/cwispy2/admin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7924 Modified Files: cwispy.php index.php main.php Log Message: xhtml fixups Index: main.php =================================================================== RCS file: /cvsroot/cwispy/cwispy2/admin/main.php,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- main.php 13 Mar 2008 18:17:00 -0000 1.31 +++ main.php 26 Mar 2008 10:02:45 -0000 1.32 @@ -17,7 +17,7 @@ echo "<table summary='' class='fullsize'>\n"; -echo "<tr class='fullsize'><td valign='top' width='15%'>"; +echo "<tr class='fullsize'><td valign='top' style=\"width: 15%\">"; beginPrettyTable("1"); echo "<tr>"; @@ -60,7 +60,7 @@ echo "</td>"; -echo "<td valign='top' align='center' width='65%'>"; +echo "<td valign='top' align='center' style=\"width: 65%\">"; if (PEAR::isError($news_result = $db->query("SELECT * from news"))) { Index: cwispy.php =================================================================== RCS file: /cvsroot/cwispy/cwispy2/admin/cwispy.php,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- cwispy.php 13 Mar 2008 22:05:52 -0000 1.67 +++ cwispy.php 26 Mar 2008 10:02:45 -0000 1.68 @@ -211,17 +211,23 @@ /* Stylesheet for XHTML * Not sure if this is strictly needed, but it doesn't seem - * to break anything */ + * to break anything + */ echo "<?xml-stylesheet href='http://www.w3.org/StyleSheets/TR/W3C-REC.css' type='text/css'?>\n"; echo "<?xml-stylesheet href='internalStyle' type='text/css'?>\n"; - /* XHTML 1.0 */ - echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>"; - - echo "<html>\n"; + /* XHTML 1.0 Transitional + echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>"; + */ + /* XHTML 1.0 Strict */ + echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"; + echo "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en_GB\">\n"; echo "<head>\n"; /* echo "<script type=\"text/javascript\" src=\"cwispy.js\"></script>"; */ echo "<link href='".$pgm_depth."cwispy.css' rel='stylesheet' title='stylesheet' id='internalStyle' type='text/css' />\n"; + echo "<style type=\"text/css\">"; + echo "@import url(\"".$pgm_depth."cwispy.css\");"; + echo "</style>"; if ($SHOW_VERSION == 1) { echo "<title>$VERSION :: [$BRAND] :: $title</title>\n"; } else { @@ -229,8 +235,8 @@ } echo "</head>\n"; echo "<body>\n"; - echo "<form name='searchuser' method='post' action='search.php'>\n"; - echo "<table class='topbar' summary=''>\n"; + echo "<form method=\"post\" action=\"search.php\">\n"; + echo "<table class='topbar' style=\"margin-bottom: 10px\">\n"; echo "<tr class='topbar'><td class='topbar'>\n $BRAND: $user</td>\n"; if($user != "Not Logged In") { echo "<!-- ###### Begin Search Bar ###### -->\n\n"; @@ -254,7 +260,7 @@ echo "</a></td>\n"; } echo "</tr>\n</table>\n"; - echo "</form>\n<br />\n"; + echo "</form>\n\n"; } @@ -337,14 +343,14 @@ if($numargs > 1) { $header = $arg_list[1]; } - echo "<table style=\"empty-cells: hide\" bgcolor='".$TABLEBORDER."' cellpadding='1' cellspacing='0' border='0'>\n"; + echo "<table style=\"empty-cells: hide; background-color: ".$TABLEBORDER."\" cellpadding='1' cellspacing='0' border='0'>\n"; if ($header) { echo " <tr>\n <td colspan='".$colspan."' align='right'>\n <div class='header'>".$header." </div></td>\n </tr>\n"; } echo " <tr>\n <td>\n"; - echo " <table style=\"empty-cells: hide\" bgcolor='".$INNERTABLE."' cellpadding='2' cellspacing='0' border='0' width='100%'>\n"; + echo " <table style=\"empty-cells: hide; background-color: ".$INNERTABLE."\" cellpadding='2' cellspacing='0' border='0' width='100%'>\n"; echo " <tr>\n <td>\n"; - echo " <table style=\"empty-cells: hide\" summary='' bgcolor='".$INNERTABLE."' cellpadding='2' cellspacing='0' border='0' width='100%'>\n"; + echo " <table style=\"empty-cells: hide; background-color: ".$INNERTABLE."\" cellpadding='2' cellspacing='0' border='0' width='100%'>\n"; } # name: endPrettyTable @@ -366,7 +372,7 @@ global $TABLEBORDER, $INNERTABLE; echo "<tr>\n <td>\n"; - echo " <table style=\"empty-cells: hide\" bgcolor='".$INNERTABLE."' cellpadding='2' cellspacing='2' border='0'>\n"; + echo " <table style=\"empty-cells: hide; background-color: ".$INNERTABLE."\" cellpadding='2' cellspacing='2' border='0'>\n"; } # name: endBorderedTable @@ -388,9 +394,9 @@ */ function openForm ($name, $action, $onsubmit) { if (($onsubmit == "") || (!isset($onsubmit))) { - echo "<form method='post' name='$name' action='$action'>\n"; + echo "<form method='post' action='$action'>\n"; } else { - echo "<form method='post' onsubmit='$onsubmit' name='$name' action='$action'>\n"; + echo "<form method='post' onsubmit='$onsubmit' action='$action'>\n"; } } # name: makeHiddenField @@ -926,7 +932,10 @@ /* Name: browsercheck * - * Desc: checks browser for xhtml support */ + * Desc: checks browser for xhtml support + * + * Note: firefox requires xhtml strict for this to work + */ function browsercheck() { Index: index.php =================================================================== RCS file: /cvsroot/cwispy/cwispy2/admin/index.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- index.php 25 Nov 2007 12:28:42 -0000 1.27 +++ index.php 26 Mar 2008 10:02:45 -0000 1.28 @@ -62,10 +62,6 @@ } else { beginDocument($lLogin, $lNotLoggedIn); - -echo "<br />\n"; -echo "<center>\n"; - openForm("login", $_SERVER['PHP_SELF'], ""); beginPrettyTable("2", $lLogin); makeTextField($lUsername, "username", ""); @@ -74,9 +70,7 @@ endPrettyTable(); closeForm(); -echo "</center>\n"; - -echo "<table width=\"100%\" summary=\"\">\n"; +echo "<table width=\"100%\" style=\"margin: auto; text-align: center\">\n"; echo "<tr>\n"; echo "<td valign=\"middle\" align=\"left\">\n"; echo "<p>\n"; |
