From 3df3c6773b508dcbe834706abfb54a493e9af69b Mon Sep 17 00:00:00 2001
From: Aparup Banerjee <aparup@moodle.com>
Date: Fri, 5 Oct 2012 10:58:28 +0800
Subject: [PATCH] MDL-34992 message : improved component sorting and some minor
 code clean up.

---
 message/renderer.php          | 9 +++++----
 theme/standard/style/core.css | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/message/renderer.php b/message/renderer.php
index 7e677465427..f92022a26c6 100644
--- a/message/renderer.php
+++ b/message/renderer.php
@@ -227,16 +227,17 @@ class core_message_renderer extends plugin_renderer_base {
         $output .= html_writer::nonempty_tag('legend', get_string('providers_config', 'message'), array('class' => 'ftoggler'));
 
         foreach($providers as $provider) {
-            $components[] = $provider->component;
+            if($provider->component != 'moodle') {
+                $components[] = $provider->component;
+            }
         }
         // Lets arrange by components so that core settings (moodle) appear as the first table.
         $components = array_unique($components);
         asort($components);
-        array_pop($components); //drop moodle! omg!
         array_unshift($components, 'moodle'); // pop it in front! phew!
         asort($providers);
 
-        $number_procs = count($processors);
+        $numprocs = count($processors);
         // Display the messaging options table(s)
         foreach ($components as $component) {
             $table = new html_table();
@@ -264,7 +265,7 @@ class core_message_renderer extends plugin_renderer_base {
                 $providername = get_string('messageprovider:'.$provider->name, $provider->component);
                 $providercell = new html_table_cell($providername);
                 $providercell->header = true;
-                $providercell->colspan = $number_procs;
+                $providercell->colspan = $numprocs;
                 $providercell->attributes['class'] = 'c0';
                 $headerrow->cells = array($providercell);
                 $table->data[] = $headerrow;
diff --git a/theme/standard/style/core.css b/theme/standard/style/core.css
index 3b3fdbc3dfa..7e24f076938 100644
--- a/theme/standard/style/core.css
+++ b/theme/standard/style/core.css
@@ -450,7 +450,7 @@ table#tag-management-list {margin: 10px auto;width: 80%;}
 .portfolio-add-icon {margin-left:5px;}
 
 /* Messaging options */
-#page-message-edit .mform fieldset div.messagesettingcomponent {float: left; }
+#page-message-edit .mform fieldset div.messagesettingcomponent {float: left;}
 #page-message-edit table.generaltable th.c0 {text-align: left;}
 #page-message-edit table.generaltable td.c0 {text-align: right;}
 #page-message-edit table.generaltable td.disallowed {text-align: center;vertical-align:middle;}