aboutsummaryrefslogtreecommitdiff
path: root/mod/messages/pages
diff options
context:
space:
mode:
Diffstat (limited to 'mod/messages/pages')
-rw-r--r--mod/messages/pages/messages/inbox.php2
-rw-r--r--mod/messages/pages/messages/read.php15
-rw-r--r--mod/messages/pages/messages/send.php3
-rw-r--r--mod/messages/pages/messages/sent.php2
4 files changed, 12 insertions, 10 deletions
diff --git a/mod/messages/pages/messages/inbox.php b/mod/messages/pages/messages/inbox.php
index 4b2d11bbf..fdfc20c43 100644
--- a/mod/messages/pages/messages/inbox.php
+++ b/mod/messages/pages/messages/inbox.php
@@ -15,6 +15,8 @@ if (!$page_owner) {
elgg_push_breadcrumb(elgg_echo('messages:inbox'));
+elgg_register_title_button();
+
$title = elgg_echo('messages:user', array($page_owner->name));
$list = elgg_list_entities_from_metadata(array(
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index c5d1d4941..310485ee2 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -26,24 +26,24 @@ if ($page_owner->getGUID() == $message->toId) {
}
elgg_push_breadcrumb($title);
-$buttons = '';
-$content = elgg_view_entity($message, true);
+$content = elgg_view_entity($message, array('full_view' => true));
if ($inbox) {
$form_params = array(
'id' => 'messages-reply-form',
- 'class' => 'hidden',
+ 'class' => 'hidden mtl',
'action' => 'action/messages/send',
);
$body_params = array('message' => $message);
$content .= elgg_view_form('messages/reply', $form_params, $body_params);
if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
- $buttons = elgg_view('output/url', array(
+ elgg_register_menu_item('title', array(
+ 'name' => 'reply',
+ 'href' => '#messages-reply-form',
'text' => elgg_echo('messages:answer'),
- 'class' => 'elgg-button elgg-button-action',
- 'id' => 'messages-show-reply',
+ 'link_class' => 'elgg-button elgg-button-action',
+ 'rel' => 'toggle',
));
- $buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
}
}
@@ -51,7 +51,6 @@ $body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'buttons' => $buttons,
));
echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php
index 884c20cca..1b821d185 100644
--- a/mod/messages/pages/messages/send.php
+++ b/mod/messages/pages/messages/send.php
@@ -14,7 +14,7 @@ $title = elgg_echo('messages:add');
elgg_push_breadcrumb($title);
-$params = messages_prepare_form_vars(get_input('send_to'));
+$params = messages_prepare_form_vars((int)get_input('send_to'));
$params['friends'] = $page_owner->getFriends();
$content = elgg_view_form('messages/send', array(), $params);
@@ -22,7 +22,6 @@ $body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'buttons' => '',
));
echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/sent.php b/mod/messages/pages/messages/sent.php
index f884643e0..af06ab273 100644
--- a/mod/messages/pages/messages/sent.php
+++ b/mod/messages/pages/messages/sent.php
@@ -15,6 +15,8 @@ if (!$page_owner) {
elgg_push_breadcrumb(elgg_echo('messages:sent'));
+elgg_register_title_button();
+
$title = elgg_echo('messages:sentmessages', array($page_owner->name));
$list = elgg_list_entities_from_metadata(array(