From: Chris S. <san...@us...> - 2009-10-30 18:03:57
|
Update of /cvsroot/stack/stack-dev/lib/ui In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31648/lib/ui Modified Files: DisplayItem.php Log Message: Index: DisplayItem.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/DisplayItem.php,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** DisplayItem.php 28 Oct 2009 14:03:17 -0000 1.90 --- DisplayItem.php 30 Oct 2009 18:03:45 -0000 1.91 *************** *** 391,395 **** $all_elements_at_score_WS = false; $disp = $IE->getDisplayValue(); - $feedback = $IE->getFeedback(); $full = '<div class="InteractionElementFeedback">'; $full .= '<p class="studentFeedback">'.get_string('stackQuestionDisplay_yourLastAnswer','stack',''); --- 391,394 ---- *************** *** 397,401 **** $full .= $disp.'</p>'; //$full .= " #$label# ".'<span class="feedback">'.$feedback.'</span>'; ! $full .= '<span class="feedback">'.$feedback.'</span>'; $full .= "</div>\n\n"; --- 396,403 ---- $full .= $disp.'</p>'; //$full .= " #$label# ".'<span class="feedback">'.$feedback.'</span>'; ! $feedback = $IE->getFeedback(); ! if (''!=$feedback) { ! $full .= '<span class="feedback">'.$feedback.'</span>'; ! } $full .= "</div>\n\n"; *************** *** 410,414 **** $full .= '<span class="icon"> <img src="'.$config->get('weburl').'/pix/'.get_string('stackIcon_invalid','stack','').'" alt="'.get_string('stackIcon_invalid_alt','stack','').'" width="40" height="36" /> </span>'; $feedback = $IE->getFeedback(); ! $full .= '<span class="feedback">'.$feedback.' </span>'; //$full .= '<p class="studentFeedback">'.get_string('stackQuestionDisplay_yourLastAnswer','stack','').'</p>'; --- 412,418 ---- $full .= '<span class="icon"> <img src="'.$config->get('weburl').'/pix/'.get_string('stackIcon_invalid','stack','').'" alt="'.get_string('stackIcon_invalid_alt','stack','').'" width="40" height="36" /> </span>'; $feedback = $IE->getFeedback(); ! if (''!=$feedback) { ! $full .= '<span class="feedback">'.$feedback.'</span>'; ! } //$full .= '<p class="studentFeedback">'.get_string('stackQuestionDisplay_yourLastAnswer','stack','').'</p>'; *************** *** 424,433 **** case 'score': $disp = $IE->getDisplayValue(); - $feedback = $IE->getFeedback(); $full = '<div class="InteractionElementFeedback">'; $full .= '<p class="studentFeedback">'.get_string('stackQuestionDisplay_yourLastAnswer','stack',''); //$full .= '<span class="icon"> <img src="'.$config->get('weburl').'/pix/'.get_string('stackIcon_valid','stack','').'" alt="'.get_string('stackIcon_valid_alt','stack','').'" /> </span>'; $full .= $disp.'</p>'; ! $full .= '<span class="feedback">'.$feedback.'</span>'; $full .= "</div>\n\n"; $xhtml = str_replace("<IEfeedback>$label</IEfeedback>", $full, $xhtml); --- 428,438 ---- case 'score': $disp = $IE->getDisplayValue(); $full = '<div class="InteractionElementFeedback">'; $full .= '<p class="studentFeedback">'.get_string('stackQuestionDisplay_yourLastAnswer','stack',''); //$full .= '<span class="icon"> <img src="'.$config->get('weburl').'/pix/'.get_string('stackIcon_valid','stack','').'" alt="'.get_string('stackIcon_valid_alt','stack','').'" /> </span>'; $full .= $disp.'</p>'; ! if (''!=$feedback) { ! $full .= '<span class="feedback">'.$feedback.'</span>'; ! } $full .= "</div>\n\n"; $xhtml = str_replace("<IEfeedback>$label</IEfeedback>", $full, $xhtml); |