MDL-54698 core_message: remove 'offline' checkbox for popup processor

This commit is contained in:
Mark Nelson
2016-10-07 16:26:40 +08:00
parent 812cc6f63f
commit 065ff1b0f2
3 changed files with 32 additions and 23 deletions
@@ -147,6 +147,7 @@ class notification_list implements templatable, renderable {
$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,
@@ -116,6 +116,7 @@ class notification_list_processor implements templatable, renderable {
$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(),
@@ -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>