Fixed regressions

diff --git a/mod/workshop/allocation/manual/renderer.php b/mod/workshop/allocation/manual/renderer.php
index 09a8b9282a64290973035e911b3f97c615410a97..096af95295e56462969375f3d53f258e6f3b1b61 100644 (file)
--- a/mod/workshop/allocation/manual/renderer.php
+++ b/mod/workshop/allocation/manual/renderer.php
@@ -105,7 +105,7 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
         if (is_null($user->submissionid)) {
             $o .= $this->output->output_tag('span', array('class' => 'info'), get_string('nosubmissionfound', 'workshop'));
         } else {
-            $submlink = $this->output->output_tag('a', array('href' => '#'), s($user->submissiontitle));
+            $submlink = $this->output->output_tag('a', array('href' => '#'), s($user->submissiontitle)); // todo link
             $o .= $this->output->container($submlink, array('title'));
             if (is_null($user->submissiongrade)) {
                 $o .= $this->output->container(get_string('nogradeyet', 'workshop'), array('grade', 'missing'));
@@ -137,8 +137,8 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
             // todo add an option to exclude users without own submission
             // todo nice to have number of current allocations for every user plus ordering by it
             $handler = new moodle_url($this->page->url, array('mode' => 'new', 'of' => $user->id, 'sesskey' => sesskey()));
-            $options = $this->users_to_menu_options($workshop->get_peer_reviewers(), $exclude, $handler, 'by'); 
-            $select = moodle_select::make_popup_form($options, 'addreviewof' . $user->id, '', 
+            $options = $this->users_to_menu_options($workshop->get_peer_reviewers(), $exclude);
+            $select = html_select::make_popup_form($handler, 'by', $options, 'addreviewof' . $user->id, '',
                 get_string('addreviewer', 'workshop'));
             $select->nothinglabel = get_string('chooseuser', 'workshop');
             $select->set_label(get_string('addreviewer', 'workshop'), $select->id);
@@ -147,7 +147,11 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
         $o .= $this->output->output_start_tag('ul', array());
         foreach ($user->reviewedby as $reviewerid => $assessmentid) {
             $o .= $this->output->output_start_tag('li', array());
-            $o .= $this->output->user_picture($peers[$reviewerid], $this->page->course->id); // todo display smaller
+            $userpic = new moodle_user_picture();
+            $userpic->user = $peers[$reviewerid];
+            $userpic->courseid = $this->page->course->id;
+            $userpic->size = 16;
+            $o .= $this->output->user_picture($userpic);
             $o .= fullname($peers[$reviewerid]);
 
             $handler = $this->page->url->out_action(array('mode' => 'del', 'what' => $assessmentid));
@@ -179,8 +183,8 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
         // todo add an option to exclude users without own submission
         // todo nice to have number of current allocations for every user plus ordering by it
         $handler = new moodle_url($this->page->url, array('mode' => 'new', 'by' => $user->id, 'sesskey' => sesskey()));
-        $options = $this->users_to_menu_options($workshop->get_peer_authors(), $exclude, $handler, 'of'); 
-        $select = moodle_select::make_popup_form($options, 'addreviewby' . $user->id, '', 
+        $options = $this->users_to_menu_options($workshop->get_peer_authors(), $exclude);
+        $select = html_select::make_popup_form($handler, 'of', $options, 'addreviewby' . $user->id, '',
             get_string('addreviewee', 'workshop'));
         $select->nothinglabel = get_string('chooseuser', 'workshop');
         $select->set_label(get_string('addreviewee', 'workshop'), $select->id);
@@ -188,7 +192,11 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
         $o .= $this->output->output_start_tag('ul', array());
         foreach ($user->reviewerof as $authorid => $assessmentid) {
             $o .= $this->output->output_start_tag('li', array());
-            $o .= $this->output->user_picture($peers[$authorid], $this->page->course->id); // todo display smaller
+            $userpic = new moodle_user_picture();
+            $userpic->user = $peers[$authorid];
+            $userpic->courseid = $this->page->course->id;
+            $userpic->size = 16;
+            $o .= $this->output->user_picture($userpic, $this->page->course->id);
             $o .= fullname($peers[$authorid]);
 
             // delete
@@ -205,13 +213,13 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
      * Given a list of users, returns an array suitable to render the HTML select field
      *
      * @param array $users array of users or array of groups of users
-     * @return array of options to be passed to {@link moodle_select::make_ popup_form()}
+     * @return array of options to be passed to {@link html_select::make_ popup_form()}
      */
-    protected function users_to_menu_options(&$users, array $exclude, moodle_url $baseurl, $var) {
+    protected function users_to_menu_options(&$users, array $exclude) {
         $options = array(); // to be returned
         foreach ($users as $user) {
             if (!isset($exclude[$user->id])) {
-                $options[$baseurl->out(false, array($var => $user->id), false)] = fullname($user);
+                $options[$user->id] = fullname($user);
             }
         }
         return $options;

diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index c615ab441669c445107d0caa50a69060e90cc70e..6ee7ac3ea681d153d2fe139fba8124af1df4c729 100644 (file)
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -134,7 +134,7 @@ class moodle_mod_workshop_renderer extends moodle_renderer_base {
         $o .= $this->output->heading(format_string($submission->title), 3, 'title');
         if ($showauthorname && $author) {
             $o .= $this->output->output_start_tag('div', array('class' => 'author'));                           //+++
-            $userpic    = new user_picture();
+            $userpic    = new moodle_user_picture();
             $userpic->user = $author;
             $userpic->courseid = $this->page->course->id;
             $userpic->url = true;

diff --git a/mod/workshop/styles.php b/mod/workshop/styles.php
index 2c4a0db55f0ccb638f1defa305548bf25126b1ea..3b0d543223631c6d4e2ab0762cb205ec4a446259 100644 (file)
--- a/mod/workshop/styles.php
+++ b/mod/workshop/styles.php
@@ -134,6 +134,17 @@
     background-color: #eee;
 }
 
+.mod-workshop .manual-allocator .allocations .peer .image {
+    margin-right: 5px;
+    vertical-align: middle;
+}
+
+.mod-workshop .manual-allocator .allocations .reviewedby .image,
+.mod-workshop .manual-allocator .allocations .reviewerof .image {
+    margin-right: 3px;
+    vertical-align: middle;
+}
+
 .mod-workshop .manual-allocator .allocations .highlightreviewedby .reviewedby,
 .mod-workshop .manual-allocator .allocations .highlightreviewerof .reviewerof {
     background-color: #fff3d2;
@@ -157,21 +168,6 @@
     font-style: italic;
 }
 
-.mod-workshop .manual-allocator .allocations .reviewedby img.userpicture,
-.mod-workshop .manual-allocator .allocations .reviewerof img.userpicture {
-    height: 16px;
-    width: 16px;
-    margin-right: 3px;
-    vertical-align: middle;
-}
-
-.mod-workshop .manual-allocator .allocations .peer img.userpicture {
-    height: 35px;
-    width: 35px;
-    vertical-align: middle;
-    margin-right: 5px;
-}
-
 .mod-workshop .manual-allocator .allocations .peer .submission {
     font-size: 90%;
     margin-top: 1em;