Merge branch 'MDL-57075-master' of git://github.com/ryanwyllie/moodle

This commit is contained in:
Dan Poltawski
2016-11-22 21:14:20 +00:00
2 changed files with 9 additions and 6 deletions
+8 -6
View File
@@ -64,12 +64,14 @@
{{> core/loading }}
</div>
{{$anchor}}
<a class="see-all-link"
href="{{{urls.seeall}}}">
<div class="popover-region-footer-container">
<div class="popover-region-seeall-text">{{#str}} seeall, message {{/str}}</div>
</div>
</a>
{{#urls.seeall}}
<a class="see-all-link"
href="{{{.}}}">
<div class="popover-region-footer-container">
<div class="popover-region-seeall-text">{{#str}} seeall, message {{/str}}</div>
</div>
</a>
{{/urls.seeall}}
{{/anchor}}
</div>
</div>
+1
View File
@@ -61,6 +61,7 @@ function message_popup_render_navbar_output(\renderer_base $renderer) {
$context = [
'userid' => $USER->id,
'urls' => [
'seeall' => (new moodle_url('/message/output/popup/notifications.php'))->out(),
'preferences' => (new moodle_url('/message/notificationpreferences.php', ['userid' => $USER->id]))->out(),
],
];