{{ message.userfullname }}
{{ 'mma.mod_chat.currentusers' | translate }}
-
-
+
{{user.fullname}} diff --git a/www/addons/mod_forum/templates/discussionpost.html b/www/addons/mod_forum/templates/discussionpost.html index 19f3ee7453b..28040f9c0a9 100644 --- a/www/addons/mod_forum/templates/discussionpost.html +++ b/www/addons/mod_forum/templates/discussionpost.html @@ -1,7 +1,7 @@--
+ +
{{title}}
{{title}}
{{post.modified | mmDateDayOrTime}}diff --git a/www/addons/mod_forum/templates/discussions.html b/www/addons/mod_forum/templates/discussions.html index f662d5bdc08..88de9b1bcc0 100644 --- a/www/addons/mod_forum/templates/discussions.html +++ b/www/addons/mod_forum/templates/discussions.html @@ -19,8 +19,8 @@--
+ +
{{discussion.subject}} {{discussion.created | mmDateDayOrTime}}{{discussion.userfullname}}
diff --git a/www/addons/mod_glossary/templates/entry.html b/www/addons/mod_glossary/templates/entry.html index 2f356520641..6d83de0ad84 100644 --- a/www/addons/mod_glossary/templates/entry.html +++ b/www/addons/mod_glossary/templates/entry.html @@ -8,7 +8,7 @@-+
{{ entry.concept }} {{ entry.timemodified | mmDateDayOrTime }}
diff --git a/www/addons/notes/templates/list.html b/www/addons/notes/templates/list.html index 9a22d85b82f..6cfe10c8b61 100644 --- a/www/addons/notes/templates/list.html +++ b/www/addons/notes/templates/list.html @@ -9,8 +9,8 @@{{ entry.userfullname }} -diff --git a/www/addons/notifications/controllers/list.js b/www/addons/notifications/controllers/list.js index 7c8fc21a8c4..b8b53bd2366 100644 --- a/www/addons/notifications/controllers/list.js +++ b/www/addons/notifications/controllers/list.js @@ -21,12 +21,14 @@ angular.module('mm.addons.notifications') * @ngdoc controller * @name mmaNotificationsListCtrl */ -.controller('mmaNotificationsListCtrl', function($scope, $mmUtil, $mmaNotifications, mmaNotificationsListLimit) { +.controller('mmaNotificationsListCtrl', function($scope, $mmUtil, $mmaNotifications, mmaNotificationsListLimit, + mmUserProfileState) { var readCount = 0, unreadCount = 0; $scope.notifications = []; + $scope.userStateName = mmUserProfileState; // Convenience function to get notifications. Get unread notifications first. function fetchNotifications(refresh) { diff --git a/www/addons/notifications/services/notifications.js b/www/addons/notifications/services/notifications.js index 6ef559a0ab8..20baaedc5a4 100644 --- a/www/addons/notifications/services/notifications.js +++ b/www/addons/notifications/services/notifications.js @@ -21,7 +21,7 @@ angular.module('mm.addons.notifications') * @ngdoc service * @name $mmaNotifications */ -.factory('$mmaNotifications', function($q, $log, $mmSite, $mmSitesManager, mmaNotificationsListLimit) { +.factory('$mmaNotifications', function($q, $log, $mmSite, $mmSitesManager, $mmUser, mmaNotificationsListLimit) { $log = $log.getInstance('$mmaNotifications'); @@ -42,6 +42,11 @@ angular.module('mm.addons.notifications') if (cid && cid[1]) { notification.courseid = cid[1]; } + + // Try to get the profile picture of the user. + $mmUser.getProfile(notification.useridfrom, notification.courseid, true).then(function(user) { + notification.profileimageurlfrom = user.profileimageurl; + }); }); } @@ -52,7 +57,7 @@ angular.module('mm.addons.notifications') */ function getNotificationsCacheKey() { return 'mmaNotifications:list'; - }; + } /** * Get notifications from site. diff --git a/www/addons/notifications/templates/list.html b/www/addons/notifications/templates/list.html index 8bfb9a5c9ea..4e880212088 100644 --- a/www/addons/notifications/templates/list.html +++ b/www/addons/notifications/templates/list.html @@ -4,7 +4,9 @@-
+ +
{{note.lastmodified | mmDateDayOrTime}}{{note.userfullname}}
- ++diff --git a/www/addons/participants/templates/list.html b/www/addons/participants/templates/list.html index ba1d39eff3c..ff3ca689573 100644 --- a/www/addons/participants/templates/list.html +++ b/www/addons/participants/templates/list.html @@ -8,7 +8,7 @@+
{{notification.userfromfullname}}
{{notification.timecreated | mmDateDayOrTime}}
-
-
+
{{participant.fullname}}
diff --git a/www/core/components/login/templates/sites.html b/www/core/components/login/templates/sites.html
index 7782e662607..beecdfc770e 100644
--- a/www/core/components/login/templates/sites.html
+++ b/www/core/components/login/templates/sites.html
@@ -7,7 +7,7 @@
- +
{{site.fullname}}
{{site.sitename}} {{site.siteurl}}
diff --git a/www/core/components/sidemenu/templates/menu.html b/www/core/components/sidemenu/templates/menu.html index 9c145b9d8e1..94c12e9e341 100644 --- a/www/core/components/sidemenu/templates/menu.html +++ b/www/core/components/sidemenu/templates/menu.html @@ -19,7 +19,7 @@-diff --git a/www/core/components/user/templates/profile.html b/www/core/components/user/templates/profile.html index 2ec7b72f7fd..790295da69b 100644 --- a/www/core/components/user/templates/profile.html +++ b/www/core/components/user/templates/profile.html @@ -5,8 +5,8 @@+
{{siteinfo.fullname}}
{{siteinfo.sitename}} --
+ +
{{user.fullname}} diff --git a/www/core/lang/en.json b/www/core/lang/en.json index 40b0a700f07..80f106652de 100644 --- a/www/core/lang/en.json +++ b/www/core/lang/en.json @@ -88,6 +88,7 @@ "openinbrowser": "Open in browser", "percentagenumber": "{{$a}}%", "phone": "Phone", + "pictureof": "Picture of {{$a}}", "previous": "Previous", "pulltorefresh": "Pull to refresh", "refresh": "Refresh", -
-