From 6a11423f446f11c85b1218bb691446f60ef944d3 Mon Sep 17 00:00:00 2001 From: Colin Fleming Date: Mon, 8 Apr 2013 20:06:11 +0100 Subject: Tidy up "wizard.php" XHTML Added "closehead" variable Moved LINK to HEAD statement and add TYPE parameter" Closed HEAD statement manually Added CDATA sections to SCRIPT tags Closed INPUT, IMG and BR tags and added ALT parameter to IMG tags Removed duplicate class in INPUT tag Updated HTML boolean operators --- usr/local/www/wizard.php | 96 +++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index 90f7af2..29612a3 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -169,22 +169,21 @@ do { eval($pkg['step'][$stepid]['stepbeforeformdisplay']); } while ($oldstepid != $stepid); +$closehead = false; $pgtitle = array($title); include("head.inc"); +if(file_exists("/usr/local/www/themes/{$g['theme']}/wizard.css")) + echo "\n"; +else + echo ""; ?> + -\n"; - else - echo ""; -?> "") { ?>
- - + +
- 
+ 
"; ?> - -

+logo +

 

- +
 
- +
- + "; @@ -394,8 +393,8 @@ function showchange() { if($field['size']) echo " size='" . $field['size'] . "' "; if($field['validate']) - echo " onChange='FieldValidate(this.value, \"{$field['validate']}\", \"{$field['message']}\");'"; - echo ">\n"; + echo " onchange='FieldValidate(this.value, \"{$field['validate']}\", \"{$field['message']}\");'"; + echo " />\n"; if($field['description'] <> "") { echo "
" . $field['description']; @@ -421,12 +420,12 @@ function showchange() { echo ""; - echo ""; + echo ""; - echo "\n"; + echo "\n"; break; case "subnet_select": @@ -677,7 +676,7 @@ function showchange() { echo "
 
 
" . fixup_string($title) . "
\n"; $inputaliases[] = $name; - echo "\n"; + echo " onchange='FieldValidate(this.value, \"{$field['validate']}\", \"{$field['message']}\");'"; + echo " />\n"; if($field['description'] <> "") { echo "
" . $field['description']; @@ -449,7 +448,7 @@ function showchange() { echo "\n"; + echo " />\n"; if($field['description'] <> "") { echo "
" . $field['description']; @@ -516,13 +515,13 @@ function showchange() { echo "\n"; if($field['add_to_cert_selection'] <> "") { $SELECTED = ""; - if($field['add_to_cert_selection'] == $value) $SELECTED = " SELECTED"; + if($field['add_to_cert_selection'] == $value) $SELECTED = " selected=\"selected\""; echo "\n"; } foreach($config['cert'] as $ca) { @@ -562,7 +561,7 @@ function showchange() { continue; $name = htmlspecialchars($ca['descr']); $SELECTED = ""; - if ($value == $name) $SELECTED = " SELECTED"; + if ($value == $name) $SELECTED = " selected=\"selected\""; $to_echo = "\n"; $to_echo .= ""; $canecho = 0; @@ -606,8 +605,8 @@ function showchange() { foreach ($field['options']['option'] as $opt) { $selected = ""; if($value == $opt['value']) - $selected = " SELECTED"; - echo "\t		 
"; - echo "\n"; + echo "
 
"; + echo "\n"; if($field['description'] <> "") { echo "
" . $field['description']; @@ -659,7 +658,7 @@ function showchange() { break; case "listtopic": echo "		 
" . $field['name'] . "
" . $field['name'] . "
\n"; + echo " onclick=\"disablechange()\""; + echo " />\n"; if($field['description'] <> "") { echo $field['description']; @@ -756,7 +755,7 @@ function showchange() { echo $field['typehint']; } if($field['warning'] <> "") { - echo "
" . $field['warning'] . ""; + echo "
" . $field['warning'] . ""; } if(!$field['combinefieldsbegin']) { @@ -772,11 +771,12 @@ function showchange() {
-
  +
 
+
"") { // create a fieldname loop that can be used with javascript // hide and enable features. echo "\n\n\n"; } @@ -962,4 +966,4 @@ function is_timezone($elt) { ?> - + \ No newline at end of file -- cgit v1.1