L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60522-32' of https://github.com/Kathrin84/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2017-10-31 08:21:26 +08:00
parent 9a11ca8fd6 966c52eb3d
commit eaea57597c
2 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/output/popup/templates/message_popover.mustache
+14 -26
View File
@@ -53,33 +53,21 @@
{{$headertext}}{{#str}} messages, message {{/str}}{{/headertext}}
{{$headeractions}}
<div class="newmessage-link">
{{$anchor}}
<a href="{{{urls.writeamessage}}}">{{#str}} newmessage, message {{/str}}
</a>
{{/anchor}}
<a href="{{{urls.writeamessage}}}">{{#str}} newmessage, message {{/str}}
</a>
</div>
{{< core/hover_tooltip }}
{{$anchor}}
<a class="mark-all-read-button"
href="#"
role="button"
title="{{#str}} markallread {{/str}}"
data-action="mark-all-read">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
{{/anchor}}
{{$tooltip}}{{#str}} markallread {{/str}}{{/tooltip}}
{{/ core/hover_tooltip }}
{{< core/hover_tooltip }}
{{$anchor}}
<a href="{{{urls.preferences}}}"
title="{{#str}} messagepreferences, message {{/str}}">
{{#pix}} i/settings, core, {{#str}} messagepreferences, message {{/str}} {{/pix}}
</a>
{{/anchor}}
{{$tooltip}}{{#str}} messagepreferences, message {{/str}}{{/tooltip}}
{{/ core/hover_tooltip }}
<a class="mark-all-read-button"
href="#"
role="button"
title="{{#str}} markallread {{/str}}"
data-action="mark-all-read">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
<a href="{{{urls.preferences}}}"
title="{{#str}} messagepreferences, message {{/str}}">
{{#pix}} i/settings, core, {{#str}} messagepreferences, message {{/str}} {{/pix}}
</a>
{{/headeractions}}
{{$content}}
message/output/popup/templates/notification_popover.mustache
+12 -22
View File
@@ -52,28 +52,18 @@
{{$headertext}}{{#str}} notifications, message {{/str}}{{/headertext}}
{{$headeractions}}
{{< core/hover_tooltip }}
{{$anchor}}
<a class="mark-all-read-button"
href="#"
title="{{#str}} markallread {{/str}}"
data-action="mark-all-read"
role="button">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
{{/anchor}}
{{$tooltip}}{{#str}} markallread {{/str}}{{/tooltip}}
{{/ core/hover_tooltip }}
{{< core/hover_tooltip }}
{{$anchor}}
<a href="{{{urls.preferences}}}"
title="{{#str}} notificationpreferences, message {{/str}}">
{{#pix}} i/settings, core, {{#str}} notificationpreferences, message {{/str}} {{/pix}}
</a>
{{/anchor}}
{{$tooltip}}{{#str}} notificationpreferences, message {{/str}}{{/tooltip}}
{{/ core/hover_tooltip }}
<a class="mark-all-read-button"
href="#"
title="{{#str}} markallread {{/str}}"
data-action="mark-all-read"
role="button">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
<a href="{{{urls.preferences}}}"
title="{{#str}} notificationpreferences, message {{/str}}">
{{#pix}} i/settings, core, {{#str}} notificationpreferences, message {{/str}} {{/pix}}
</a>
{{/headeractions}}
{{$content}}