Updated templates for XHTML 1.0

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2125 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 29, 2006 · 06a2def · 06a2def
1 parent 14ddd76
commit 06a2def
Show file tree

Hide file tree

Showing 36 changed files with 100 additions and 99 deletions.
diff --git a/admin/templates.php b/admin/templates.php
@@ -306,11 +306,11 @@ function makegraph($thisstep, $total)
 		foreach ($Question as $qs) {
 			$files[]=array("name"=>$qs);
 		}
-		$myoutput[]="<meta http-equiv=\"expires\" content=\"Wed, 26 Feb 1997 08:21:57 GMT\">\n";
-		$myoutput[]="<meta http-equiv=\"Last-Modified\" content=\"".gmdate('D, d M Y H:i:s'). " GMT\">\n";
-		$myoutput[]="<meta http-equiv=\"Cache-Control\" content=\"no-store, no-cache, must-revalidate\">\n";
-		$myoutput[]="<meta http-equiv=\"Cache-Control\" content=\"post-check=0, pre-check=0, false\">\n";
-		$myoutput[]="<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
+		$myoutput[]="<meta http-equiv=\"expires\" content=\"Wed, 26 Feb 1997 08:21:57 GMT\" />\n";
+		$myoutput[]="<meta http-equiv=\"Last-Modified\" content=\"".gmdate('D, d M Y H:i:s'). " GMT\" />\n";
+		$myoutput[]="<meta http-equiv=\"Cache-Control\" content=\"no-store, no-cache, must-revalidate\" />\n";
+		$myoutput[]="<meta http-equiv=\"Cache-Control\" content=\"post-check=0, pre-check=0, false\" />\n";
+		$myoutput[]="<meta http-equiv=\"Pragma\" content=\"no-cache\" />\n";
 		$myoutput = array_merge($myoutput, doreplacement("$publicdir/templates/$templatename/startpage.pstpl"));
 		$myoutput = array_merge($myoutput, doreplacement("$publicdir/templates/$templatename/survey.pstpl"));
 		$myoutput = array_merge($myoutput, doreplacement("$publicdir/templates/$templatename/startgroup.pstpl"));
@@ -551,7 +551,7 @@ function makegraph($thisstep, $total)
 					"<img name='Export' src='$imagefiles/exportsql.png' alt='' align='left' title='' /></a>\n"
 	."\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left' />\n"
 	."\t\t\t\t\t" .
-			"<a href='#' onmouseout=\"hideTooltip()\" onmouseover=\"showTooltip(event,'"._("Export Template")."')\"" .
+			"<a href='#' onmouseout=\"hideTooltip()\" onmouseover=\"showTooltip(event,'"._("Copy Template")."')\"" .
 			"onClick=\"javascript: copyprompt('"._("Make a copy of this template")."', '"._("copy_of_")."$templatename', '$templatename', 'copy')\">" .
 			"<img name='MakeCopy' src='$imagefiles/copy.png' alt='' align='left' title='' /></a>"
 	."</td><td align='right'>\n"
@@ -601,7 +601,7 @@ function makegraph($thisstep, $total)
 	if (is_writable("$publicdir/templates/$templatename")) {
 		echo "<input align='right' type='submit' value='Save Changes'";
 		if ($templatename == "default") {
-			echo " disabled";
+			echo " style='color: #BBBBBB;' disabled alt='"._('Changes cannot be saved to the default template.')."'";
 		}
 		echo " />";
 	}
@@ -611,7 +611,7 @@ function makegraph($thisstep, $total)
 	."<table width='90' align='right' border='0' cellpadding='0' cellspacing='0'>\n<tr><td align='right'>"
 	. "$setfont<strong>"._("Other Files:")."</strong></font><br />\n"
 	//. "<iframe width='100%' height='140' src=\"templates.html\"></iframe>"
-	. "<select size='9' name='otherfile' id='otherfile'>\n"
+	. "<select size='10' style='min-width:130px;'name='otherfile' id='otherfile'>\n"
 	.makeoptions($otherfiles, "name", "name", "")
 	."</select>"
 	."</td></tr><tr><td align='right'>$setfont"
@@ -628,7 +628,7 @@ function makegraph($thisstep, $total)
 	."</table></form></td></tr><tr><td></td><td align='right' valign='top'>"
 	."<form enctype='multipart/form-data' name='importsurvey' action='templates.php' method='post'>\n"
 	."<table><tr> <td align='right' valign='top' style='border: solid 1 #000080'>\n"
-	."<input name=\"the_file\" type=\"file\" size=\"7\" /><br />"
+	."<strong>"._('Upload a File').":</strong><br /><input name=\"the_file\" type=\"file\" size=\"7\" /><br />"
 	."<input type='submit' value='"._("Upload")."'";
 	if ($templatename == "default") {
 		echo " disabled";

diff --git a/common.php b/common.php
@@ -1792,7 +1792,7 @@ function templatereplace($line)
 	. "<tr><td align='right'>"._("Your Email")."</td><td><input type='text' name='saveemail' value='";
 	if (isset($_POST['saveemail'])) {$saveform .= html_escape(auto_unescape($_POST['saveemail']));}
 	$saveform .= "' /></td></tr>\n"
-	. "<tr><td></td><td><input type='submit' name='savesubmit' value='"._("Save Now")."'></td></tr>\n"
+	. "<tr><td></td><td><input type='submit' name='savesubmit' value='"._("Save Now")."' /></td></tr>\n"
 	. "</table>";
 	$savereturn = "<a href='index.php?sid=$surveyid";
 	if (returnglobal('token'))
@@ -1825,10 +1825,10 @@ function templatereplace($line)
 	$line=str_replace("{REGISTERMESSAGE2}", _("You may register for this survey if you wish to take part.<br />\nEnter your details below, and an email containing the link to participate in this survey will be sent immediately."), $line);
 	if (strpos($line, "{REGISTERFORM}") !== false)
 	{
-		$registerform="<table class='register'>\n"
-		."<form method='post' action='register.php'>\n"
-		."<input type='hidden' name='sid' value='$surveyid' id='sid' />\n"
+		$registerform="<form method='post' action='register.php'>\n"
+		."<table class='register'>\n"
 		."<tr><td align='right'>"
+		."<input type='hidden' name='sid' value='$surveyid' id='sid' />\n"
 		._("First Name").":</td>"
 		."<td align='left'><input class='text' type='text' name='register_firstname'";
 		if (isset($_POST['register_firstname']))
@@ -1872,8 +1872,8 @@ function templatereplace($line)
 		}
 		$registerform .= "<tr><td></td><td><input class='submit' type='submit' value='"._("Continue")."' />"
 		."</td></tr>\n"
-		."</form>\n"
-		."</table>\n";
+		."</table>\n"
+		."</form>\n";
 		$line=str_replace("{REGISTERFORM}", $registerform, $line);
 	}
 	$line=str_replace("{ASSESSMENTS}", $assessments, $line);

diff --git a/templates/basic/assessment.pstpl b/templates/basic/assessment.pstpl
@@ -1,5 +1,5 @@
 <br />
-<table align='center' width='75%' border='1' style='border-collapse: collapse' bordercolor='#111111'>
+<table align='center' width='75%' border='1' style='border-collapse: collapse'>
  <tr>
   <td bgcolor='#CCCCCC' align='center'><font size='2'>
    <strong>{ASSESSMENT_HEADING}</strong></font>

diff --git a/templates/basic/clearall.pstpl b/templates/basic/clearall.pstpl
@@ -6,8 +6,9 @@
     <strong><font color='red'>{ANSWERSCLEARED}</font></strong><br /><br />
 	{RESTART}<br />
         {URL}<br />
-	{CLOSEWINDOW}
+	{CLOSEWINDOW}</font>
    </td>
   </tr>
  </table>
-<br />
+<br />
+<table  width='0%' align='center'><tr><td><table align='center'  width='0%' border='0'><tr><td>
diff --git a/templates/basic/completed.pstpl b/templates/basic/completed.pstpl
@@ -8,9 +8,9 @@
 {COMPLETED}
 
 Thank you very much for the time and effort of taking this survey! 
-Company X looks forward to continuing to improve the services it offers its customers.<p>
+Company X looks forward to continuing to improve the services it offers its customers. <br /><br />
 
-<center><input type="button" name="closeme" value="Close Window" onClick="top.window.close();"></center>
+<center><input type="button" name="closeme" value="Close Window" onClick="top.window.close();" /></center>
 
 
 </td></tr></table>
diff --git a/templates/basic/endpage.pstpl b/templates/basic/endpage.pstpl
@@ -4,10 +4,4 @@
 	</td>
 	<td width='3' height='3' class='b9'></td>
 </tr>
-<tr><td width='3' class='b3'></td></tr>
-<tr class='b3'>
-	<td colspan="2" height='3'><table cellpadding=0 cellspacing=0>
-		<tr><td width='3' height='3' class='b9'></td></tr>
-	</table></td>
-</tr>
 </table>
diff --git a/templates/basic/load.pstpl b/templates/basic/load.pstpl
@@ -1,7 +1,8 @@
 <center>
 <font color='red'>{LOADERROR}</font>
-<p><strong><font size='+1'>{LOADHEADING}</font></strong></p>
-<p>{LOADMESSAGE}</p>
-<p>{LOADFORM}</p>
+<strong><font size='+1'>{LOADHEADING}</font></strong><br /><br />
+{LOADMESSAGE}<br />
+{LOADFORM}<br />
 {RETURNTOSURVEY}
-</center>
+</center>
+<table  width='0%' align='center'><tr><td><table align='center'  width='0%' border='0'><tr><td>
diff --git a/templates/basic/register.pstpl b/templates/basic/register.pstpl
@@ -4,4 +4,4 @@
 <p><strong>{REGISTERMESSAGE1}</strong></p>
 <p>{REGISTERMESSAGE2}</p>
 {REGISTERFORM}<br />
-</center>
+</center>
diff --git a/templates/basic/save.pstpl b/templates/basic/save.pstpl
@@ -1,7 +1,8 @@
 <center>
 <font color='red'>{SAVEERROR}</font>
-<p><strong><font size='+1'>{SAVEHEADING}</font></strong></p>
-<p>{SAVEMESSAGE}</p>
-<p>{SAVEFORM}</p>
+<strong><font size='+1'>{SAVEHEADING}</font></strong><br /><br />
+{SAVEMESSAGE}<br /><br />
+{SAVEFORM}<br />
 {RETURNTOSURVEY}
 </center>
+<table  width='0%' align='center'><tr><td><table align='center'  width='0%' border='0'><tr><td>
diff --git a/templates/basic/startpage.pstpl b/templates/basic/startpage.pstpl
@@ -1,6 +1,5 @@
-<head>
 <title>{SURVEYNAME} :: {GROUPNAME}</title>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="generator" content="PHPSurveyor http://www.phpsurveyor.org" />
 <style type='text/css'>
 body { font-family: arial, verdana, sans-serif; font-size: 14px; line-height: 17px; background-color: #999999; }

diff --git a/templates/basic/submit.pstpl b/templates/basic/submit.pstpl
@@ -1,11 +1,11 @@
 <table width="90%" align="center"><tr><td>
- <br>
- <br>
-{SUBMITCOMPLETE}<p>
+ <br />
+ <br />
+{SUBMITCOMPLETE} <br />
 
-<center>{SUBMITBUTTON}</center><p>
+<center>{SUBMITBUTTON}</center> <br />
 
-{SUBMITREVIEW}.<p>
+{SUBMITREVIEW}. <br />
 {PRIVACY}
 <br />
 </td></tr></table>
diff --git a/templates/basic/survey.pstpl b/templates/basic/survey.pstpl
@@ -5,7 +5,7 @@
 			<td>
 <table width='100%' cellpadding='2'>
 	<tr>
-		<td width="100%" valign="bottom" align="left"><img src="{TEMPLATEURL}logo.gif" alt="Logo Image" height="72" width="211"></td>
-		<td nowrap valign="bottom" align="right"><strong>{SURVEYNAME}</strong><br>{PERCENTCOMPLETE}</td>
+		<td width="100%" valign="bottom" align="left"><img src="{TEMPLATEURL}logo.gif" alt="Logo Image" height="72" width="211" /></td>
+		<td nowrap valign="bottom" align="right"><strong>{SURVEYNAME}</strong><br />{PERCENTCOMPLETE}</td>
 	</tr>
 </table>
diff --git a/templates/basic/welcome.pstpl b/templates/basic/welcome.pstpl
@@ -6,10 +6,10 @@
 
 <table align='center' width='100%' cellpadding='25' cellspacing='0'>
 	<tr>
-		<td width="100%" valign="bottom"><img src="{TEMPLATEURL}logo.gif" height="72" width="211" alt="Logo"></td>
+		<td width="100%" valign="bottom"><img src="{TEMPLATEURL}logo.gif" height="72" width="211" alt="Logo" /></td>
 		<td nowrap valign="bottom"><strong>{SURVEYNAME}</strong></td>
 	</tr>
 	<tr>
-		<td colspan="2" align="center"><table width='80%'><tr><td>{WELCOME}<br> <br></td></tr></table></td>
+		<td colspan="2" align="center"><table width='80%'><tr><td>{WELCOME}<br /> <br /></td></tr></table></td>
 	</tr>
 </table>
diff --git a/templates/blue_heaven/assessment.pstpl b/templates/blue_heaven/assessment.pstpl
@@ -1,5 +1,5 @@
 <br />
-<table align='center' width='75%' border='1' style='border-collapse: collapse' bordercolor='#111111'>
+<table align='center' width='75%' border='1' style='border-collapse: collapse;border-color:#111111'>
  <tr>
   <td bgcolor='#CCCCCC' align='center'><font size='2'>
    <strong>{ASSESSMENT_HEADING}</strong></font>

diff --git a/templates/blue_heaven/clearall.pstpl b/templates/blue_heaven/clearall.pstpl
@@ -5,7 +5,7 @@
     <font face='arial' size='2'>
     <strong><font color='red'>{ANSWERSCLEARED}</font></strong><br /><br />
 	{RESTART}<br />
-	{CLOSEWINDOW}
+	{CLOSEWINDOW}</font>
    </td>
   </tr>
  </table>

diff --git a/templates/blue_heaven/completed.pstpl b/templates/blue_heaven/completed.pstpl
@@ -1,5 +1,5 @@
 <br />
-<table width='75%' align='center' border='1' style='border-collapse: collapse' bordercolor='#111111' bgcolor='white'>
+<table width='75%' align='center' border='1' style='border-collapse: collapse;border-color:#111111' bgcolor='white'>
 	<tr>
 		<td align='center'>
 			<font size='2'><br />{COMPLETED}<br /><br />

diff --git a/templates/blue_heaven/endpage.pstpl b/templates/blue_heaven/endpage.pstpl
@@ -1,10 +1,10 @@
 		</td>
 	</tr>
 </table>
-<table width='95%' align='center' style='border-collapse: collapse' bordercolor='#333333' bgcolor='#0099CC' border='0' cellspacing='0'>
+<table width='95%' align='center' style='border-collapse: collapse; border-color:#333333'  bgcolor='#0099CC' border='0' cellspacing='0'>
  <tr>
-  <td align='right'><font size='2'>
-    Powered by <a href='http://www.phpsurveyor.org/' target='_blank'>PHPSurveyor</a>
+  <td align='right'><font size='1'>
+    Powered by <a href='http://www.phpsurveyor.org/' target='_blank'>PHPSurveyor</a></font>
   </td>
  </tr>
 </table>

diff --git a/templates/blue_heaven/load.pstpl b/templates/blue_heaven/load.pstpl
@@ -1,7 +1,7 @@
 <center>
 <font color='red'>{LOADERROR}</font>
-<p><strong><font size='+1'>{LOADHEADING}</font></strong></p>
-<p>{LOADMESSAGE}</p>
-<p>{LOADFORM}</p>
+<strong><font size='+1'>{LOADHEADING}</font></strong><br /><br />
+{LOADMESSAGE}<br />
+{LOADFORM}<br />
 {RETURNTOSURVEY}
 </center>
diff --git a/templates/blue_heaven/question.pstpl b/templates/blue_heaven/question.pstpl
@@ -1,10 +1,10 @@
-<table width='75%' align='center' border='1' style='border-collapse: collapse' bordercolor='#0099CC' bgcolor='white'>
+<table width='75%' align='center' border='1' style='border-collapse: collapse; border-color:#0099CC'  bgcolor='white'>
 	<tr>
 		<td align='center'>
 			<table width='100%' cellspacing='0'>
 				<tr>
 					<td align='center' bgcolor='#E5F9FF'>
-						<font size='2' color='#0033CC'><b>{QUESTION}</b>
+						<font size='2' color='#0033CC'><b>{QUESTION}</b></font>
 					</td>
 				</tr>
 				<tr>

diff --git a/templates/blue_heaven/register.pstpl b/templates/blue_heaven/register.pstpl
@@ -1,7 +1,7 @@
 <br />
 <center>
-<font color='red'><strong>{REGISTERERROR}</strong></font>
-<p><strong>{REGISTERMESSAGE1}</strong></p>
-<p>{REGISTERMESSAGE2}</p>
+<font color='red'><strong>{REGISTERERROR}</strong></font><br />
+<strong>{REGISTERMESSAGE1}</strong><br /><br />
+{REGISTERMESSAGE2}<br /><br />
 {REGISTERFORM}<br />
 </center>
diff --git a/templates/blue_heaven/save.pstpl b/templates/blue_heaven/save.pstpl
@@ -1,7 +1,7 @@
 <center>
 <font color='red'>{SAVEERROR}</font>
-<p><strong><font size='+1'>{SAVEHEADING}</font></strong></p>
-<p>{SAVEMESSAGE}</p>
-<p>{SAVEFORM}</p>
+<strong><font size='+1'>{SAVEHEADING}</font></strong><br /><br />
+{SAVEMESSAGE}<br />
+{SAVEFORM}<br />
 {RETURNTOSURVEY}
 </center>
diff --git a/templates/blue_heaven/startpage.pstpl b/templates/blue_heaven/startpage.pstpl
@@ -1,9 +1,13 @@
 	<title>
 	A SURVEY: {SURVEYNAME}
 	</title>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="generator" content="PHPSurveyor http://www.phpsurveyor.org" />
-<style>
+<style type='text/css'>
+body
+    {
+    font-family: verdana;
+    }
 .submit
 	{
 	background-color: #0A47FF;
@@ -97,7 +101,7 @@
 	}
 </style>
 </head>
-<body bgcolor='#0099CC' link='#000080' vlink='#000080' alink='#FFFF00'><font face='verdana' size='2'>
-<table width='95%' align='center' style='border-collapse: collapse' bordercolor='#0A47FF' bgcolor='#E5F9FF' border='1' cellspacing='0'>
+<body bgcolor='#0099CC' link='#000080' vlink='#000080' alink='#FFFF00'>
+<table width='95%' align='center' style='border-collapse: collapse; border-color:#0A47FF' bgcolor='#E5F9FF' border='1' cellspacing='0'>
 	<tr>
 		<td>
diff --git a/templates/blue_heaven/welcome.pstpl b/templates/blue_heaven/welcome.pstpl
@@ -1,4 +1,4 @@
-<table align='center' width='100%' cellpadding='25' cellspacing='0' border='1' style='border-collapse: collapse' bordercolor='#111111'>
+<table align='center' width='100%' cellpadding='25' cellspacing='0' border='1' style='border-collapse: collapse;border-color:#111111'>
 	<tr>
 		<td align='center' bgcolor='#E5F9FF'>
 			<font size='5' color='#0A47FF'><b>{SURVEYNAME}</b></font><br /><br />
@@ -8,7 +8,7 @@
 	<tr>
 		<td align='center' bgcolor='#FFFFFF'>
 			<font size='2' color='#0033CC'>{WELCOME}<br /><br />
-			<i>{THEREAREXQUESTIONS}</i>
+			<i>{THEREAREXQUESTIONS}</i></font>
 		</td>
 	</tr>
 </table>
diff --git a/templates/bluengrey/assessment.pstpl b/templates/bluengrey/assessment.pstpl
@@ -1,5 +1,5 @@
 <br />
-<table align='center' width='75%' border='1' style='border-collapse: collapse' bordercolor='#111111'>
+<table align='center' width='75%' border='1' style='border-collapse: collapse; border-color: #111111' >
  <tr>
   <td bgcolor='#CCCCCC' align='center'><font size='2'>
    <strong>{ASSESSMENT_HEADING}</strong></font>

diff --git a/templates/bluengrey/clearall.pstpl b/templates/bluengrey/clearall.pstpl
@@ -6,7 +6,7 @@
     <strong><font color='red'>{ANSWERSCLEARED}</font></strong><br /><br />
 	{RESTART}<br />
         {URL}<br />
-	{CLOSEWINDOW}
+	{CLOSEWINDOW}</font>
    </td>
   </tr>
  </table>

diff --git a/templates/bluengrey/completed.pstpl b/templates/bluengrey/completed.pstpl
@@ -1,5 +1,5 @@
 <br />
-<table width='75%' align='center' border='1' style='border-collapse: collapse' bordercolor='#111111' bgcolor='white'>
+<table width='75%' align='center' border='1' style='border-collapse: collapse; border-color: #111111'  bgcolor='white'>
 	<tr>
 		<td align='center'>
 			<font >{COMPLETED}<br /><br />

diff --git a/templates/bluengrey/load.pstpl b/templates/bluengrey/load.pstpl
@@ -1,7 +1,7 @@
 <center>
 <font color='red'>{LOADERROR}</font>
-<p><strong><font size='+1'>{LOADHEADING}</font></strong></p>
-<p>{LOADMESSAGE}</p>
-<p>{LOADFORM}</p>
+<strong><font size='+1'>{LOADHEADING}</font></strong><br /><br />
+{LOADMESSAGE}<br />
+{LOADFORM}<br />
 {RETURNTOSURVEY}
 </center>
diff --git a/templates/bluengrey/navigator.pstpl b/templates/bluengrey/navigator.pstpl
@@ -2,7 +2,7 @@
 	<tr>
 		<td align='center'>
 			<font>{NAVIGATOR}</font><br />
-			<font>{CLEARALL}</font>
+			{CLEARALL}
 			{SAVE}
 		</td>
 	</tr>