moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-57831' of git://github.com/paulholden/moodle

Browse source
This commit is contained in:
Sara Arjona 2021-04-22 18:13:04 +02:00
commit 80b1bb4751
6 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/tool/monitor/tests/behat/subscription.feature
View file

@ -102,7 +102,7 @@ Feature: tool_monitor_subscriptions
Given I log in as "admin" Given I log in as "admin"
And I follow "Preferences" in the user menu And I follow "Preferences" in the user menu
And I click on "Notification preferences" "link" in the "#page-content" "css_element" And I click on "Notification preferences" "link" in the "#page-content" "css_element"
And I click on "//td[@data-processor-name='popup']//label[@class='preference-state']" "xpath_element" in the "Notifications of rule subscriptions" "table_row" And I click on "//td[@data-processor-name='popup']//label[@data-state='loggedin']" "xpath_element" in the "Notifications of rule subscriptions" "table_row"
And I wait until the page is ready And I wait until the page is ready
And I follow "Preferences" in the user menu And I follow "Preferences" in the user menu
And I follow "Event monitoring" And I follow "Event monitoring"
@ -123,7 +123,7 @@ Feature: tool_monitor_subscriptions
Given I log in as "teacher1" Given I log in as "teacher1"
And I follow "Preferences" in the user menu And I follow "Preferences" in the user menu
And I click on "Notification preferences" "link" in the "#page-content" "css_element" And I click on "Notification preferences" "link" in the "#page-content" "css_element"
And I click on "//td[@data-processor-name='popup']//label[@class='preference-state']" "xpath_element" in the "Notifications of rule subscriptions" "table_row" And I click on "//td[@data-processor-name='popup']//label[@data-state='loggedin']" "xpath_element" in the "Notifications of rule subscriptions" "table_row"
And I wait until the page is ready And I wait until the page is ready
And I follow "Preferences" in the user menu And I follow "Preferences" in the user menu
And I follow "Event monitoring" And I follow "Event monitoring"

2
message/templates/notification_preferences.mustache
View file

@ -84,7 +84,7 @@
{{> core/loading }} {{> core/loading }}
</div> </div>
<div class="preferences-container {{#disableall}}disabled{{/disableall}}" data-user-id="{{userid}}"> <div class="preferences-container {{#disableall}}disabled{{/disableall}}" data-user-id="{{userid}}">
<table class="table table-hover preference-table"> <table class="table preference-table">
<thead> <thead>
<tr> <tr>
<th>{{displayname}}</th> <th>{{displayname}}</th>

24
message/templates/notification_preferences_component_notification.mustache
View file

@ -71,21 +71,15 @@
{{#loggedin}} {{#loggedin}}
{{< core/hover_tooltip }} {{< core/hover_tooltip }}
{{$anchor}} {{$anchor}}
<label class="preference-state" <label class="custom-control custom-switch"
title="{{displayname}}" title="{{displayname}}"
data-state="{{name}}"> data-state="{{name}}">
<span class="accesshide">{{displayname}}</span> <span class="accesshide">{{displayname}}</span>
<input type="checkbox" <input type="checkbox"
tabindex="-1" class="custom-control-input"
class="accesshide"
{{#checked}}checked{{/checked}} {{#checked}}checked{{/checked}}
{{#disableall}}disabled{{/disableall}} /> {{#disableall}}disabled{{/disableall}} />
<div class="preference-state-status-container" tabindex="0"> <span class="custom-control-label d-block"></span>
<span class="on-text">{{#str}} on, message {{/str}}</span>
<span class="off-text">{{#str}} off, message {{/str}}</span>
{{> core/loading }}
</div>
</label> </label>
{{/anchor}} {{/anchor}}
{{$tooltip}}{{displayname}}{{/tooltip}} {{$tooltip}}{{displayname}}{{/tooltip}}
@ -96,21 +90,15 @@
{{#loggedoff}} {{#loggedoff}}
{{< core/hover_tooltip }} {{< core/hover_tooltip }}
{{$anchor}} {{$anchor}}
<label class="preference-state" <label class="custom-control custom-switch"
title="{{displayname}}" title="{{displayname}}"
data-state="{{name}}"> data-state="{{name}}">
<span class="accesshide">{{displayname}}</span> <span class="accesshide">{{displayname}}</span>
<input type="checkbox" <input type="checkbox"
tabindex="-1" class="custom-control-input"
class="accesshide"
{{#checked}}checked{{/checked}} {{#checked}}checked{{/checked}}
{{#disableall}}disabled{{/disableall}} /> {{#disableall}}disabled{{/disableall}} />
<div class="preference-state-status-container" tabindex="0"> <span class="custom-control-label d-block"></span>
<span class="on-text">{{#str}} on, message {{/str}}</span>
<span class="off-text">{{#str}} off, message {{/str}}</span>
{{> core/loading }}
</div>
</label> </label>
{{/anchor}} {{/anchor}}
{{$tooltip}}{{displayname}}{{/tooltip}} {{$tooltip}}{{displayname}}{{/tooltip}}

8
theme/boost/scss/moodle/message.scss
View file

@ -48,18 +48,18 @@
} }
} }
tr { tr {
th {
border-left: 1px solid $border-color;
}
td { td {
&:not(:first-child) { &:not(:first-child) {
width: 150px; width: 150px;
text-align: center; text-align: center;
} }
&:nth-child(even) { &:nth-child(even) {
background-color: #f7f7f7; border: 1px solid $border-color;
} }
} }
th:nth-child(even) {
background-color: #f7f7f7;
}
} }
.preference-row { .preference-row {
.hover-tooltip-container { .hover-tooltip-container {

6
theme/boost/style/moodle.css
View file

@ -15095,13 +15095,13 @@ a.ygtvspacer:hover {
display: none; } display: none; }
.preferences-container .preference-table thead th.unconfigured .config-warning { .preferences-container .preference-table thead th.unconfigured .config-warning {
display: inline-block; } display: inline-block; }
.preferences-container .preference-table tr th {
border-left: 1px solid #dee2e6; }
.preferences-container .preference-table tr td:not(:first-child) { .preferences-container .preference-table tr td:not(:first-child) {
width: 150px; width: 150px;
text-align: center; } text-align: center; }
.preferences-container .preference-table tr td:nth-child(even) { .preferences-container .preference-table tr td:nth-child(even) {
background-color: #f7f7f7; } border: 1px solid #dee2e6; }
.preferences-container .preference-table tr th:nth-child(even) {
background-color: #f7f7f7; }
.preferences-container .preference-table .preference-row .hover-tooltip-container { .preferences-container .preference-table .preference-row .hover-tooltip-container {
display: inline-block; } display: inline-block; }
.preferences-container .preference-table .preference-row .preference-name { .preferences-container .preference-table .preference-row .preference-name {

6
theme/classic/style/moodle.css
View file

@ -15319,13 +15319,13 @@ a.ygtvspacer:hover {
display: none; } display: none; }
.preferences-container .preference-table thead th.unconfigured .config-warning { .preferences-container .preference-table thead th.unconfigured .config-warning {
display: inline-block; } display: inline-block; }
.preferences-container .preference-table tr th {
border-left: 1px solid #dee2e6; }
.preferences-container .preference-table tr td:not(:first-child) { .preferences-container .preference-table tr td:not(:first-child) {
width: 150px; width: 150px;
text-align: center; } text-align: center; }
.preferences-container .preference-table tr td:nth-child(even) { .preferences-container .preference-table tr td:nth-child(even) {
background-color: #f7f7f7; } border: 1px solid #dee2e6; }
.preferences-container .preference-table tr th:nth-child(even) {
background-color: #f7f7f7; }
.preferences-container .preference-table .preference-row .hover-tooltip-container { .preferences-container .preference-table .preference-row .hover-tooltip-container {
display: inline-block; } display: inline-block; }
.preferences-container .preference-table .preference-row .preference-name { .preferences-container .preference-table .preference-row .preference-name {