Menu
▾
▴
[phpesp-dev] More diffs
|
From: James D. <ja...@jm...> - 2006-07-13 15:26:16
|
Sending these again with additional changes. My change to head.inc
messed up some of the pages I hadn't adjusted accordingly. I'm
struggling a little to get the HTML output of the testing pages correct
so if someone wants to poke at that I'd be grateful.
As well as a few minor alterations, I've added some <label> tags to some
of the forms.
I hope I've got the correct submission format this time :-)
James
Index: include/head.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/head.inc,v
retrieving revision 1.9
diff -a -u -r1.9 head.inc
--- include/head.inc 14 Apr 2005 17:51:16 -0000 1.9
+++ include/head.inc 13 Jul 2006 15:18:50 -0000
@@ -17,4 +17,3 @@
<div id="body">
<div class="contents">
<form method="post" id="phpesp" action="<?php
echo($GLOBALS['ESPCONFIG']['ME']); ?>">
- <div>
Index: include/function/survey_merge.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/function/survey_merge.inc,v
retrieving revision 1.14
diff -a -u -r1.14 survey_merge.inc
--- include/function/survey_merge.inc 29 Apr 2004 17:27:33 -0000 1.14
+++ include/function/survey_merge.inc 13 Jul 2006 15:18:51 -0000
@@ -136,7 +136,7 @@
if($bg != '#eeeeee') $bg = '#eeeeee';
else $bg = '#ffffff';
?>
- <tr xbgcolor="<?php echo($bg); ?>">
+ <tr bgcolor="#ffffff">
<td>
<A NAME="Q<?php echo($q); ?>"><?php echo($q); ?>.</A>
<?php echo($question[0]['content']); ?>
Index: include/function/survey_report.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/function/survey_report.inc,v
retrieving revision 1.12
diff -a -u -r1.12 survey_report.inc
--- include/function/survey_report.inc 29 Apr 2004 17:27:33 -0000 1.12
+++ include/function/survey_report.inc 13 Jul 2006 15:18:51 -0000
@@ -51,7 +51,12 @@
?>
<h2><?php echo(_('Report for') .': '. $survey["title"] .' ['. _('ID')
.': '. $survey['id'] .']'); ?></h2>
<h3><?php echo($survey["subtitle"]); ?></h3>
-<blockquote><?php echo($survey["info"]); ?></blockquote>
+<?php
+ if ($survey["info"]) {
+ echo("<blockquote>".$survey["info"]."</blockquote>");
+ }
+?>
+
<table border="0" cellspacing="2" cellpadding="0" width="100%">
<tr>
<th align="left"><?php echo(_('#')); ?></th>
Index: include/function/survey_results.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/function/survey_results.inc,v
retrieving revision 1.37
diff -a -u -r1.37 survey_results.inc
--- include/function/survey_results.inc 26 Oct 2005 20:47:33 -0000 1.37
+++ include/function/survey_results.inc 13 Jul 2006 15:18:51 -0000
@@ -226,7 +226,13 @@
?>
<h2><?php echo($survey["title"]); ?></h2>
<h3><?php echo($survey["subtitle"]); ?></h3>
-<blockquote><?php echo($survey["info"]); ?></blockquote>
+
+<?php
+ if ($survey["info"]) {
+ echo("<blockquote>".$survey["info"]."</blockquote>");
+ }
+?>
+
<?php
if($cross) {
echo("<blockquote>" ._('Cross analysis on QN:') ."
${q_content}</blockquote>\n");
@@ -256,7 +262,7 @@
else $bg = '#ffffff';
?>
- <tr xbgcolor="<?php echo($bg); ?>">
+ <tr bgcolor="#ffffff">
<td>
<?php
if ($tid < 50) {
Index: include/lib/esphtml.forms.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/lib/esphtml.forms.inc,v
retrieving revision 1.16
diff -a -u -r1.16 esphtml.forms.inc
--- include/lib/esphtml.forms.inc 27 Sep 2005 13:59:14 -0000 1.16
+++ include/lib/esphtml.forms.inc 13 Jul 2006 15:18:51 -0000
@@ -119,7 +119,6 @@
if ($varr == null)
$varr =& $_POST;
$str = "<select name=\"${_name}\">\n";
- $str .= "<option></option>\n";
while(list($cid, $content) = each($options)) {
$checked = '';
if (isset($varr[$_name]) && $varr[$_name] == $cid)
@@ -157,7 +156,7 @@
if (empty($_css)) {
$_css = "default.css";
}
- $str .= '<link rel="stylesheet" href="'.
$GLOBALS['ESPCONFIG']['css_url'].$_css .'" type="text/css">';
+ $str .= '<link rel="stylesheet" href="'.
$GLOBALS['ESPCONFIG']['css_url'].$_css .'" type="text/css"/>';
$str .= "\n</head>\n<body id=\"auth\">\n";
$str .= '<div class="headerGraphic"></div>';
@@ -169,7 +168,7 @@
$str .= mkerror($_message);
}
- $str .= '<form name="loginform" id="loginform" method="post">';
+ $str .= '<form name="loginform" id="loginform" method="post"
action="manage.php">';
$str .= "\n<fieldset><legend>Login</legend>\n";
$str .= '<div class="row">';
$str .= '<label for="username">';
Index: include/lib/esphtml.results.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/lib/esphtml.results.inc,v
retrieving revision 1.13
diff -a -u -r1.13 esphtml.results.inc
--- include/lib/esphtml.results.inc 15 Apr 2005 16:00:34 -0000 1.13
+++ include/lib/esphtml.results.inc 13 Jul 2006 15:18:51 -0000
@@ -36,9 +36,9 @@
<td align="left">
<?php
if($num) {
- echo(" <img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_l.gif\" height=9 width=4>");
- printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar.gif\" height=9 width=%d>",$percent*2);
- echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_r.gif\" height=9 width=4>");
+ echo(" <img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_l.gif\" height=9 width=4 alt=\"Percentage Bar: $percent
percent\"/>");
+ printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar.gif\" height=9 width=%d alt=\"Percentage Bar: $percent
percent\"/>",$percent*2);
+ echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_r.gif\" height=9 width=4 alt=\"Percentage Bar: $percent
percent\"/>");
printf(" %.${precision}f%%",$percent);
}
?></td>
@@ -60,9 +60,9 @@
<tr bgcolor="<?php echo($bg); ?>">
<td><b><?php echo(_('TOTAL')); ?></b></td>
<td width="40%"><b> <?php
- echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_l.gif\" height=9 width=4>");
- printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar.gif\" height=9 width=%d>",$percent*2);
- echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_r.gif\" height=9 width=4>");
+ echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_l.gif\" height=9 width=4 alt=\"Percentage Bar: $percent
percent\"/>");
+ printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar.gif\" height=9 width=%d alt=\"Percentage Bar: $percent
percent\"/>",$percent*2);
+ echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url']
."hbar_r.gif\" height=9 width=4 alt=\"Percentage Bar: $percent
percent\"/>");
printf(" %.${precision}f%%",$percent); ?></b></td>
<td width="10%" align="right"><b><?php echo($total); ?></b></td>
</tr>
@@ -220,10 +220,10 @@
<td colspan="<?php echo($length+1); ?>">
<?php
if($avg) {
- echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_l.gif"
height="9" width="4">');
+ echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_l.gif"
height="9" width="4" alt="Percentage Bar"/>');
if (($j = $avg * $width - 11) > 0)
- printf('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar.gif"
height="9" width="%d">', $j);
- echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_r.gif"
height="9" width="4">');
+ printf('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar.gif"
height="9" width="%d" alt="Percentage Bar"/>', $j);
+ echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_r.gif"
height="9" width="4" alt="Percentage Bar"/>');
}
?>
</td>
Index: include/lib/adodb/adodb-lib.inc.php
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/lib/adodb/adodb-lib.inc.php,v
retrieving revision 1.1
diff -a -u -r1.1 adodb-lib.inc.php
--- include/lib/adodb/adodb-lib.inc.php 4 May 2004 19:20:35 -0000 1.1
+++ include/lib/adodb/adodb-lib.inc.php 13 Jul 2006 15:18:51 -0000
@@ -116,7 +116,7 @@
$barr = explode(':',$blank1stItem);
if (sizeof($barr) == 1) $barr[] = '';
$s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
- } else $s .= "\n<option></option>";
+ } else $s .= "\n";
if ($zthis->FieldCount() > 1) $hasvalue=true;
else $compareFields0 = true;
@@ -672,4 +672,4 @@
return $sql;
}
-?>
\ No newline at end of file
+?>
Index: include/tab/general.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/tab/general.inc,v
retrieving revision 1.25
diff -a -u -r1.25 general.inc
--- include/tab/general.inc 1 Aug 2005 16:12:54 -0000 1.25
+++ include/tab/general.inc 13 Jul 2006 15:18:51 -0000
@@ -41,7 +41,7 @@
<hr />
<table cellspacing="0" cellpadding="0">
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Name')); ?></strong></td>
+ <td class="right"><strong><label for="name"><?php echo(_('Name'));
?></label></strong></td>
<td class="left">
<?php echo mktext('name', 20, 64, $survey); ?>
<span class="red"><em><?php echo _('Required'); ?></em></span><br />
@@ -52,7 +52,7 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Owner')); ?></strong></td>
+ <td class="right"><strong><label for="realm"><?php echo(_('Owner'));
?></label></strong></td>
<td class="left"><?php
$realms = array();
if($_SESSION['acl']['superuser'] == 'Y') {
@@ -74,7 +74,7 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Title')); ?></strong></td>
+ <td class="right"><strong><label for="title"><?php echo(_('Title'));
?></label></strong></td>
<td class="left">
<?php echo mktext('title', 60, 60, $survey); ?>
<span class="red"><em><?php echo _('Required'); ?></em></span><br />
@@ -85,7 +85,7 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Subtitle')); ?></strong></td>
+ <td class="right"><strong><label for="subtitle"><?php
echo(_('Subtitle')); ?></label></strong></td>
<td class="left">
<?php echo mktext('subtitle', 60, 128, $survey); ?><br />
<?php echo(_('Subtitle of this survey.') .' '.
@@ -94,7 +94,7 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Additional Info'));
?></strong></td>
+ <td class="right"><strong><label for="info"><?php echo(_('Additional
Info')); ?></label></strong></td>
<td class="left">
<?php echo mktextarea('info', 5, 60, 'virtual', $survey); ?><br />
<?php echo(_('Text to be displayed on this survey before any fields.
@@ -103,16 +103,16 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Confirmation Page'));
?></strong></td>
+ <td class="right"><strong><label for="thanks_page"><?php
echo(_('Confirmation Page')); ?></label></strong></td>
<td class="left">
<?php echo mktext('thanks_page', 60, 255, $survey) .' '.
_('(URL)'); ?><br />
<?php echo(_('The URL to which a user is redirected after completing
this survey.')); ?>
<br /><strong><?php echo(_('OR')); ?></strong><br />
<?php echo mktext('thank_head', 30, 0, $survey) .' '.
- _('(heading text)'); ?><br />
+ _('<label for="thank_head">(heading
text)</label>'); ?><br />
<?php echo mktextarea('thank_body', 5, 60, 'virtual', $survey) .
- ' ' . _('(body text)'); ?><br />
+ ' ' . _('<label for="thank_body">(body
text)</label>'); ?><br />
<?php echo(_('Heading (in bold) and body text for the
"Confirmation" page
displayed after a user completes this survey.')); ?>
<?php echo(_('(URL, if present, takes precedent over confirmation
text.)')); ?>
@@ -120,14 +120,14 @@
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Email')); ?></strong></td>
+ <td class="right"><strong><label for="email"><?php echo(_('Email'));
?></label></strong></td>
<td class="left">
<?php echo mktext('email', 30, 0, $survey); ?><br />
<?php echo(_('Sends a copy of each submission to address (or leave
blank for no email backup).')); ?></td>
</tr>
<tr><td colspan="2"><hr class="line1" /></td></tr>
<tr style="vertical-align: top">
- <td class="right"><strong><?php echo(_('Theme')); ?></strong></td>
+ <td class="right"><strong><label for="theme"><?php echo(_('Theme'));
?></label></strong></td>
<td class="left"><?php
$themes_array = array();
$dir = dir($ESPCONFIG['css_path']);
Index: include/tab/order.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/tab/order.inc,v
retrieving revision 1.22
diff -a -u -r1.22 order.inc
--- include/tab/order.inc 8 Aug 2005 13:39:53 -0000 1.22
+++ include/tab/order.inc 13 Jul 2006 15:18:51 -0000
@@ -15,9 +15,9 @@
$result = execute_sql($sql);
$max = record_count($result);
?>
-<?php echo(_('Change the order that questions are
+<label for="questions"><?php echo(_('Change the order that questions are
presented by selecting a question from the list, then use the up/down
-buttons to change its position.')); ?>
+buttons to change its position.')); ?></label>
<hr>
<script type="text/javascript">
<!-- // comment
Index: include/tab/questions.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/tab/questions.inc,v
retrieving revision 1.27
diff -a -u -r1.27 questions.inc
--- include/tab/questions.inc 2 Sep 2005 19:25:04 -0000 1.27
+++ include/tab/questions.inc 13 Jul 2006 15:18:51 -0000
@@ -100,11 +100,11 @@
<table>
<tr>
<th> </th>
- <th><?php echo(_('Question Name')); ?></th>
- <th><?php echo(_('Type')); ?></th>
- <th><?php echo(_('Length')); ?></th>
- <th><?php echo(_('Precision')); ?></th>
- <th><?php echo(_('Required')); ?>?</th>
+ <th><label for="name"><?php echo(_('Question Name')); ?></label></th>
+ <th><label for="type_id"><?php echo(_('Type')); ?></label></th>
+ <th><label for="length"><?php echo(_('Length')); ?></label></th>
+ <th><label for="precise"><?php echo(_('Precision')); ?></label></th>
+ <th><label for="required"><?php echo(_('Required')); ?>?</label></th>
</tr><tr>
<td> </td>
<td><?php echo(mktext('name',12)); ?></td>
@@ -135,7 +135,7 @@
))); ?></td>
</tr>
<tr>
- <th>Text</th>
+ <th><label for="content">Text</label></th>
<td colspan="5"><?php
echo(mktextarea("content",4,60,"VIRTUAL"));
?></td>
Index: include/tab/questions_options.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/tab/questions_options.inc,v
retrieving revision 1.16
diff -a -u -r1.16 questions_options.inc
--- include/tab/questions_options.inc 1 Aug 2005 16:12:54 -0000 1.16
+++ include/tab/questions_options.inc 13 Jul 2006 15:18:51 -0000
@@ -56,7 +56,7 @@
}
?>
<tr>
- <td class="numbered"><?php echo($i); ?>.</td>
+ <td class="numbered"><label for="choice_id_<?php echo($i); ?>"><?php
echo($i); ?>.</label></td>
<td class="left">
<input type="hidden" name="choice_id_<?php echo($i); ?>"
value="<?php if(isset($choice_id)) echo($choice_id); ?>" />
Index: include/where/access.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/access.inc,v
retrieving revision 1.17
diff -a -u -r1.17 access.inc
--- include/where/access.inc 1 Aug 2005 16:12:54 -0000 1.17
+++ include/where/access.inc 13 Jul 2006 15:18:51 -0000
@@ -105,7 +105,7 @@
else
$public = _('Public');
- $r = '<select name="realm"><option></option>';
+ $r = '<select name="realm">';
$groups = array();
$selected_groups = array();
// if realm has already been added then do not include it for
@@ -141,6 +141,7 @@
$r .= '</select>';
}
?>
+<div>
<h2><?php echo(_('Survey Access')); ?></h2>
<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
Index: include/where/admdesigner.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/admdesigner.inc,v
retrieving revision 1.14
diff -a -u -r1.14 admdesigner.inc
--- include/where/admdesigner.inc 24 Apr 2006 19:41:41 -0000 1.14
+++ include/where/admdesigner.inc 13 Jul 2006 15:18:51 -0000
@@ -205,6 +205,7 @@
}
?>
+<div>
<h2><?php echo(_('Designer Account Administration')); ?></h2>
<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
<input type="hidden" name="where" value="admdesigner" />
@@ -227,7 +228,7 @@
<?php
echo("<th class=\"right\">". _('Group') ."</th>\n");
if(empty($r)) {
- $r = '<select name="r"><option></option>';
+ $r = '<select name="r">';
$groups = array();
if($_SESSION['acl']['superuser'] == 'Y') {
$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
Index: include/where/admrespondent.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/admrespondent.inc,v
retrieving revision 1.13
diff -a -u -r1.13 admrespondent.inc
--- include/where/admrespondent.inc 24 Apr 2006 19:41:41 -0000 1.13
+++ include/where/admrespondent.inc 13 Jul 2006 15:18:51 -0000
@@ -180,6 +180,7 @@
}
?>
+<div>
<h2><?php echo(_('Respondent Account Administration')); ?></h2>
<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
<input type="hidden" name="where" value="admrespondent" />
@@ -202,7 +203,7 @@
<?php
echo("<th class=\"right\">". _('Group') ."</th>\n");
if(empty($r)) {
- $r = '<select name="r"><option></option>';
+ $r = '<select name="r">';
$groups = array();
if($_SESSION['acl']['superuser'] == 'Y') {
$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
Index: include/where/copy.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/copy.inc,v
retrieving revision 1.17
diff -a -u -r1.17 copy.inc
--- include/where/copy.inc 1 Aug 2005 16:12:55 -0000 1.17
+++ include/where/copy.inc 13 Jul 2006 15:18:51 -0000
@@ -57,6 +57,7 @@
$bg = '';
?>
+<div>
<h2><?php echo(_('Copy Survey')); ?></h2>
<?php echo(
_('Choose a survey of which to make a copy. The copy will have the same
Index: include/where/designers.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/designers.inc,v
retrieving revision 1.10
diff -a -u -r1.10 designers.inc
--- include/where/designers.inc 1 Aug 2005 16:12:55 -0000 1.10
+++ include/where/designers.inc 13 Jul 2006 15:18:51 -0000
@@ -87,6 +87,7 @@
$bg = $ESPCONFIG['bgalt_color2'];
?>
+<div>
<h2><?php echo(_('Manage Web Form Designer Accounts')); ?></h2>
<p><?php echo(_('Click on a username to edit, or click on add new user
below.')); ?></p>
<table cellspacing="0" cellpadding="4" style="width: 550px;">
Index: include/where/edit.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/edit.inc,v
retrieving revision 1.12
diff -a -u -r1.12 edit.inc
--- include/where/edit.inc 1 Aug 2005 16:12:55 -0000 1.12
+++ include/where/edit.inc 13 Jul 2006 15:18:51 -0000
@@ -28,6 +28,7 @@
$result = execute_sql($sql);
?>
+<div>
<h2><?php echo(_('Edit a Survey')); ?></h2>
<?php echo(_('Pick Survey to Edit')); ?>
<table cellspacing="0" cellpadding="4">
Index: include/where/export.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/export.inc,v
retrieving revision 1.20
diff -a -u -r1.20 export.inc
--- include/where/export.inc 27 Mar 2006 23:10:41 -0000 1.20
+++ include/where/export.inc 13 Jul 2006 15:18:51 -0000
@@ -16,7 +16,6 @@
$bg = '';
?>
-</div>
</form>
<div class="contents">
<h2><?php echo(_('Export Data')); ?></h2>
@@ -94,10 +93,10 @@
<input type="hidden" name="sid" value="<?php echo($sid) ?>" />
<input type="hidden" name="where" value="" />
<div class="exportsave">
- <?php echo('<a href="javascript: exportSubmit(\'export\',
document.getElementById(\'export'.$sid.'\'));" title="Save the results
for \''.$name.'\' to the survey in CSV Format (Comma Delimted File).
Column Titles are based on question text.">' . _('Save On Server') .
'</a>');
+ <?php echo('<a
href="javascript:exportSubmit(\'export\',document.getElementById(\'export'.$sid.'\'));"
title="Save the results for \''.$name.'\' to the survey in CSV Format
(Comma Delimted File). Column Titles are based on question text.">' .
_('Save On Server') . '</a>');
echo("\n");?>
| <?php
- echo('<a href="javascript: exportSubmit(\'download\',
document.getElementById(\'export'.$sid.'\'));" title="Download the
results for \''.$name.'\' to your computer in CSV Format (Comma Delimted
File). Column Titles are based on the question text. Click this link and
select \'Save\' when prompted by your browser.">' . _('Download') .
'</a>'); ?>
+ echo('<a
href="javascript:exportSubmit(\'download\',document.getElementById(\'export'.$sid.'\'));"
title="Download the results for \''.$name.'\' to your computer in CSV
Format (Comma Delimted File). Column Titles are based on the question
text. Click this link and select \'Save\' when prompted by your
browser.">' . _('Download') . '</a>'); ?>
</div>
</div></form>
</td>
Index: include/where/groups.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/groups.inc,v
retrieving revision 1.10
diff -a -u -r1.10 groups.inc
--- include/where/groups.inc 1 Aug 2005 16:12:55 -0000 1.10
+++ include/where/groups.inc 13 Jul 2006 15:18:51 -0000
@@ -45,6 +45,7 @@
$i = 0;
$bg = $ESPCONFIG['bgalt_color2'];
?>
+<div>
<h2><?php echo(_('Manage Groups')); ?></h2>
<?php if(!empty($errstr)) echo('<p>'. mkerror($errstr) ."</p>\n"); ?>
<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME']
."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: include/where/guide.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/guide.inc,v
retrieving revision 1.5
diff -a -u -r1.5 guide.inc
--- include/where/guide.inc 14 Apr 2005 17:51:21 -0000 1.5
+++ include/where/guide.inc 13 Jul 2006 15:18:51 -0000
@@ -9,6 +9,7 @@
// <jf...@al...>
?>
+<div>
<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME']
."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
<?php if (file_exists(ESP_BASE . '/docs/GUIDE')) { ?>
<table><tr><td><pre>
Index: include/where/help.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/help.inc,v
retrieving revision 1.18
diff -a -u -r1.18 help.inc
--- include/where/help.inc 14 Sep 2005 02:03:53 -0000 1.18
+++ include/where/help.inc 13 Jul 2006 15:18:51 -0000
@@ -8,7 +8,7 @@
// Modified by Aaron Axelsen
// <axe...@am...>
?>
-
+<div>
<table class="help">
<tr>
<td colspan="2" style="border-bottom:1px dashed #000000"><h1>Survey
Resource</h1></td>
@@ -145,7 +145,6 @@
</p>
<div style="text-align: center"> <tt>!other=prompt text</tt>
</div>
<p>Add more questions by clicking the <strong>New
Question</strong> button. Edit/View existing questions by clicking the
question numbers at the top of the form. </p>
- <p> </p>
<p>Click continue, or click the <strong>Questions</strong>
tab at the top to proceed to the questions section.</p>
</li>
</ul>
@@ -337,7 +336,6 @@
<dl>
<dd>
<select>
- <option></option>
<option>Option 1</option>
<option>Option 2</option>
</select>
Index: include/where/manage.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/manage.inc,v
retrieving revision 1.28
diff -a -u -r1.28 manage.inc
--- include/where/manage.inc 27 Oct 2005 18:58:19 -0000 1.28
+++ include/where/manage.inc 13 Jul 2006 15:18:51 -0000
@@ -11,6 +11,7 @@
$base =& $GLOBALS['ESPCONFIG']['ME'];
?>
+<div>
<h2><?php echo(_('Management Interface')); ?></h2>
<p><?php
if($GLOBALS['ESPCONFIG']['auth_design']) {
Index: include/where/passwd.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/passwd.inc,v
retrieving revision 1.7
diff -a -u -r1.7 passwd.inc
--- include/where/passwd.inc 1 Aug 2005 16:12:55 -0000 1.7
+++ include/where/passwd.inc 13 Jul 2006 15:18:51 -0000
@@ -10,6 +10,7 @@
/* ACL: everyone is allowed to change her own password */
?>
+<div>
<h2><?php echo(_('Change Password')); ?></h2>
<?php
if(isset($_POST['newpass1']) &&
Index: include/where/report.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/report.inc,v
retrieving revision 1.15
diff -a -u -r1.15 report.inc
--- include/where/report.inc 1 Aug 2005 16:12:55 -0000 1.15
+++ include/where/report.inc 13 Jul 2006 15:18:51 -0000
@@ -25,6 +25,7 @@
return;
}
?>
+<div>
<table cellspacing="0" cellpadding="4">
<tr><td>
<?php
@@ -34,7 +35,7 @@
?>
</td></tr>
</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME']
."?where=report\">" . _('Go back to Report Menu') . "</a>\n"); ?><br>
+<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME']
."?where=report\">" . _('Go back to Report Menu') . "</a>\n"); ?><br/>
<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME']
."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
<?php
return;
@@ -62,6 +63,7 @@
$result = execute_sql($sql);
?>
+<div>
<h2><?php echo(_('View Form Report')); ?></h2>
<?php echo(_('Pick Form to View')); ?>
<table cellspacing="0" cellpadding="4">
Index: include/where/respondents.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/respondents.inc,v
retrieving revision 1.10
diff -a -u -r1.10 respondents.inc
--- include/where/respondents.inc 1 Aug 2005 16:12:55 -0000 1.10
+++ include/where/respondents.inc 13 Jul 2006 15:18:51 -0000
@@ -86,6 +86,7 @@
$bg = $ESPCONFIG['bgalt_color2'];
?>
+<div>
<h2><?php echo(_('Manage Respondent Accounts')); ?></h2>
<p><?php echo(_('Click on a username to edit, or click on add new user
below.')); ?></p>
<table cellspacing="0" cellpadding="4" style="width: 550px;">
Index: include/where/results.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/results.inc,v
retrieving revision 1.33
diff -a -u -r1.33 results.inc
--- include/where/results.inc 18 Nov 2005 15:23:41 -0000 1.33
+++ include/where/results.inc 13 Jul 2006 15:18:51 -0000
@@ -49,6 +49,7 @@
}
}
?>
+ <div>
<font size="+2">
<a href="<?php echo($GLOBALS['ESPCONFIG']['ME']."?where=help"); ?>"
target="_blank">Help</a>
</font>
@@ -145,6 +146,7 @@
if (empty($_GET['type'])) {
?>
+ <div>
<h2><?php echo(_('View Survey Results')); ?></h2>
<?php echo(_('Pick Survey to View')); ?>
@@ -153,7 +155,7 @@
<input type="hidden" name="where" value="results" />
<?php
} else {
- echo('<h2>'. _('Cross Tabulation') ."</h2>\n");
+ echo('<div> <!-- this is where it should be --><h2>'. _('Cross
Tabulation') ."</h2>\n");
echo(_('Pick Survey to Cross Tabulate'));
}
?>
@@ -207,7 +209,6 @@
if (empty($_GET['type'])) {
?>
<select name="rid<?php echo $count; ?>"
onchange="javascript:this.form.rid.value=this.form.rid<?php echo $count;
?>.options[this.form.rid<?php echo $count; ?>.selectedIndex].value;
this.form.sid.value=<?php echo $sid; ?>; this.form.submit(); return false;">
- <option value=""></option>
<?php
$i = 0;
while (list($rid) = fetch_row($rid_result)) {
Index: include/where/status.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/status.inc,v
retrieving revision 1.24
diff -a -u -r1.24 status.inc
--- include/where/status.inc 26 Oct 2005 20:47:33 -0000 1.24
+++ include/where/status.inc 13 Jul 2006 15:18:51 -0000
@@ -108,6 +108,7 @@
}
}
?>
+<div>
<h2><?php echo(_('Survey Status')); ?></h2>
<div style="text-align: left">
Index: include/where/tab.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/tab.inc,v
retrieving revision 1.17
diff -a -u -r1.17 tab.inc
--- include/where/tab.inc 26 Oct 2005 20:47:33 -0000 1.17
+++ include/where/tab.inc 13 Jul 2006 15:18:51 -0000
@@ -138,7 +138,6 @@
$errstr = '';
$updated =
survey_update($_SESSION['survey_id'],$tab,$_SESSION['last_tab']);
?>
-</div>
</form>
<form method="post" id="tabs" onsubmit="validate();" action="<?php
echo($GLOBALS['ESPCONFIG']['ME']); ?>">
<div>
Index: include/where/upload.inc
===================================================================
RCS file: /cvsroot/phpesp/phpESP/admin/include/where/upload.inc,v
retrieving revision 1.14
diff -a -u -r1.14 upload.inc
--- include/where/upload.inc 26 Oct 2005 20:47:33 -0000 1.14
+++ include/where/upload.inc 13 Jul 2006 15:18:52 -0000
@@ -32,7 +32,7 @@
// End the included form so we can do a multipart/form-data form
?>
-</div>
+<div><!-- something needs to be done about this div --></div>
</form>
<?php
if(isset($_POST['submit'])) {
|
