From 065ff1b0f2dae07cacee9d7e53edbdc8a541fe1b Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Tue, 16 Aug 2016 20:35:06 +0800
Subject: [PATCH] MDL-54698 core_message: remove 'offline' checkbox for popup
 processor

---
 .../output/preferences/notification_list.php  |  1 +
 .../notification_list_processor.php           |  1 +
 .../preferences_notifications_list.mustache   | 53 +++++++++++--------
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/message/classes/output/preferences/notification_list.php b/message/classes/output/preferences/notification_list.php
index 2cf934ff1a154..517edbc19255c 100644
--- a/message/classes/output/preferences/notification_list.php
+++ b/message/classes/output/preferences/notification_list.php
@@ -147,6 +147,7 @@ public function export_for_template(\renderer_base $output) {
 
             $context['processors'][] = [
                 'displayname' => get_string('pluginname', 'message_'.$processor->name),
+                'ispopup' => ($processor->name == 'popup'),
                 'name' => $processor->name,
                 'hassettings' => !empty($processor->object->config_form($preferences)),
                 'contextid' => $usercontext->id,
diff --git a/message/classes/output/preferences/notification_list_processor.php b/message/classes/output/preferences/notification_list_processor.php
index b334b109767f7..168d379e35746 100644
--- a/message/classes/output/preferences/notification_list_processor.php
+++ b/message/classes/output/preferences/notification_list_processor.php
@@ -116,6 +116,7 @@ public function export_for_template(\renderer_base $output) {
         $defaultpreference = $processor->name.'_provider_'.$preferencebase.'_permitted';
         $context = [
             'displayname' => get_string('pluginname', 'message_'.$processor->name),
+            'ispopup' => ($processor->name == 'popup'),
             'name' => $processor->name,
             'locked' => false,
             'userconfigured' => $processor->object->is_user_configured(),
diff --git a/message/templates/preferences_notifications_list.mustache b/message/templates/preferences_notifications_list.mustache
index 3365b7d87d19f..ecbb25cb8302a 100644
--- a/message/templates/preferences_notifications_list.mustache
+++ b/message/templates/preferences_notifications_list.mustache
@@ -119,8 +119,13 @@
                         <td class="align-bottom">
                             <div class="container-fluid">
                                 <div class="row-fluid">
-                                    <div class="span6">{{#str}} online, message {{/str}}</div>
-                                    <div class="span6">{{#str}} offline, message {{/str}}</div>
+                                    {{#ispopup}}
+                                        <div class="span12">{{#str}} online, message {{/str}}</div>
+                                    {{/ispopup}}
+                                    {{^ispopup}}
+                                        <div class="span6">{{#str}} online, message {{/str}}</div>
+                                        <div class="span6">{{#str}} offline, message {{/str}}</div>
+                                    {{/ispopup}}
                                 </div>
                             </div>
                         </td>
@@ -141,7 +146,7 @@
                                     <form>
                                         <div class="container-fluid">
                                             <div class="row-fluid">
-                                                <div class="span6">
+                                                <div {{#ispopup}}class="span12"{{/ispopup}}{{^ispopup}}class="span6"{{/ispopup}}>
                                                     {{#loggedin}}
                                                         <label class="preference-state"
                                                             data-toggle="tooltip"
@@ -162,27 +167,29 @@
                                                         </label>
                                                     {{/loggedin}}
                                                 </div>
-                                                <div class="span6">
-                                                    {{#loggedoff}}
-                                                        <label class="preference-state"
-                                                            data-toggle="tooltip"
-                                                            title="{{displayname}}"
-                                                            data-state="{{name}}">
+                                                {{^ispopup}}
+                                                    <div class="span6">
+                                                        {{#loggedoff}}
+                                                            <label class="preference-state"
+                                                                data-toggle="tooltip"
+                                                                title="{{displayname}}"
+                                                                data-state="{{name}}">
 
-                                                            <span class="accesshide">{{displayname}}</span>
-                                                            <input type="checkbox"
-                                                                tabindex="-1"
-                                                                class="accesshide"
-                                                                {{#checked}}checked{{/checked}}
-                                                                {{#disableall}}disabled{{/disableall}} />
-                                                            <div class="preference-state-status-container" tabindex="0">
-                                                                <span class="on-text">{{#str}} on, message {{/str}}</span>
-                                                                <span class="off-text">{{#str}} off, message {{/str}}</span>
-                                                                {{> core/loading }}
-                                                            </div>
-                                                        </label>
-                                                    {{/loggedoff}}
-                                                </div>
+                                                                <span class="accesshide">{{displayname}}</span>
+                                                                <input type="checkbox"
+                                                                    tabindex="-1"
+                                                                    class="accesshide"
+                                                                    {{#checked}}checked{{/checked}}
+                                                                    {{#disableall}}disabled{{/disableall}} />
+                                                                <div class="preference-state-status-container" tabindex="0">
+                                                                    <span class="on-text">{{#str}} on, message {{/str}}</span>
+                                                                    <span class="off-text">{{#str}} off, message {{/str}}</span>
+                                                                    {{> core/loading }}
+                                                                </div>
+                                                            </label>
+                                                        {{/loggedoff}}
+                                                    </div>
+                                                {{/ispopup}}
                                             </div>
                                         </div>
                                     </form>