Use the new output approach

diff --git a/mod/workshop/index.php b/mod/workshop/index.php
index 889a21b65cbea08cf1af101fb678e57757164c35..a4d3ac984c7b3a771f58e3b72ce354796a21284a 100644 (file)
--- a/mod/workshop/index.php
+++ b/mod/workshop/index.php
@@ -42,26 +42,28 @@ require_course_login($course);
 
 add_to_log($course->id, 'workshop', 'view all', "index.php?id=$course->id", '');
 
-
-/// Get all required stringsworkshop
-
-$strworkshops = get_string('modulenameplural', 'workshop');
-$strworkshop  = get_string('modulename', 'workshop');
-
-
 /// Print the header
 
+$PAGE->set_url('mod/workshop/view.php', array('id' => $id));
+$PAGE->set_title($course->fullname);
+$PAGE->set_heading($course->shortname);
+
+// todo navigation will be changed yet for Moodle 2.0
 $navlinks = array();
-$navlinks[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity');
+$navlinks[] = array('name' => get_string('modulenameplural', 'workshop'),
+                    'link' => '',
+                    'type' => 'activity');
 $navigation = build_navigation($navlinks);
-
-print_header_simple($strworkshops, '', $navigation, '', '', true, '', navmenu($course));
+        
+echo $OUTPUT->header($navigation);
 
 /// Get all the appropriate data
 
 if (! $workshops = get_all_instances_in_course('workshop', $course)) {
-    notice('There are no workshops', "../../course/view.php?id=$course->id");
-    die;
+    echo $OUTPUT->heading(get_string('noworkshops', 'workshop'), 2);
+    echo $OUTPUT->continue_button("view.php?id=$course->id");
+    echo $OUTPUT->footer();
+    die();
 }
 
 /// Print the list of instances (your module will probably extend this)
@@ -98,9 +100,9 @@ foreach ($workshops as $workshop) {
     }
 }
 
-print_heading($strworkshops);
+echo $OUTPUT->heading(get_string('modulenameplural', 'workshop'), 2);
 print_table($table);
 
 /// Finish the page
 
-print_footer($course);
+echo $OUTPUT->footer();

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 3cbd05d6f56e4282632b3f585f5cce18e41e5654..cc507f90307729f007c0031b12f07acf11a2c3ca 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -27,10 +27,9 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-/// (Replace workshop with the name of your module and remove this line)
-
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once(dirname(__FILE__).'/lib.php');
+require_once(dirname(__FILE__).'/locallib.php');
 
 $id = optional_param('id', 0, PARAM_INT); // course_module ID, or
 $a  = optional_param('a', 0, PARAM_INT);  // workshop instance ID
@@ -68,23 +67,51 @@ require_login($course, true, $cm);
 add_to_log($course->id, "workshop", "view", "view.php?id=$cm->id", "$workshop->id");
 
 /// Print the page header
-$strworkshops = get_string('modulenameplural', 'workshop');
-$strworkshop  = get_string('modulename', 'workshop');
-
-$navlinks = array();
-$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-$navlinks[] = array('name' => format_string($workshop->name), 'link' => '', 'type' => 'activityinstance');
 
+$PAGE->set_url('mod/workshop/view.php', array('id' => $cm->id));
+$PAGE->set_title($workshop->name);
+$PAGE->set_heading($course->shortname);
+$PAGE->set_button(update_module_button($cm->id, $course->id, get_string('modulename', 'workshop')));
+
+// other things you may want to set - remove if not needed
+//$PAGE->set_cacheable(false);
+//$PAGE->set_focuscontrol('some-html-id');
+
+// todo navigation will be changed yet for Moodle 2.0
+$navlinks   = array();
+$navlinks[] = array('name' => get_string('modulenameplural', 'workshop'), 
+                    'link' => "index.php?id=$course->id", 
+                    'type' => 'activity');
+$navlinks[] = array('name' => format_string($workshop->name), 
+                    'link' => '',
+                    'type' => 'activityinstance');
 $navigation = build_navigation($navlinks);
+$menu       = navmenu($course, $cm);
 
-print_header_simple(format_string($workshop->name), '', $navigation, '', '', true,
-              update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));
+echo $OUTPUT->header($navigation, $menu);
 
-/// Print the main part of the page
+/// Print the main part of the page - todo these are just links to help during development
 
+echo $OUTPUT->box_start();
+echo $OUTPUT->heading('Workshop administration tools', 3);
 echo "<a href=\"editform.php?cmid={$cm->id}\">Edit grading form (".get_string('strategy' . $workshop->strategy, 'workshop').")</a>";
-echo " | <a href=\"submission.php?cmid={$cm->id}\">My submission</a>";
-echo " | <a href=\"assessment.php?asid=1\">Assessment ID 1</a>";
+echo $OUTPUT->box_end();
+
+echo $OUTPUT->box_start();
+echo $OUTPUT->heading(get_string('submission', 'workshop'), 3);
+echo "<a href=\"submission.php?cmid={$cm->id}\">My submission</a>";
+echo $OUTPUT->box_end();
+
+echo $OUTPUT->box_start();
+echo $OUTPUT->heading(get_string('assessment', 'workshop'), 3);
+
+$reviewstogive = workshop_get_assessments_for_reviewer($workshop->id, $USER->id);
+echo "You are expected to assess following submissions:";
+echo "<ul>";
+foreach ($reviewstogive as $review) {
+    echo "<li><a href=\"assessment.php?asid={$review->assessmentid}\">Assessment of '{$review->title}' by {$review->authorid}</a></li>";
+}
+echo "</ul>";
+echo $OUTPUT->box_end();
 
-/// Finish the page
-print_footer($course);
+echo $OUTPUT->footer();