Menu
▾
▴
[Stack-cvs] stack-1-0/scripts stackAuthor.php,1.22.2.4,1.22.2.5 stackDatabase.php,1.16.2.6,1.16.2.7 stackQuestion.php,1.19.2.2,1.19.2.3 stackUser.php,1.8,1.8.4.1 stackUtility.php,1.22.2.1,1.22.2.2 en.php,1.3.2.3,NONE nl.php,1.2,NONE
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27637/scripts Modified Files: Tag: frontend_dev stackAuthor.php stackDatabase.php stackQuestion.php stackUser.php stackUtility.php Removed Files: Tag: frontend_dev en.php nl.php Log Message: Index: stackDatabase.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v retrieving revision 1.16.2.6 retrieving revision 1.16.2.7 diff -C2 -d -r1.16.2.6 -r1.16.2.7 *** stackDatabase.php 17 Jun 2005 10:54:52 -0000 1.16.2.6 --- stackDatabase.php 18 Jun 2005 09:54:13 -0000 1.16.2.7 *************** *** 150,154 **** echo "<th></th><th><input type='text' name='bank_filter[name]' value='$filter_name' /> </th> <th> <input type='text' name='bank_filter[kw]' value='$filter_kw' /> ! </th></tr></thead><tbody>"; } for ($i = 0; $i < mysql_num_rows($result); $i++) { --- 150,154 ---- echo "<th></th><th><input type='text' name='bank_filter[name]' value='$filter_name' /> </th> <th> <input type='text' name='bank_filter[kw]' value='$filter_kw' /> ! </th> </tr></thead><tbody>"; } for ($i = 0; $i < mysql_num_rows($result); $i++) { --- en.php DELETED --- Index: stackUtility.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackUtility.php,v retrieving revision 1.22.2.1 retrieving revision 1.22.2.2 diff -C2 -d -r1.22.2.1 -r1.22.2.2 *** stackUtility.php 13 Jun 2005 16:34:21 -0000 1.22.2.1 --- stackUtility.php 18 Jun 2005 09:54:13 -0000 1.22.2.2 *************** *** 14,17 **** --- 14,18 ---- } require_once("{$stack_root}/scripts/stackQuiz.php"); + require_once("{$stack_root}/frontend_general/frontend_util.php"); /** *************** *** 159,162 **** --- 160,165 ---- return $ret; } + + // ********************************************************** Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.19.2.2 retrieving revision 1.19.2.3 diff -C2 -d -r1.19.2.2 -r1.19.2.3 *** stackQuestion.php 17 Jun 2005 13:16:41 -0000 1.19.2.2 --- stackQuestion.php 18 Jun 2005 09:54:13 -0000 1.19.2.3 *************** *** 1019,1032 **** $err_when_inst = "<br /><font color=\"red\">CAS ERROR when instantiated!</font> "; foreach($stackQuestion as $qfield => $val) { if ('castext' == $stackQuestion[$qfield]['type'] and array_key_exists($qfield,$question)) { $errct = ''; ! if (array_key_exists($options, 'Display')) { ! $displayed = $options['Display']; ! $questionInst["{$qfield}Inst"]= stack_castext_to_display($question["{$qfield}Inst"], $imp_locs_Inst, $displayed , $errct); ! } else { ! echo "Error - Display not set in options variable"; ! } ! if (''!=$errct) { // We have some errors! $errors[$qfield]=$err_when_inst.$errct; } --- 1019,1029 ---- $err_when_inst = "<br /><font color=\"red\">CAS ERROR when instantiated!</font> "; + $displayed = $options['Display']; + foreach($stackQuestion as $qfield => $val) { if ('castext' == $stackQuestion[$qfield]['type'] and array_key_exists($qfield,$question)) { $errct = ''; ! $questionInst["{$qfield}Inst"] = stack_castext_to_display($question["{$qfield}Inst"], $imp_locs_Inst, $displayed , $errct); ! if ('' != $errct) { // We have some errors! $errors[$qfield]=$err_when_inst.$errct; } *************** *** 1743,1747 **** $RawAns = $this_attempt['RawAns']; - // (2) Pose the ``question" stack_question_inst_displayq($questionInst); --- 1740,1743 ---- --- nl.php DELETED --- Index: stackUser.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackUser.php,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** stackUser.php 8 Jun 2005 08:31:18 -0000 1.8 --- stackUser.php 18 Jun 2005 09:54:13 -0000 1.8.4.1 *************** *** 210,212 **** --- 210,214 ---- + + ?> Index: stackAuthor.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackAuthor.php,v retrieving revision 1.22.2.4 retrieving revision 1.22.2.5 diff -C2 -d -r1.22.2.4 -r1.22.2.5 *** stackAuthor.php 17 Jun 2005 10:54:52 -0000 1.22.2.4 --- stackAuthor.php 18 Jun 2005 09:54:13 -0000 1.22.2.5 *************** *** 192,201 **** // Buttons to go somewhere next if ($stack_stand_alone) { if (''==$errors) { ! echo "<a href=\"javascript:EditQ('preview')\">Preview Question</a> \n"; ! echo "<a href=\"javascript:EditQ('export_xml')\">Export Question</a> \n"; if ('admin'==$user['username']) { ! echo "<a href=\"javascript:EditQ('save')\">Save Question</a>\n ! <a href=\"javascript:EditQ('save_as')\">Save Question As...</a>\n"; } } --- 192,202 ---- // Buttons to go somewhere next if ($stack_stand_alone) { + echo "<a href=\"javascript:EditQ('edit')\">Edit question</a> \n"; if (''==$errors) { ! echo "<a href=\"javascript:EditQ('preview')\">Try question</a> \n"; ! echo "<a href=\"javascript:EditQ('export_xml')\">Export as XML</a> \n"; if ('admin'==$user['username']) { ! echo "<a href=\"javascript:EditQ('save')\">Store question</a>\n ! <a href=\"javascript:EditQ('save_as')\">Store as a new question </a>\n"; } } *************** *** 270,276 **** // Potential responses ! echo "<br /><a href=\"javascript:EditQ('edit')\">Add</a>\n"; echo '<input type="input" name="questionPotResp[add]" value="0" size="3" />'; ! echo " potential responses<a href=\"javascript:HelpPopup('all','stackQuestionPotResp');\"><img align=\"middle\" border=\"0\" height=\"17\" width=\"17\" src=\"pics/help.gif\" /></a> (distractors etc).<br />"; if (array_key_exists('questionPotResp',$question)) { --- 271,277 ---- // Potential responses ! echo "<br /><a href=\"javascript:EditQ('edit')\">Edit</a> and add \n"; echo '<input type="input" name="questionPotResp[add]" value="0" size="3" />'; ! echo " potential responses<a href=\"javascript:HelpPopup('all','author_potresp');\"><img align=\"middle\" border=\"0\" height=\"17\" width=\"17\" src=\"pics/help.gif\" /></a> (distractors etc).<br />"; if (array_key_exists('questionPotResp',$question)) { *************** *** 319,324 **** echo "<p><a href=\"javascript:EditQ('edit')\">Edit question</a> \n"; if (''==$errors) { ! echo "<a href=\"javascript:EditQ('preveiw')\">Try this question</a> \n"; ! echo "<a href=\"javascript:EditQ('export_xml')\">Export XML</a> \n"; if ('admin'==$user['username']) { echo "<a href=\"javascript:EditQ('save')\">Store question</a>\n --- 320,325 ---- echo "<p><a href=\"javascript:EditQ('edit')\">Edit question</a> \n"; if (''==$errors) { ! echo "<a href=\"javascript:EditQ('preveiw')\">Try question</a> \n"; ! echo "<a href=\"javascript:EditQ('export_xml')\">Export as XML</a> \n"; if ('admin'==$user['username']) { echo "<a href=\"javascript:EditQ('save')\">Store question</a>\n |
