L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start replacing tables with div-tags and css-classes

Browse Source
This commit is contained in:
Andreas Grabs
2010-05-02 12:00:56 +00:00
parent fcce139aa3
commit 31c0fa53b0
10 changed files with 188 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/analysis_course.php
+3 -2
View File
@@ -146,10 +146,10 @@ if ($courseitemfilter > 0) {
echo '<input type="hidden" name="courseitemfiltertyp" value="'.$courseitemfiltertyp.'" />';
echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
echo html_writer::script('', $CFG->wwwroot.'/mod/feedback/feedback.js');
$sql = 'select c.id, c.shortname from {course} c, '.
$sql = 'select DISTINCT c.id, c.shortname from {course} c, '.
'{feedback_value} fv, {feedback_item} fi '.
'where c.id = fv.course_id and fv.item = fi.id '.
'and fi.feedback = ?'.
'and fi.feedback = ? '.
'and
(c.shortname '.$DB->sql_ilike().' ?
OR c.fullname '.$DB->sql_ilike().' ?)';
@@ -172,6 +172,7 @@ if ($courseitemfilter > 0) {
//get the class from item-typ
$itemclass = 'feedback_item_'.$item->typ;
//get the instance of the item-class
require_once($CFG->dirroot.'/mod/feedback/item/'.$item->typ.'/lib.php');
$itemobj = new $itemclass();
$itemnr++;
if($feedback->autonumbering) {
mod/feedback/complete.php
+24 -17
View File
@@ -296,9 +296,10 @@ if($feedback_can_submit) {
( has_capability('mod/feedback:viewanalysepage', $context)) AND
!( has_capability('mod/feedback:viewreports', $context)) ) {
if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo $OUTPUT->box_start('mdl-align');
echo '<a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';
echo $OUTPUT->box_end();
}
}
@@ -339,21 +340,25 @@ if($feedback_can_submit) {
}
}else {
if(isset($savereturn) && $savereturn == 'failed') {
echo '<div class="mform error">'.get_string('saving_failed','feedback').'</div>';
echo $OUTPUT->box_start('mform error');
echo get_string('saving_failed','feedback');
echo $OUTPUT->box_end();
}
if(isset($savereturn) && $savereturn == 'missing') {
echo '<div class="mform error">'.get_string('saving_failed_because_missing_or_false_values','feedback').'</div>';
echo $OUTPUT->box_start('mform error');
echo get_string('saving_failed_because_missing_or_false_values','feedback');
echo $OUTPUT->box_end();
}
//print the items
if(is_array($feedbackitems)){
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="feedback_form">';
echo $OUTPUT->box_start('feedback_form');
echo '<form action="complete.php" method="post" onsubmit=" ">';
echo '<fieldset>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<div class="feedback_anonymousinfo">';
echo $OUTPUT->box_start('feedback_anonymousinfo');
switch ($feedback->anonymous) {
case FEEDBACK_ANONYMOUS_YES:
echo '<input type="hidden" name="anonymous" value="1" />';
@@ -366,13 +371,13 @@ if($feedback_can_submit) {
echo get_string('mode', 'feedback').': '.get_string('non_anonymous', 'feedback');
break;
}
echo '</div>';
echo $OUTPUT->box_end();
//check, if there exists required-elements
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
if($countreq > 0) {
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
}
echo '<div class="feedback_items_complete">';
echo $OUTPUT->box_start('feedback_items');
unset($startitem);
$itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
@@ -387,7 +392,7 @@ if($feedback_can_submit) {
}
$startitem = $feedbackitem;
}
echo '<div class="feedback_item_box_'.$align.'">';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
$value = '';
//get the value
$frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
@@ -400,14 +405,16 @@ if($feedback_can_submit) {
}
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
if($feedbackitem->typ != 'pagebreak') {
echo '<div class="box generalbox boxalign_'.$align.'">';
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
echo '</div>';
echo $OUTPUT->box_end();
}
echo '</div>';
echo $OUTPUT->box_end();
$lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak)
if($feedbackitem->typ == 'pagebreak'){
@@ -416,7 +423,7 @@ if($feedback_can_submit) {
$lastitem = $feedbackitem;
}
}
echo '</div>';
echo $OUTPUT->box_end();
echo '<input type="hidden" name="id" value="'.$id.'" />';
echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'" />';
echo '<input type="hidden" name="lastpage" value="'.$gopage.'" />';
@@ -440,9 +447,9 @@ if($feedback_can_submit) {
echo '</fieldset>';
echo '</form>';
echo '</div>';
echo $OUTPUT->box_end();
echo '<div class="feedback_complete_cancel">';
echo $OUTPUT->box_start('feedback_complete_cancel');
if($courseid) {
echo '<form action="'.$CFG->wwwroot.'/course/view.php?id='.$courseid.'" method="post" onsubmit=" ">';
}else{
@@ -458,7 +465,7 @@ if($feedback_can_submit) {
echo '<button type="submit">'.get_string('cancel').'</button>';
echo '</fieldset>';
echo '</form>';
echo '</div>';
echo $OUTPUT->box_end();
$SESSION->feedback->is_started = true;
// echo $OUTPUT->box_end();
}
mod/feedback/complete_guest.php
+55 -43
View File
@@ -263,9 +263,9 @@ if($feedback_can_submit) {
if( (intval($feedback->publish_stats) == 1) AND
( has_capability('mod/feedback:viewanalysepage', $context)) AND
!( has_capability('mod/feedback:viewreports', $context)) ) {
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';
echo $OUTPUT->box_start('mdl-align');
echo '<a href="'.$analysisurl->out().'">'.get_string('completed_feedbacks', 'feedback').'</a>';
echo $OUTPUT->box_end();
}
if(isset($savereturn) && $savereturn == 'saved') {
@@ -300,61 +300,69 @@ if($feedback_can_submit) {
}
}else {
if(isset($savereturn) && $savereturn == 'failed') {
echo '<p align="center"><b><font color="red">'.get_string('saving_failed','feedback').'</font></b></p>';
echo $OUTPUT->box_start('mform error');
echo get_string('saving_failed','feedback');
echo $OUTPUT->box_end();
}
if(isset($savereturn) && $savereturn == 'missing') {
echo '<p align="center"><b><font color="red">'.get_string('saving_failed_because_missing_or_false_values','feedback').'</font></b></p>';
echo $OUTPUT->box_start('mform error');
echo get_string('saving_failed_because_missing_or_false_values','feedback');
echo $OUTPUT->box_end();
}
//print the items
if(is_array($feedbackitems)){
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="mdl-align"><form name="frm" action="complete_guests.php" method="post" onsubmit=" ">';
echo '<table>';
echo '<tr><td colspan="3" align="center">
<input type="hidden" name="anonymous" value="0" />
<input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />
<input type="hidden" name="sesskey" value="'.sesskey().'" />
&nbsp;
</td></tr>';
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo $OUTPUT->box_start('feedback_form');
echo '<form action="complete_guest.php" method="post" onsubmit=" ">';
echo '<fieldset>';
echo '<input type="hidden" name="anonymous" value="0" />';
echo '<input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
//check, if there exists required-elements
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
if($countreq > 0) {
echo '<tr><td colspan="3"><font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font></td></tr>';
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
}
echo $OUTPUT->box_start('feedback_items');
unset($startitem);
$itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
$lastbreakposition = 0;
$align = right_to_left() ? 'right' : 'left';
foreach($feedbackitems as $feedbackitem){
if(!isset($startitem)) {
//avoid showing double pagebreaks
if($feedbackitem->typ == 'pagebreak') continue;
if($feedbackitem->typ == 'pagebreak') {
continue;
}
$startitem = $feedbackitem;
}
$value = '';
//get the value
$frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
if(isset($savereturn)) {
$value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
}else {
if(isset($feedbackcompletedtmp->id)) {
$value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, sesskey());
echo $OUTPUT->box_start('feedback_item_box_'.$align);
$value = '';
//get the value
$frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;
if(isset($savereturn)) {
$value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL;
}else {
if(isset($feedbackcompletedtmp->id)) {
$value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, sesskey());
}
}
}
echo '<tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
}
if($feedbackitem->typ != 'pagebreak') {
feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
}
echo '</tr>';
echo '<tr><td>&nbsp;</td></tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
if($feedbackitem->typ != 'pagebreak') {
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
echo $OUTPUT->box_end();
}
echo $OUTPUT->box_end();
$lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak)
if($feedbackitem->typ == 'pagebreak'){
@@ -363,7 +371,7 @@ if($feedback_can_submit) {
$lastitem = $feedbackitem;
}
}
echo '</table>';
echo $OUTPUT->box_end();
echo '<input type="hidden" name="id" value="'.$id.'" />';
echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'" />';
echo '<input type="hidden" name="lastpage" value="'.$gopage.'" />';
@@ -385,24 +393,28 @@ if($feedback_can_submit) {
echo '<input name="savevalues" type="submit" value="'.get_string('save_entries','feedback').'" />';
}
echo '</fieldset>';
echo '</form>';
echo $OUTPUT->box_end();
echo $OUTPUT->box_start('feedback_complete_cancel');
if($courseid) {
echo '<form name="frm" action="'.$CFG->wwwroot.'/course/view.php?id='.$courseid.'" method="post" onsubmit=" ">';
echo '<form action="'.$CFG->wwwroot.'/course/view.php?id='.$courseid.'" method="post" onsubmit=" ">';
}else{
if($course->id == SITEID) {
echo '<form name="frm" action="'.$CFG->wwwroot.'" method="post" onsubmit=" ">';
echo '<form action="'.$CFG->wwwroot.'" method="post" onsubmit=" ">';
} else {
echo '<form name="frm" action="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'" method="post" onsubmit=" ">';
echo '<form action="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'" method="post" onsubmit=" ">';
}
}
echo '<fieldset>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="courseid" value="'. $courseid . '" />';
echo '<button type="submit">'.get_string('cancel').'</button>';
echo '</fieldset>';
echo '</form>';
echo '</div>';
$SESSION->feedback->is_started = true;
echo $OUTPUT->box_end();
$SESSION->feedback->is_started = true;
}
}
}else {
mod/feedback/edit.php
+16 -16
View File
@@ -233,16 +233,16 @@ if($do_show == 'edit') {
}
//use list instead a table
echo '<div class="feedback_items_edit">';
echo $OUTPUT->box_start('feedback_items');
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition = 1;
$movehereurl = new moodle_url($url, array('movehere'=>$moveposition));
echo '<div class="feedback_item_box_'.$align.' clipboard">'; //only shown if shouldmoving = 1
echo $OUTPUT->box_start('feedback_item_box_'.$align.' clipboard'); //only shown if shouldmoving = 1
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
echo '</div>';
echo $OUTPUT->box_end();
}
//print the inserted items
$itempos = 0;
@@ -251,14 +251,14 @@ if($do_show == 'edit') {
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->movingitem == $feedbackitem->id){ //hiding the item to move
continue;
}
echo '<div class="feedback_item_box_'.$align.'">';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
//items without value only are labels
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
echo $OUTPUT->box_start('feedback_item_number_'.$align) . $itemnr . $OUTPUT->box_end();
}
echo '<div class="box generalbox boxalign_'.$align.'">';
echo '<div class="feedback_item_commands_'.$align.'">';
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
echo $OUTPUT->box_start('feedback_item_commands_'.$align);
echo '<span class="feedback_item_commands">('.get_string('position', 'feedback').':'.$itempos .')</span>';
//print the moveup-button
if($feedbackitem->position > 1){
@@ -340,29 +340,29 @@ if($do_show == 'edit') {
<img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
</a>';
echo '</span>';
echo '</div>';
echo $OUTPUT->box_end();
if($feedbackitem->typ != 'pagebreak') {
// echo '<div class="feedback_item_'.$align.'">';
feedback_print_item_preview($feedbackitem);
}else {
echo '<div class="feedback_pagebreak">'.get_string('pagebreak', 'feedback').'<hr class="feedback_pagebreak" /></div>';
echo $OUTPUT->box_start('feedback_pagebreak');
echo get_string('pagebreak', 'feedback').'<hr class="feedback_pagebreak" />';
echo $OUTPUT->box_end();
}
echo '</div>';
echo '</div>';
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition++;
$movehereurl->param('movehere', $moveposition);
echo '<div class="clipboard">'; //only shown if shouldmoving = 1
echo $OUTPUT->box_start('clipboard'); //only shown if shouldmoving = 1
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
echo '</div>';
echo $OUTPUT->box_end();
}
echo '<div class="clearer">&nbsp;</div>';
}
echo '</div>';
// echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
}else{
echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter');
}
mod/feedback/lib.php
+1 -1
View File
@@ -1932,7 +1932,7 @@ function feedback_get_current_completed($feedbackid, $tmp = false, $courseid = f
$params['userid'] = $USER->id;
}
//if courseid is set the feedback is global. there can be more than one completed on one feedback
$sql = "SELECT fc.*
$sql = "SELECT DISTINCT fc.*
FROM {feedback_value{$tmpstr}} fv, {feedback_completed{$tmpstr}} fc
WHERE fv.course_id = :courseid
AND fv.completed = fc.id
mod/feedback/print.php
+27 -22
View File
@@ -15,8 +15,6 @@ $id = required_param('id', PARAM_INT);
$PAGE->set_url('/mod/feedback/print.php', array('id'=>$id));
$formdata = data_submitted();
if (! $cm = get_coursemodule_from_id('feedback', $id)) {
print_error('invalidcoursemodule');
}
@@ -58,31 +56,38 @@ feedback_print_errors();
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
if(is_array($feedbackitems)){
$itemnr = 0;
$align = right_to_left() ? 'right' : 'left';
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="mdl-align printview"><table>';
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo $OUTPUT->box_start('feedback_items printview');
//check, if there exists required-elements
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
if($countreq > 0) {
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
}
//print the inserted items
$itempos = 0;
foreach($feedbackitems as $feedbackitem){
$itempos++;
echo '<tr>';
//Items without value only are labels
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
}
if($feedbackitem->typ != 'pagebreak') {
feedback_print_item_complete($feedbackitem, false, false);
}else {
echo '<td class="feedback_print_pagebreak" colspan="2">&nbsp;</td>';
}
echo '</tr>';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
$itempos++;
//Items without value only are labels
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
if($feedbackitem->typ != 'pagebreak') {
feedback_print_item_complete($feedbackitem, false, false);
}else {
echo $OUTPUT->box_start('feedback_pagebreak');
echo '<hr class="feedback_pagebreak" />';
echo $OUTPUT->box_end();
}
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
}
echo '</table>';
echo '<font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font>';
echo '</div>';
echo $OUTPUT->box_end();
}else{
echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter boxwidthwide');
mod/feedback/show_entries.php
+24 -26
View File
@@ -112,15 +112,15 @@ if($do_show == 'showentries'){
$completedFeedbackCount = feedback_get_completeds_group_count($feedback, $mygroupid);
if($feedback->course == SITEID){
$analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo $OUTPUT->box_start('mdl-align');
echo '<a href="'.$analysisurl->out().'">'.get_string('course').' '.get_string('analysis', 'feedback').' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo $OUTPUT->help_icon('viewcompleted', 'feedback');
echo '</div>';
echo $OUTPUT->box_end();
}else {
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
echo get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo '</div>';
echo $OUTPUT->box_start('mdl-align');
echo '<a href="'.$analysisurl->out().'">'.get_string('analysis', 'feedback').' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
echo $OUTPUT->box_end();
}
}
@@ -130,7 +130,8 @@ if($do_show == 'showentries'){
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo isset($groupselect) ? $groupselect : '';
echo '<div class="clearer"></div>';
echo '<div class="mdl-align"><table><tr><td width="400">';
echo $OUTPUT->box_start('mdl-align');
echo '<table><tr><td width="400">';
if (!$students) {
if($courseid != SITEID){
echo $OUTPUT->notification(get_string('noexistingstudents'));
@@ -193,7 +194,8 @@ if($do_show == 'showentries'){
</tr>
</table>
<?php
echo '</td></tr></table></div>';
echo '</td></tr></table>';
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
}
@@ -206,46 +208,42 @@ if($do_show == 'showoneentry') {
//print the items
if(is_array($feedbackitems)){
$align = right_to_left() ? 'right' : 'left';
$usr = $DB->get_record('user', array('id'=>$userid));
echo $OUTPUT->box_start('feedback_info');
if($feedbackcompleted) {
echo '<p align="center">'.UserDate($feedbackcompleted->timemodified).'<br />('.fullname($usr).')</p>';
echo UserDate($feedbackcompleted->timemodified).'<br />('.fullname($usr).')';
} else {
echo '<p align="center">'.get_string('not_completed_yet','feedback').'</p>';
echo get_string('not_completed_yet','feedback');
}
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
echo '<form>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<table width="100%">';
echo $OUTPUT->box_end();
echo $OUTPUT->box_start('feedback_items');
$itemnr = 0;
foreach($feedbackitems as $feedbackitem){
//get the values
$value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
echo '<tr>';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
if($feedbackitem->typ != 'pagebreak') {
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
if(isset($value->value)) {
feedback_print_item_show_value($feedbackitem, $value->value);
}else {
feedback_print_item_show_value($feedbackitem, false);
}
}else {
echo '<td><hr /></td>';
echo $OUTPUT->box_end();
}
echo '</tr>';
echo $OUTPUT->box_end();
}
echo '<tr><td colspan="2" align="center">';
echo '</td></tr>';
echo '</table>';
echo '</form>';
echo $OUTPUT->box_end();
}
// echo $OUTPUT->continue_button(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries'));
echo $OUTPUT->continue_button(new moodle_url($url, array('do_show'=>'showentries')));
}
/// Finish the page
mod/feedback/show_entries_anonym.php
+15 -13
View File
@@ -131,39 +131,41 @@ if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_Y
$align = right_to_left() ? 'right' : 'left';
if($feedbackcompleted) {
echo '<div class="feedback_info">';
echo $OUTPUT->box_start('feedback_info');
echo get_string('chosen_feedback_response', 'feedback');
echo '</div>';
echo '<div class="feedback_info">';
echo $OUTPUT->box_end();
echo $OUTPUT->box_start('feedback_info');
echo '('.get_string('anonymous', 'feedback').')';
echo '</div>';
echo $OUTPUT->box_end();
} else {
echo '<div class="feedback_info">';
echo $OUTPUT->box_start('feedback_info');
echo get_string('not_completed_yet','feedback');
echo '</div>';
echo $OUTPUT->box_end();
}
echo '<div class="feedback_items_show">';
echo $OUTPUT->box_start('feedback_items');
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
$itemnr = 0;
foreach($feedbackitems as $feedbackitem){
//get the values
$value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
echo '<div class="feedback_item_box_'.$align.'">';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
if($feedbackitem->typ != 'pagebreak') {
echo '<div class="box generalbox boxalign_'.$align.'">';
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
$itemvalue = isset($value->value) ? $value->value : false;
feedback_print_item_show_value($feedbackitem, $itemvalue);
echo '</div>';
echo $OUTPUT->box_end();
}
echo '</div>';
echo $OUTPUT->box_end();
}
// echo $OUTPUT->box_end();
echo '</div>';
echo $OUTPUT->box_end();
}
}
/// Finish the page
mod/feedback/use_templ.php
+21 -19
View File
@@ -80,7 +80,7 @@ echo $OUTPUT->header();
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
echo $OUTPUT->heading(get_string('confirmusetemplate', 'feedback'));
$mform->display();
@@ -94,26 +94,28 @@ if(is_array($templateitems)){
if(is_array($templateitems)){
$itemnr = 0;
echo '<p align="center">'.get_string('preview', 'feedback').'</p>';
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="mdl-align"><table>';
$align = right_to_left() ? 'right' : 'left';
echo $OUTPUT->box_start('feedback_items');
foreach($templateitems as $templateitem){
echo '<tr>';
if($templateitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
}
if($templateitem->typ != 'pagebreak') {
feedback_print_item_preview($templateitem);
}else {
echo '<td><hr /></td><td>'.get_string('pagebreak', 'feedback').'</td>';
}
echo '</tr>';
echo '<tr><td>&nbsp;</td></tr>';
echo $OUTPUT->box_start('feedback_item_box_'.$align);
if($templateitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo $OUTPUT->box_start('feedback_item_number_'.$align);
echo $itemnr;
echo $OUTPUT->box_end();
}
echo $OUTPUT->box_start('box generalbox boxalign_'.$align);
if($templateitem->typ != 'pagebreak') {
// echo '<div class="feedback_item_'.$align.'">';
feedback_print_item_preview($templateitem);
}else {
echo $OUTPUT->box_start('feedback_pagebreak');
echo get_string('pagebreak', 'feedback').'<hr class="feedback_pagebreak" />';
echo $OUTPUT->box_end();
}
echo $OUTPUT->box_end();
echo $OUTPUT->box_end();
}
echo '</table></div>';
echo $OUTPUT->box_end();
}else{
echo $OUTPUT->box(get_string('no_items_available_at_this_template','feedback'),'generalbox boxaligncenter boxwidthwide');
mod/feedback/use_templ_form.php
+2 -2
View File
@@ -17,8 +17,8 @@ class mod_feedback_use_templ_form extends moodleform {
$mform->addElement('header', 'general', '');
// visible elements
$mform->addElement('radio', 'deleteolditems', get_string('delete_old_items', 'feedback'), '', 1);
$mform->addElement('radio', 'deleteolditems', get_string('append_new_items', 'feedback'), '', 0);
$mform->addElement('radio', 'deleteolditems', '1)', get_string('delete_old_items', 'feedback'), 1);
$mform->addElement('radio', 'deleteolditems', '2)', get_string('append_new_items', 'feedback'), 0);
$mform->setType('deleteolditems', PARAM_INT);
// hidden elements