MDL-21178 formslib element modgrade does not use deprecated link_to_popup_window...

diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php
index 8fbff35de86e0632c1097496734d60106f32b8c5..2c6dabb88fbf55b4764355de472c2a1b32e94e04 100644 (file)
--- a/lib/form/modgrade.php
+++ b/lib/form/modgrade.php
@@ -62,9 +62,7 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_select{
                     $grades[$i] = $i;
                 }
                 $this->load($grades);
-                $linkobject = '<span class="helplink"><img height="17" width="17" alt="'.$strscales.'" src="'.$OUTPUT->pix_url('help') . '" /></span>';
-                $this->setHelpButton(array('/course/scales.php?id='. $COURSE->id .'&amp;list=true', 'ratingscales',
-                                     $linkobject, 400, 500, $strscales, 'none', true), 'link_to_popup_window');
+                $this->setHelpButton(array($COURSE->id), 'modgradehelpbutton');
                 return $result;
         }
         return parent::onQuickFormEvent($event, $arg, $caller);

diff --git a/lib/weblib.php b/lib/weblib.php
index ef46fa17f981df56e1f9419c3eeb3c4ca5296c18..eb0946c36505023efb056d29dad717dfec4285fd 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2710,6 +2710,27 @@ function editorshortcutshelpbutton() {
     return '';
 }
 
+/**
+ * Returns html code to be used as help icon of modgrade form element
+ *
+ * Is used as a callback in modgrade setHelpButton()
+ *
+ * @param int $courseid id of the course the scales should be shown from
+ * @return string to be echoed
+ */
+function modgradehelpbutton($courseid){
+    global $CFG, $OUTPUT;
+
+    $url = new moodle_url($CFG->wwwroot .'/course/scales.php', array('id' => $courseid, 'list' => true));
+    $link = new html_link();
+    $link->url = $url;
+    $link->text = '<span class="helplink"><img alt="' . get_string('scales') . '" class="iconhelp" src="' . $OUTPUT->pix_url('help') . '" /></span>';
+    $link->add_action(new popup_action('click', $link->url, 'ratingscales', array('height' => 400, 'width' => 500)));
+    $link->title = get_string('newwindow');
+
+    return $OUTPUT->link($link);
+}
+
 /**
  * Print a message and exit.
  *