Commit 49fa8fa1 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

More descriptive link text on some notifications


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 8e568b9e
...@@ -93,7 +93,6 @@ To unsubscribe from this %s, visit: ...@@ -93,7 +93,6 @@ To unsubscribe from this %s, visit:
$string['forumsuccessfulsubscribe'] = 'Forum subscribed successfully'; $string['forumsuccessfulsubscribe'] = 'Forum subscribed successfully';
$string['forumsuccessfulunsubscribe'] = 'Forum unsubscribed successfully'; $string['forumsuccessfulunsubscribe'] = 'Forum unsubscribed successfully';
$string['gotoforums'] = 'Go to forums'; $string['gotoforums'] = 'Go to forums';
$string['gototopic'] = 'Go to topic';
$string['groupadmins'] = 'Group administrators'; $string['groupadmins'] = 'Group administrators';
$string['groupadminlist'] = 'Group admins:'; $string['groupadminlist'] = 'Group admins:';
$string['Key'] = 'Key'; $string['Key'] = 'Key';
......
...@@ -505,7 +505,7 @@ class ActivityTypeInteractionForumNewPost extends ActivityTypePlugin { ...@@ -505,7 +505,7 @@ class ActivityTypeInteractionForumNewPost extends ActivityTypePlugin {
$this->message = $textbody; $this->message = $textbody;
$this->url = $postlink; $this->url = $postlink;
$this->add_urltext(array( $this->add_urltext(array(
'key' => 'gototopic', 'key' => 'Topic',
'section' => 'interaction.forum' 'section' => 'interaction.forum'
)); ));
......
...@@ -661,6 +661,10 @@ class ActivityTypeUsermessage extends ActivityType { ...@@ -661,6 +661,10 @@ class ActivityTypeUsermessage extends ActivityType {
$this->fromuser = $this->userfrom; $this->fromuser = $this->userfrom;
} }
$this->users = activity_get_users($this->get_id(), array($this->userto)); $this->users = activity_get_users($this->get_id(), array($this->userto));
$this->add_urltext(array(
'key' => 'Reply',
'section' => 'group',
));
} }
public function get_subject($user) { public function get_subject($user) {
...@@ -722,6 +726,7 @@ class ActivityTypeWatchlist extends ActivityType { ...@@ -722,6 +726,7 @@ class ActivityTypeWatchlist extends ActivityType {
$this->users = get_records_sql_array($sql, $this->users = get_records_sql_array($sql,
array(get_config('wwwroot') . 'view/view.php?id=' array(get_config('wwwroot') . 'view/view.php?id='
. $this->view, $this->get_id(), $this->view)); . $this->view, $this->get_id(), $this->view));
$this->add_urltext(array('key' => 'View', 'section' => 'view'));
} }
public function get_subject($user) { public function get_subject($user) {
...@@ -805,6 +810,7 @@ class ActivityTypeViewaccess extends ActivityType { ...@@ -805,6 +810,7 @@ class ActivityTypeViewaccess extends ActivityType {
activity_get_viewaccess_users($this->view, $this->owner, $this->get_id()), activity_get_viewaccess_users($this->view, $this->owner, $this->get_id()),
$this->oldusers $this->oldusers
); );
$this->add_urltext(array('key' => 'View', 'section' => 'view'));
} }
public function get_subject($user) { public function get_subject($user) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{if $item->message} {if $item->message}
<a href="" onclick="showHideMessage({$item->id}); return false;">{$item->subject|escape}</a> <a href="" onclick="showHideMessage({$item->id}); return false;">{$item->subject|escape}</a>
<div id="message-{$item->id}" class="hidden">{$item->message|clean_html} <div id="message-{$item->id}" class="hidden">{$item->message|clean_html}
{if $item->url}<br><a href="{$item->url|escape}" class="s">{if $item->urltext}{$item->urltext|escape}{else}{str tag="more..."}{/if}</a>{/if} {if $item->url}<br><a href="{$item->url|escape}" class="s">{if $item->urltext}{$item->urltext|escape} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
</div> </div>
{elseif $item->url} {elseif $item->url}
<a href="{$item->url|escape}">{$item->subject|escape}</a> <a href="{$item->url|escape}">{$item->subject|escape}</a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment