workshop in reply to MDL-20204 - new output API

diff --git a/mod/workshop/allocation.php b/mod/workshop/allocation.php
index 5ebf93870c4cd7d98e6b2d790238311560fbb211..f746dde7274ef7cc0c908c0529d97aa4760d5cf8 100644 (file)
--- a/mod/workshop/allocation.php
+++ b/mod/workshop/allocation.php
@@ -54,7 +54,7 @@ $initresult = $allocator->init();
 //
 // Output starts here
 //
-$wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);
+$wsoutput = $PAGE->get_renderer('mod_workshop');
 echo $OUTPUT->header();
 
 $allocators = workshop::installed_allocators();

diff --git a/mod/workshop/allocation/manual/lib.php b/mod/workshop/allocation/manual/lib.php
index 9758b29e3bfa387fd94dc7caadad6f1f073c10e2..70a73ad66c909b13313aab5786d2a57a6eb7bd38 100644 (file)
--- a/mod/workshop/allocation/manual/lib.php
+++ b/mod/workshop/allocation/manual/lib.php
@@ -322,8 +322,8 @@ class workshop_manual_allocator implements workshop_allocator {
         $pagingbarout = $OUTPUT->paging_bar($pagingbar);
 
         // we have all data, let us pass it to the renderers and return the output
-        $wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);
-        $uioutput = $PAGE->theme->get_renderer('workshopallocation_manual', $PAGE);
+        $wsoutput = $PAGE->get_renderer('mod_workshop');
+        $uioutput = $PAGE->get_renderer('workshopallocation_manual');
 
         return $pagingbarout . $wsoutput->status_message($msg) . $uioutput->display_allocations($data) . $pagingbarout;
     }

diff --git a/mod/workshop/allocation/manual/renderer.php b/mod/workshop/allocation/manual/renderer.php
index 9714f9e629efc8f4f2719e702795649ba26dbd5b..711e6ef2644c69e3d4eb9da1137d19e3e50e0569 100644 (file)
--- a/mod/workshop/allocation/manual/renderer.php
+++ b/mod/workshop/allocation/manual/renderer.php
@@ -28,25 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Manual allocation renderer class
  */
-class moodle_workshopallocation_manual_renderer extends moodle_renderer_base  {
-
-    /** the underlying renderer to use */
-    protected $output;
-
-    /** the page we are doing output for */
-    protected $page;
-
-    /**
-     * Workshop renderer constructor
-     *
-     * @param mixed $page the page we are doing output for
-     * @param mixed $output lower-level renderer, typically moodle_core_renderer
-     * @return void
-     */
-    public function __construct($page, $output) {
-        parent::__construct($page);
-        $this->output = $output;
-    }
+class workshopallocation_manual_renderer extends plugin_renderer_base  {
 
     /**
      * Display the table of all current allocations and widgets to modify them

diff --git a/mod/workshop/allocation/random/lib.php b/mod/workshop/allocation/random/lib.php
index efea09f4c8bbd3e918fab643ca141c30f7865b37..be5d7da3ca2de5969d23866257dfb4793f2e2796 100644 (file)
--- a/mod/workshop/allocation/random/lib.php
+++ b/mod/workshop/allocation/random/lib.php
@@ -166,7 +166,7 @@ class workshop_random_allocator implements workshop_allocator {
 
         $out = '';
         $out .= $OUTPUT->container_start('random-allocator');
-        $wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);
+        $wsoutput = $PAGE->get_renderer('mod_workshop');
         $out .= $wsoutput->status_message($msg);
         // the nasty hack follows to bypass the sad fact that moodle quickforms do not allow to actually
         // return the HTML content, just to display it

diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index 39c4e09abd6951437314c0637293c17845309fb1..1e6fe9ddc5912657b2806688cf79ee5ca4c9d644 100644 (file)
--- a/mod/workshop/assessment.php
+++ b/mod/workshop/assessment.php
@@ -113,7 +113,7 @@ if ($canoverridegrades) {
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('assessedsubmission', 'workshop'), 2);
 
-$wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);      // workshop renderer
+$wsoutput = $PAGE->get_renderer('mod_workshop');      // workshop renderer
 $submission = $workshop->get_submission_by_id($submission->id);     // reload so can be passed to the renderer
 echo $wsoutput->submission_full($submission, has_capability('mod/workshop:viewauthornames', $workshop->context));
 

diff --git a/mod/workshop/pix/userplan/task-done.gif b/mod/workshop/pix/userplan/task-done.gif
new file mode 100644 (file)
index 0000000..8f10daf
Binary files /dev/null and b/mod/workshop/pix/userplan/task-done.gif differ

diff --git a/mod/workshop/pix/userplan/task-fail.gif b/mod/workshop/pix/userplan/task-fail.gif
new file mode 100644 (file)
index 0000000..90cb48c
Binary files /dev/null and b/mod/workshop/pix/userplan/task-fail.gif differ

diff --git a/mod/workshop/pix/userplan/task-info.gif b/mod/workshop/pix/userplan/task-info.gif
new file mode 100755 (executable)
index 0000000..4927e1a
Binary files /dev/null and b/mod/workshop/pix/userplan/task-info.gif differ

diff --git a/mod/workshop/pix/userplan/task-todo.gif b/mod/workshop/pix/userplan/task-todo.gif
new file mode 100644 (file)
index 0000000..f2b58c1
Binary files /dev/null and b/mod/workshop/pix/userplan/task-todo.gif differ

diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index ffbfbb39f43de359ad4d79a8d6a9d11623d66893..f80ea960fdff085c5b6c09e1db7e66cf0f762ea4 100644 (file)
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -31,25 +31,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright 2009 David Mudrak <david.mudrak@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class moodle_mod_workshop_renderer extends moodle_renderer_base {
-
-    /** the underlying renderer to use */
-    protected $output;
-
-    /** the page we are doing output for */
-    protected $page;
-
-    /**
-     * Workshop renderer constructor
-     *
-     * @param mixed $page the page we are doing output for
-     * @param mixed $output lower-level renderer, typically moodle_core_renderer
-     * @return void
-     */
-    public function __construct($page, $output) {
-        parent::__construct($page);
-        $this->output = $output;
-    }
+class mod_workshop_renderer extends plugin_renderer_base {
 
     /**
      * Returns html code for a status message
@@ -269,7 +251,7 @@ class moodle_mod_workshop_renderer extends moodle_renderer_base {
             $type       = $file->get_mimetype();
             $type       = mimeinfo_from_type("type", $type);
             $icon       = new html_image();
-            $icon->src  = $this->output->old_icon_url(file_mimetype_icon($type));
+            $icon->src  = $this->output->pix_url(file_mimetype_icon($type));
             $icon->set_classes('icon');
             $icon->alt  = $type;
             $image      = $this->output->image($icon);
@@ -331,7 +313,7 @@ class moodle_mod_workshop_renderer extends moodle_renderer_base {
                 switch ($action->type) {
                 case 'switchphase':
                     $icon = new moodle_action_icon();
-                    $icon->image->src = $this->old_icon_url('i/marker');
+                    $icon->image->src = $this->pix_url('i/marker');
                     $icon->image->alt = get_string('switchphase', 'workshop');
                     $icon->link->url = $action->url;
                     $actions .= $this->output->action_icon($icon);
@@ -559,7 +541,7 @@ class moodle_mod_workshop_renderer extends moodle_renderer_base {
 
         if (!is_null($sortid)) {
             $iconasc = new moodle_action_icon();
-            $iconasc->image->src = $this->old_icon_url('t/up');
+            $iconasc->image->src = $this->pix_url('t/up');
             $iconasc->image->alt = get_string('sortasc', 'workshop');
             $iconasc->image->set_classes('sort asc');
             $newurl = clone($PAGE->url);
@@ -567,7 +549,7 @@ class moodle_mod_workshop_renderer extends moodle_renderer_base {
             $iconasc->link->url = new moodle_url($newurl);
 
             $icondesc = new moodle_action_icon();
-            $icondesc->image->src = $this->old_icon_url('t/down');
+            $icondesc->image->src = $this->pix_url('t/down');
             $icondesc->image->alt = get_string('sortdesc', 'workshop');
             $icondesc->image->set_classes('sort desc');
             $newurl = clone($PAGE->url);

diff --git a/mod/workshop/styles.php b/mod/workshop/styles.css
similarity index 96%
rename from mod/workshop/styles.php
rename to mod/workshop/styles.css
index 1a13b10d26a73d28b9c5c2eb78477feba0402340..5a83715983ac47c517d022d389b05016db71bf48 100644 (file)
--- a/mod/workshop/styles.php
+++ b/mod/workshop/styles.css
@@ -283,21 +283,21 @@
 }
 
 .mod-workshop .userplan tr.phasetasks li {
-    background-image: url(../../pix/i/completion-auto-n.gif);
+    background-image: url([[pix:mod_workshop|userplan/task-todo]]);
     background-position: top left;
     background-repeat: no-repeat;
 }
 
 .mod-workshop .userplan tr.phasetasks li.completed {
-    background-image: url(../../pix/i/completion-auto-y.gif);
+    background-image: url([[pix:mod_workshop|userplan/task-done]]);
 }
 
 .mod-workshop .userplan tr.phasetasks li.fail {
-    background-image: url(../../pix/i/completion-auto-fail.gif);
+    background-image: url([[pix:mod_workshop|userplan/task-fail]]);
 }
 
 .mod-workshop .userplan tr.phasetasks li.info {
-    background-image: url(../../pix/i/info.gif);
+    background-image: url([[pix:mod_workshop|userplan/task-info]]);
 }
 
 .mod-workshop .userplan tr.phasetasks .tasks {
@@ -422,12 +422,13 @@
 .mod-workshop .grading-report del {
     color: red;
     font-size: 90%
-    text-decoration: 
+    text-decoration: line-through;
 }
 
 .mod-workshop .grading-report ins {
     color: green;
     font-weight: bold;
+    text-decoration: underline;
 }
 
 .mod-workshop .grading-report th {

diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index cadeeb4a09e3867d272aa9349f7bfc0074fd18d7..621195df950b5ed67aab7f42864484a00675c468 100644 (file)
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -163,7 +163,7 @@ if ($edit and $ownsubmission) {
 // else display the submission
 
 if ($submission->id) {
-    $wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);
+    $wsoutput = $PAGE->get_renderer('mod_workshop');
     echo $wsoutput->submission_full($submission, true);
 } else {
     echo $OUTPUT->box(get_string('noyoursubmission', 'workshop'));

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index fbe071de8a4238b8d63d3292cafbcc026f776737..d0a787cc3506b8dd7ec724ca4f1484f6b8747e13 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -69,7 +69,7 @@ if ($PAGE->user_allowed_editing()) {
 $buttons[] = $OUTPUT->update_module_button($cm->id, 'workshop');
 $PAGE->set_button(implode('', $buttons));
 
-$wsoutput = $PAGE->theme->get_renderer('mod_workshop', $PAGE);
+$wsoutput = $PAGE->get_renderer('mod_workshop');
 
 /// Output starts here