Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
49fa8fa1
Commit
49fa8fa1
authored
May 05, 2010
by
Richard Mansfield
Browse files
More descriptive link text on some notifications
Signed-off-by:
Richard Mansfield
<
richardm@catalyst.net.nz
>
parent
8e568b9e
Changes
4
Hide whitespace changes
Inline
Side-by-side
htdocs/interaction/forum/lang/en.utf8/interaction.forum.php
View file @
49fa8fa1
...
@@ -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'
;
...
...
htdocs/interaction/forum/lib.php
View file @
49fa8fa1
...
@@ -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'
=>
'
gotot
opic'
,
'key'
=>
'
T
opic'
,
'section'
=>
'interaction.forum'
'section'
=>
'interaction.forum'
));
));
...
...
htdocs/lib/activity.php
View file @
49fa8fa1
...
@@ -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
)
{
...
...
htdocs/theme/raw/templates/account/activity/activitylist.tpl
View file @
49fa8fa1
...
@@ -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
}
»
{
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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment