Menu
▾
▴
[Stack-cvs] stack-1-0/scripts stackAuthor.php,1.42,1.43 stackDatabase.php,1.46,1.47 stackQuiz.php,1.12,1.13
|
From: Chris S. <san...@us...> - 2005-09-05 13:41:04
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16737/scripts Modified Files: stackAuthor.php stackDatabase.php stackQuiz.php Log Message: Index: stackQuiz.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuiz.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** stackQuiz.php 4 Sep 2005 21:26:18 -0000 1.12 --- stackQuiz.php 5 Sep 2005 13:40:56 -0000 1.13 *************** *** 207,210 **** --- 207,211 ---- echo "\n<table cellpadding='2'>\n"; echo "\n<tr><th>{$stackQuiz['quizName']['descript']}</th><th>{$stackQuiz['quizDescription']['descript']}</th><th>Last mark (%)</th><th>{$stackQuiz['quizDueDate']['descript']}</th></tr>"; + foreach ($quiz_store as $qs => $quiz) { $qname = $quiz['quizName']; *************** *** 222,234 **** } if ($review) { $uID = $user['id']; ! echo "<tr><td><a href=\"javascript:quizreview('$uID','$qID','$subjectID');\">{$qname}</a></td>\n"; } else { ! echo "<tr><td><a href=\"javascript:takeaction('continue_quiz','$qID');\">{$qname}</a></td>\n"; } ! echo "<td>".$quiz['quizDescription']."</td><td align='center'>$mark</td>\n"; if ('' != $quiz['quizDueDate']) { ! echo "<td>".stack_time_display($quiz['quizDueDate'])."</td>"; } echo "</tr>\n"; --- 223,236 ---- } + echo "<tr>\n"; if ($review) { $uID = $user['id']; ! echo " <td><a href=\"javascript:quizreview('$uID','$qID','$subjectID');\">{$qname}</a></td>\n"; } else { ! echo " <td><a href=\"javascript:takeaction('continue_quiz','$qID');\">{$qname}</a></td>\n"; } ! echo ' <td>'.$quiz['quizDescription']."</td>\n <td align='center'>$mark</td>\n"; if ('' != $quiz['quizDueDate']) { ! echo ' <td>'.stack_time_display($quiz['quizDueDate'])."</td>\n"; } echo "</tr>\n"; Index: stackDatabase.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** stackDatabase.php 5 Sep 2005 13:26:22 -0000 1.46 --- stackDatabase.php 5 Sep 2005 13:40:56 -0000 1.47 *************** *** 198,206 **** // Display each row of the table if ('edit_metadata' != $action) { ! if ($trcol) { ! echo "\n<tr bgcolor='#DDDDDD'>\n"; ! } else { ! echo "\n<tr bgcolor='#DDDDFF'>\n"; ! } echo(" <td><input type='checkbox' name='checked[{$row[0]}]' value='ticked' /></td>\n"); echo(' <td>' . $row[0] . "</td>\n"); --- 198,202 ---- // Display each row of the table if ('edit_metadata' != $action) { ! if ($trcol) { echo "\n<tr bgcolor='#DDDDDD'>\n"; } else { echo "\n<tr bgcolor='#DDDDFF'>\n"; } echo(" <td><input type='checkbox' name='checked[{$row[0]}]' value='ticked' /></td>\n"); echo(' <td>' . $row[0] . "</td>\n"); *************** *** 221,229 **** // Descriptions on a new line. if ($filter['show_descript']) { ! if ($trcol) { ! echo "\n<tr bgcolor='#DDDDDD'>\n"; ! } else { ! echo "\n<tr bgcolor='#DDDDFF'>\n"; ! } echo "<td></td>\n"; echo " <td colspan='3'><font size='1'>".stripslashes($row[2])."</font></td>\n"; --- 217,221 ---- // Descriptions on a new line. if ($filter['show_descript']) { ! if ($trcol) { echo "\n<tr bgcolor='#DDDDDD'>\n"; } else { echo "\n<tr bgcolor='#DDDDFF'>\n"; } echo "<td></td>\n"; echo " <td colspan='3'><font size='1'>".stripslashes($row[2])."</font></td>\n"; *************** *** 1650,1654 **** for ($i = 0; $i < mysql_num_rows($result); $i++) { $row = mysql_fetch_row($result); ! $usages .= ' '.$row[0]; } } else { --- 1642,1647 ---- for ($i = 0; $i < mysql_num_rows($result); $i++) { $row = mysql_fetch_row($result); ! $quiz = stack_db_quiz_get($row[0],FALSE); ! $usages .= '<br /> ('.$row[0].') '.$quiz['quizName']; } } else { Index: stackAuthor.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackAuthor.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** stackAuthor.php 5 Sep 2005 08:52:21 -0000 1.42 --- stackAuthor.php 5 Sep 2005 13:40:56 -0000 1.43 *************** *** 847,851 **** --- 847,853 ---- echo "\n<table>\n"; echo "<tr><th>Drop</th><th>Order</th><th>Question no.</th><th>Name</th> <th>Key words</th></tr>\n"; + $trcol = FALSE; foreach ($quiz['questions'] as $qn => $qu) { + $trcol = !$trcol; $qID = $qu['questionID']; $qo = nsf($qu,'order'); *************** *** 860,867 **** $qkw = ''; } ! echo "<tr><td><input type=\"checkbox\" name=\"quiz[questions][$qn][drop]\" value=\"ticked\" /></td>\n"; ! echo "<td><input type=\"text\" name=\"quiz[questions][$qn][order]\" size=\"3\" value=\"{$qo}\" /></td>\n"; ! echo "<td><input type=\"hidden\" name=\"quiz[questions][$qn][questionID]\" value=\"{$qID}\" />$qID</td>"; ! echo "<td>$qname</td><td>$qkw</td> </tr>\n"; } --- 862,870 ---- $qkw = ''; } ! if ($trcol) { echo "\n<tr bgcolor='#DDDDDD'>\n"; } else { echo "\n<tr bgcolor='#DDDDFF'>\n"; } ! echo " <td><input type=\"checkbox\" name=\"quiz[questions][$qn][drop]\" value=\"ticked\" /></td>\n"; ! echo " <td><input type=\"text\" name=\"quiz[questions][$qn][order]\" size=\"3\" value=\"{$qo}\" /></td>\n"; ! echo " <td><input type=\"hidden\" name=\"quiz[questions][$qn][questionID]\" value=\"{$qID}\" />$qID</td>"; ! echo " <td>$qname</td><td>$qkw</td> </tr>\n"; } *************** *** 1264,1268 **** --- 1267,1273 ---- echo "\n<table>\n"; echo "<tr>\n <th>Drop</th>\n <th>Order</th>\n <th>Quiz no.</th><th>Name</th><th></th>\n</tr>\n"; + $trcol = FALSE; foreach ($subject['quizzes'] as $qn => $qu) { + $trcol = !$trcol; $qID = $qu['quizid']; $qo = nsf($qu,'order'); *************** *** 1277,1281 **** $qkw = ''; } ! echo "<tr>\n <td><input type=\"checkbox\" name=\"subject[quizzes][$qn][drop]\" value=\"ticked\" /></td>\n"; echo " <td><input type=\"text\" name=\"subject[quizzes][$qn][order]\" size=\"3\" value=\"{$qo}\" /></td>\n"; echo " <td><input type=\"hidden\" name=\"subject[quizzes][$qn][quizid]\" value=\"{$qID}\" />$qID</td>\n"; --- 1282,1287 ---- $qkw = ''; } ! if ($trcol) { echo "\n<tr bgcolor='#DDDDDD'>\n"; } else { echo "\n<tr bgcolor='#DDDDFF'>\n"; } ! echo " <td><input type=\"checkbox\" name=\"subject[quizzes][$qn][drop]\" value=\"ticked\" /></td>\n"; echo " <td><input type=\"text\" name=\"subject[quizzes][$qn][order]\" size=\"3\" value=\"{$qo}\" /></td>\n"; echo " <td><input type=\"hidden\" name=\"subject[quizzes][$qn][quizid]\" value=\"{$qID}\" />$qID</td>\n"; *************** *** 1535,1539 **** global $stackSubject; ! echo "\n<table cellpadding='2' border='1'>\n"; echo "\n<tr>\n"; echo " <th>{$stackSubject['subjectOrder']['descript']}</th>\n <th>ID</th>\n"; --- 1541,1545 ---- global $stackSubject; ! echo "\n<table cellpadding='1'>\n"; echo "\n<tr>\n"; echo " <th>{$stackSubject['subjectOrder']['descript']}</th>\n <th>ID</th>\n"; *************** *** 1542,1546 **** --- 1548,1554 ---- echo " <th>{$stackSubject['subjectDescription']['descript']}</th>\n</tr>\n"; + $trcol = FALSE; foreach ($subject_store as $key => $subject) { + $trcol = !$trcol; $sID = $subject['subjectID']; $so = nsf($subject,'subjectOrder'); *************** *** 1553,1557 **** } ! echo "<tr>\n"; echo " <td><input type=\"text\" name=\"zone[subjectOrder][$key][order]\" size=\"3\" value=\"{$so}\" />\n"; echo " <input type=\"hidden\" name=\"zone[subjectOrder][$key][subjectID]\" size=\"3\" value=\"{$sID}\" /></td>\n"; --- 1561,1565 ---- } ! if ($trcol) { echo "\n<tr bgcolor='#DDDDDD'>\n"; } else { echo "\n<tr bgcolor='#DDDDFF'>\n"; } echo " <td><input type=\"text\" name=\"zone[subjectOrder][$key][order]\" size=\"3\" value=\"{$so}\" />\n"; echo " <input type=\"hidden\" name=\"zone[subjectOrder][$key][subjectID]\" size=\"3\" value=\"{$sID}\" /></td>\n"; |
