From 9c6c29932a7f34fff2ca0c6655a79d4b4f432001 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Tue, 22 Nov 2016 10:50:51 +0800
Subject: [PATCH] MDL-56391 core_message: addressed confusing links on the
 profile page

1) Use the string 'Send message' rather than 'View messages'.
2) Removed the 'View messages' string as it is no longer used
   and was introduced in the new messaging UI.
3) Removed the 'View profile' link and made the user's profile
   picture a link to their profile instead, this was only
   recently plausible because of MDL-57036.
---
 lang/en/message.php                             |  1 -
 message/templates/message_area_profile.mustache | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/en/message.php b/lang/en/message.php
index 49bd897dfe8..159aea2c925 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -123,7 +123,6 @@ $string['unreadnewmessage'] = 'New message from {$a}';
 $string['userisblockingyou'] = 'This user has blocked you from sending messages to them';
 $string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.';
 $string['viewinganotherusersmessagearea'] = 'You are viewing another user\'s message area.';
-$string['viewmessages'] = 'View messages';
 $string['viewmessageswith'] = 'View messages with {$a}';
 $string['viewnotificationresource'] = 'Go to: {$a}';
 $string['viewunreadmessageswith'] = 'View unread messages with {$a}';
diff --git a/message/templates/message_area_profile.mustache b/message/templates/message_area_profile.mustache
index 13250a3ce40..14903fa863b 100644
--- a/message/templates/message_area_profile.mustache
+++ b/message/templates/message_area_profile.mustache
@@ -21,7 +21,11 @@
 </div>
 <div class="profile" data-userid="{{userid}}" data-region="profile">
     <div class="user-container">
-        <img class="profile-picture" src="{{profileimageurl}}" alt="" />
+        <a data-action="profile-view" href="#">
+            <img class="profile-picture" src="{{profileimageurl}}"
+                 alt="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
+                 title="{{#str}}pictureof, moodle, {{fullname}}{{/str}}" />
+        </a>
         <div class="name-container">
             <div class="name">{{fullname}}</div>
             <div class="status {{#isonline}}online{{/isonline}}">
@@ -37,10 +41,7 @@
     </div>
     <div class="actions">
         <div class="separator">
-            <a data-action="profile-view" href="#">{{#str}}viewprofile{{/str}}</a>
-        </div>
-        <div class="separator">
-            <a data-action="profile-send-message" href="#">{{#str}}viewmessages, message{{/str}}</a>
+            <a data-action="profile-send-message" href="#">{{#str}}sendmessage, message{{/str}}</a>
         </div>
         <div class="separator">
             {{#isblocked}}