MDL-47361 tooL_monitor: string and UI changes

moodle · Nov 3, 2014 · 7293e97 · 7293e97
1 parent eb0aabd
commit 7293e97
Show file tree

Hide file tree

Showing 14 changed files with 215 additions and 465 deletions.
diff --git a/admin/tool/monitor/classes/output/helpicon/renderable.php b/admin/tool/monitor/classes/output/helpicon/renderable.php
diff --git a/admin/tool/monitor/classes/output/helpicon/renderer.php b/admin/tool/monitor/classes/output/helpicon/renderer.php
diff --git a/admin/tool/monitor/classes/output/managerules/renderable.php b/admin/tool/monitor/classes/output/managerules/renderable.php
@@ -66,13 +66,13 @@ public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage
 
         $this->set_attribute('id', 'toolmonitorrules_table');
         $this->set_attribute('class', 'toolmonitor managerules generaltable generalbox');
-        $this->define_columns(array('name', 'description', 'context', 'plugin', 'eventname', 'filters', 'manage'));
+        $this->define_columns(array('name', 'description', 'course', 'plugin', 'eventname', 'filters', 'manage'));
         $this->define_headers(array(
-                get_string('name'),
+                get_string('rulename', 'tool_monitor'),
                 get_string('description'),
-                get_string('context', 'tool_monitor'),
-                get_string('plugin'),
-                get_string('eventname'),
+                get_string('course'),
+                get_string('area', 'tool_monitor'),
+                get_string('event', 'tool_monitor'),
                 get_string('frequency', 'tool_monitor'),
                 get_string('manage', 'tool_monitor'),
             )
@@ -93,7 +93,6 @@ public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage
      * Generate content for name column.
      *
      * @param \tool_monitor\rule $rule rule object
-     *
      * @return string html used to display the column field.
      */
     public function col_name(\tool_monitor\rule $rule) {
@@ -104,18 +103,33 @@ public function col_name(\tool_monitor\rule $rule) {
      * Generate content for description column.
      *
      * @param \tool_monitor\rule $rule rule object
-     *
      * @return string html used to display the column field.
      */
     public function col_description(\tool_monitor\rule $rule) {
         return $rule->get_description($this->context);
     }
 
     /**
-     * Generate content for plugin column.
+     * Generate content for course column.
      *
      * @param \tool_monitor\rule $rule rule object
+     * @return string html used to display the context column field.
+     */
+    public function col_course(\tool_monitor\rule $rule) {
+        $coursename = $rule->get_course_name($this->context);
+
+        $courseid = $rule->courseid;
+        if (empty($courseid)) {
+            return $coursename;
+        } else {
+            return \html_writer::link(new \moodle_url('/course/view.php', array('id' => $this->courseid)), $coursename);
+        }
+    }
+
+    /**
+     * Generate content for plugin column.
      *
+     * @param \tool_monitor\rule $rule rule object
      * @return string html used to display the column field.
      */
     public function col_plugin(\tool_monitor\rule $rule) {
@@ -126,7 +140,6 @@ public function col_plugin(\tool_monitor\rule $rule) {
      * Generate content for eventname column.
      *
      * @param \tool_monitor\rule $rule rule object
-     *
      * @return string html used to display the column field.
      */
     public function col_eventname(\tool_monitor\rule $rule) {
@@ -137,7 +150,6 @@ public function col_eventname(\tool_monitor\rule $rule) {
      * Generate content for filters column.
      *
      * @param \tool_monitor\rule $rule rule object
-     *
      * @return string html used to display the filters column field.
      */
     public function col_filters(\tool_monitor\rule $rule) {
@@ -148,7 +160,6 @@ public function col_filters(\tool_monitor\rule $rule) {
      * Generate content for manage column.
      *
      * @param \tool_monitor\rule $rule rule object
-     *
      * @return string html used to display the manage column field.
      */
     public function col_manage(\tool_monitor\rule $rule) {
@@ -197,15 +208,4 @@ public function query_db($pagesize, $useinitialsbar = true) {
             $this->initialbars($total > $pagesize);
         }
     }
-
-    /**
-     * Generate content for context column.
-     *
-     * @param \tool_monitor\rule $rule rule object
-     *
-     * @return string html used to display the context column field.
-     */
-    public function col_context(\tool_monitor\rule $rule) {
-        return ($rule->courseid == 0) ? get_string('system', 'tool_monitor') : get_string('course');
-    }
 }