diff options
Diffstat (limited to 'mod/messages/views/default')
| -rw-r--r-- | mod/messages/views/default/forms/messages/process.php | 43 | ||||
| -rw-r--r-- | mod/messages/views/default/forms/messages/reply.php | 38 | ||||
| -rw-r--r-- | mod/messages/views/default/forms/messages/send.php | 54 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/css.php | 114 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/forms/reply.php | 44 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/forms/send.php | 70 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/forms/view.php | 22 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/js.php | 7 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/menu.php | 12 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/messages.php | 117 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/topbar.php | 26 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/view.php | 121 | ||||
| -rw-r--r-- | mod/messages/views/default/object/messages.php | 86 |
13 files changed, 272 insertions, 482 deletions
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php new file mode 100644 index 000000000..cb30792e9 --- /dev/null +++ b/mod/messages/views/default/forms/messages/process.php @@ -0,0 +1,43 @@ +<?php +/** + * Messages folder view (inbox, sent) + * + * Provides form body for mass deleting messages + * + * @uses $vars['list'] List of messages + * + */ + +$messages = $vars['list']; +if (!$messages) { + echo elgg_echo('messages:nomessages'); + return true; +} + +echo '<div class="messages-container">'; +echo $messages; +echo '</div>'; + +echo '<div class="elgg-foot messages-buttonbank">'; + +echo elgg_view('input/submit', array( + 'value' => elgg_echo('delete'), + 'name' => 'delete', + 'class' => 'elgg-button-delete elgg-requires-confirmation', + 'title' => elgg_echo('deleteconfirm:plural'), +)); + +if ($vars['folder'] == "inbox") { + echo elgg_view('input/submit', array( + 'value' => elgg_echo('messages:markread'), + 'name' => 'read', + )); +} + +echo elgg_view('input/button', array( + 'value' => elgg_echo('messages:toggle'), + 'class' => 'elgg-button elgg-button-cancel', + 'id' => 'messages-toggle', +)); + +echo '</div>'; diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php new file mode 100644 index 000000000..9f3f4b57e --- /dev/null +++ b/mod/messages/views/default/forms/messages/reply.php @@ -0,0 +1,38 @@ +<?php +/** + * Reply form + * + * @uses $vars['message'] + */ + +// fix for RE: RE: RE: that builds on replies +$reply_title = $vars['message']->title; +if (strncmp($reply_title, "RE:", 3) != 0) { + $reply_title = "RE: " . $reply_title; +} + +echo elgg_view('input/hidden', array( + 'name' => 'recipient_guid', + 'value' => $vars['message']->fromId, +)); +?> + +<div> + <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> + <?php echo elgg_view('input/text', array( + 'name' => 'subject', + 'value' => $reply_title, + )); + ?> +</div> +<div> + <label><?php echo elgg_echo("messages:message"); ?>:</label> + <?php echo elgg_view("input/longtext", array( + 'name' => 'body', + 'value' => '', + )); + ?> +</div> +<div class="elgg-foot"> + <?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?> +</div>
\ No newline at end of file diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php new file mode 100644 index 000000000..5b7e7830e --- /dev/null +++ b/mod/messages/views/default/forms/messages/send.php @@ -0,0 +1,54 @@ +<?php +/** + * Compose message form + * + * @package ElggMessages + * @uses $vars['friends'] + */ + +$recipient_guid = elgg_extract('recipient_guid', $vars, 0); +$subject = elgg_extract('subject', $vars, ''); +$body = elgg_extract('body', $vars, ''); + +$recipients_options = array(); +foreach ($vars['friends'] as $friend) { + $recipients_options[$friend->guid] = $friend->name; +} + +if (!array_key_exists($recipient_guid, $recipients_options)) { + $recipient = get_entity($recipient_guid); + if (elgg_instanceof($recipient, 'user')) { + $recipients_options[$recipient_guid] = $recipient->name; + } +} + +$recipient_drop_down = elgg_view('input/dropdown', array( + 'name' => 'recipient_guid', + 'value' => $recipient_guid, + 'options_values' => $recipients_options, +)); + +?> +<div> + <label><?php echo elgg_echo("messages:to"); ?>: </label> + <?php echo $recipient_drop_down; ?> +</div> +<div> + <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> + <?php echo elgg_view('input/text', array( + 'name' => 'subject', + 'value' => $subject, + )); + ?> +</div> +<div> + <label><?php echo elgg_echo("messages:message"); ?>:</label> + <?php echo elgg_view("input/longtext", array( + 'name' => 'body', + 'value' => $body, + )); + ?> +</div> +<div class="elgg-foot"> + <?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?> +</div> diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php index 95bcba108..f304e0f15 100644 --- a/mod/messages/views/default/messages/css.php +++ b/mod/messages/views/default/messages/css.php @@ -6,84 +6,58 @@ */ ?> -/* messages/new messages icon & counter in elgg_topbar */ -a.privatemessages { - background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px; - padding-left:16px; - margin:4px 15px 0 5px; - cursor:pointer; +.messages-container { + min-height: 200px; } -a.privatemessages:hover { - text-decoration: none; - background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left -36px; +.message.unread a { + color: #d40005; } -a.privatemessages.new { - background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px; - padding-left:18px; - margin:4px 15px 0 5px; - color:white; -} -a.privatemessages.new:hover { - text-decoration: none; - background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left -36px; +.messages-buttonbank { + text-align: right; } -a.privatemessages.new span { - background-color: red; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - -webkit-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* safari v3+ */ - -moz-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* FF v3.5+ */ - color:white; - display:block; - float:right; - padding:0; - position:relative; - text-align:center; - top:-3px; - right:5px; - min-width: 16px; - height:16px; - font-size:10px; - font-weight:bold; +.messages-buttonbank input { + margin-left: 10px; } -/* page content */ -.message { - border-bottom:1px dotted #cccccc; - padding:5px 0 7px 0; -} -.message.notread .entity_listing_info p.entity_title a { - color:#d40005; -} -.message_sender { - float:left; - width:180px; - overflow: hidden; -} -.messages_to { +/*** message metadata ***/ +.messages-owner { float: left; - margin-right: 10px; -} - -/* view and reply to message view */ -.message_body { - margin-left: 120px; -} -.message_subject { - float:left; - width:513px; - padding-top:6px; + width: 20%; + margin-right: 2%; } -.message .delete_button { - margin-top:3px; +.messages-subject { + float: left; + width: 55%; + margin-right: 2%; } -.entity_listing.messages:hover { - background-color:white; +.messages-timestamp { + float: left; + width: 14%; + margin-right: 2%; } -.messages_buttonbank { - margin:5px 0; - text-align: right; +.messages-delete { + float: left; + width: 5%; } -.messages_buttonbank input { - margin:0 0 0 10px; +/*** topbar icon ***/ +.messages-new { + color: white; + background-color: red; + + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + + -webkit-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); + -moz-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); + box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); + + position: absolute; + text-align: center; + top: 0px; + left: 26px; + min-width: 16px; + height: 16px; + font-size: 10px; + font-weight: bold; } diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php deleted file mode 100644 index 998c0071f..000000000 --- a/mod/messages/views/default/messages/forms/reply.php +++ /dev/null @@ -1,44 +0,0 @@ -<?php - - /** - * Elgg reply to a message form - * @uses $vars['entity'] This is the message being replied to - */ - - // fix for RE: RE: RE: that builds on replies - $reply_title = $vars['entity']->title; - if (strncmp($reply_title, "RE:", 3) != 0) { - $reply_title = "RE: " . $reply_title; - } -?> - -<form class="margin_top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm"> - <?php echo elgg_view('action/securitytoken'); ?> - - <!-- populate the title space with the orginal message title, inserting re: before it --> - <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input_text" value='<?php echo $reply_title; ?>' /></label></p> - <p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="input_textarea" /></textarea></label></p> - - <p> - <?php - - //pass across the guid of the message being replied to - echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />"; - //pass along the owner of the message being replied to - echo "<input type='hidden' name='send_to' value='BAAA" . $vars['entity']->fromId . "' />"; - - ?> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /> - </p> - -</form> - - <?php - //display the message you are replying to - if (isset($vars['entity'])) { - - echo "<h3>" . elgg_echo("messages:replying") . "</h3>"; - echo $vars['entity']->description; - - } - ?> diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php deleted file mode 100644 index c77931454..000000000 --- a/mod/messages/views/default/messages/forms/send.php +++ /dev/null @@ -1,70 +0,0 @@ -<?php -/** -* Elgg send a message view -* -* @package ElggMessages - * @uses $vars['friends'] This is an array of a user's friends and is used to populate the list of - * people the user can message - * - */ - -//grab the user id to send a message to. This will only happen if a user clicks on the 'send a message' -//link on a user's profile or hover-over menu -$send_to = get_input('send_to'); -if ($send_to === "") - $send_to = $_SESSION['msg_to']; - -$msg_title = $_SESSION['msg_title']; -$msg_content = $_SESSION['msg_contents']; - -// clear sticky form cache in case user browses away from page and comes back -unset($_SESSION['msg_to']); -unset($_SESSION['msg_title']); -unset($_SESSION['msg_contents']); -?> -<form id="messages_send_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm"> -<?php - echo elgg_view('input/securitytoken'); - //check to see if the message recipient has already been selected - if($send_to){ - - //get the user object - $user = get_user($send_to); - - echo "<div class='entity_listing messages clearfix'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>"; - - //draw it - echo "<div class='entity_listing_info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>"; - //set the hidden input field to the recipients guid - echo "<input type='hidden' name='send_to' value=\"{$send_to}\" />"; - echo "</div></div>"; - - } else { - ?> - - <p class="margin_top"><label><?php echo elgg_echo("messages:to"); ?>: </label> - <select name='send_to'> - <?php - // make the first option blank - echo "<option value=''>".elgg_echo("messages:recipient")."</option>"; - foreach($vars['friends'] as $friend){ - //populate the send to box with a user's friends - echo "<option value='{$friend->guid}'>" . $friend->name . "</option>"; - } - ?> - </select></p> - <?php - } - ?> - - <p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input_text" /></label></p> - <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> - <?php - echo elgg_view("input/longtext", array( - "internalname" => "message", - "value" => $msg_content, - )); - ?> - </p> - <p><input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /></p> -</form> diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php deleted file mode 100644 index f8fce93a9..000000000 --- a/mod/messages/views/default/messages/forms/view.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** -* View message -* -* @package ElggMessages -*/ - -$body = elgg_view("messages/view",$vars); - -$body .= '<div class="messages_buttonbank">'; -$body .= '<input type="hidden" name="type" value="'.$vars['page_view'].'" />'; -$body .= '<input type="hidden" name="offset" value="'.$vars['offset'].'" />'; -$body .= '<input type="submit" name="submit" value="'.elgg_echo('delete').'" /> '; - -if($vars['page_view'] == "inbox"){ - $body .= '<input type="submit" name="submit" value="'.elgg_echo('messages:markread').'" /> '; -} - -$body .= '<input class="cancel_button" type="button" onclick="javascript:$(\'input[type=checkbox]\').click();" value="'.elgg_echo('messages:toggle').'" />'; -$body .= '</div>'; - -echo elgg_view('input/form',array('body' => $body, 'action' => 'action/messages/delete', 'method' => 'post', 'internalid' => 'messages_list_form'));
\ No newline at end of file diff --git a/mod/messages/views/default/messages/js.php b/mod/messages/views/default/messages/js.php new file mode 100644 index 000000000..60cf36b92 --- /dev/null +++ b/mod/messages/views/default/messages/js.php @@ -0,0 +1,7 @@ + +// messages plugin toggle +elgg.register_hook_handler('init', 'system', function() { + $("#messages-toggle").click(function() { + $('input[type=checkbox]').click(); + }); +}); diff --git a/mod/messages/views/default/messages/menu.php b/mod/messages/views/default/messages/menu.php deleted file mode 100644 index 566a87179..000000000 --- a/mod/messages/views/default/messages/menu.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Elgg hoverover extender for messages - * - * @package ElggMessages - */ - -// login check already performed in profile/icon -?> -<li class="user_menu_profile"> - <a class="send_message" href="<?php echo elgg_get_site_url(); ?>mod/messages/send.php?send_to=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("messages:sendmessage"); ?></a> -</li>
\ No newline at end of file diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php deleted file mode 100644 index 4d593a621..000000000 --- a/mod/messages/views/default/messages/messages.php +++ /dev/null @@ -1,117 +0,0 @@ -<?php -/** - * Elgg messages individual view - * - * @package ElggMessages - * - * - * @uses $vars['entity'] Optionally, the message to view - * @uses get_input('type') If the user accesses the message from their sentbox, this variable is passed - * and used to make sure the correct icon and name is displayed - */ -// set some variables to use below -if(get_input("type") == "sent"){ - // send back to the users sentbox - $url = elgg_get_site_url() . "mod/messages/sent.php"; - // set up breadcrumbs context - elgg_push_breadcrumb(elgg_echo('messages:sent'), $url); - //this is used on the delete link so we know which type of message it is - $type = "sent"; -} else { - //send back to the users inbox - $url = elgg_get_site_url() . "pg/messages/" . get_loggedin_user()->username; - // set up breadcrumbs context - elgg_push_breadcrumb(elgg_echo('messages:inbox'), $url); - //this is used on the delete link so we know which type of message it is - $type = "inbox"; -} - -// fix for RE: RE: RE: that builds on replies -$reply_title = $vars['entity']->title; -if (strncmp($reply_title, "RE:", 3) != 0) { - $reply_title = "RE: " . $reply_title; -} - -if (isloggedin()) - if (isset($vars['entity'])) { - if ($vars['entity']->toId == get_loggedin_userid() - || $vars['entity']->owner_guid == get_loggedin_userid()) { - // display breadcrumbs - elgg_push_breadcrumb($vars['entity']->title); - echo elgg_view('navigation/breadcrumbs'); -?> -<!-- display the content header block --> - <div id="content_header" class="clearfix"> - <div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div> - <div class="content_header_options"> - <a class="action_button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a> - <?php echo elgg_view("output/confirmlink", array( - 'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'), - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm'), - 'class' => "action_button disabled" - )); - ?> - </div> - </div> - - <div class="entity_listing messages clearfix"> - <?php - // we need a different user icon and name depending on whether the user is reading the message - // from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent - // the message. If it is the sentbox, the icon and name will be the user the message was sent to - if($type == "sent"){ - //get an instance of the user who the message has been sent to so we can access the name and icon - $user_object = get_entity($vars['entity']->toId); - $message_icon = elgg_view("profile/icon",array('entity' => $user_object, 'size' => 'tiny')); - $message_owner = elgg_echo('messages:to').": <a href='".elgg_get_site_url()."pg/profile/".$user_object->username."'>".$user_object->name."</a>"; - }else{ - $user_object = get_entity($vars['entity']->fromId); - $message_icon = elgg_view("profile/icon",array('entity' => $user_object, 'size' => 'tiny')); - $message_owner = elgg_echo('messages:from').": <a href='".elgg_get_site_url()."pg/profile/".$user_object->username."'>".get_entity($vars['entity']->fromId)->name."</a>"; - } - ?> - <div class="entity_listing_icon"><?php echo $message_icon ?></div> - <div class="entity_listing_info"><p><?php echo $message_owner ?></p> - <p class="entity_subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p> - </div> - </div> - - <div class="messagebody margin_top clearfix"> - <?php - // if the message is a reply, display the message the reply was for - // @todo I need to figure out how to get the description out using -> (anyone?) - if($main_message = $vars['entity']->getEntitiesFromRelationship("reply")){ - echo $main_message[0][description]; - } - ?> - <!-- display the message --> - <?php echo elgg_view('output/longtext',array('value' => $vars['entity']->description)); ?> - </div> - - <!-- reply form --> - <div id="message_reply_form" class="hidden margin_top"> - <h2><?php echo elgg_echo('messages:answer'); ?></h2> - <form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form"> - <?php echo elgg_view('input/securitytoken'); ?> - <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input_text" value='<?php echo $reply_title; ?>' /></label></p> - <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> - <?php echo elgg_view("input/longtext", array( - "internalname" => "message", - "value" => '', - )); - ?></p> - - <?php - //pass across the guid of the message being replied to - echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />"; - //pass along the owner of the message being replied to - echo "<input type='hidden' name='send_to' value='" . $vars['entity']->fromId . "' />"; - ?> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /> - </form> - </div> - -<?php - } -}
\ No newline at end of file diff --git a/mod/messages/views/default/messages/topbar.php b/mod/messages/views/default/messages/topbar.php deleted file mode 100644 index 51ca8a15b..000000000 --- a/mod/messages/views/default/messages/topbar.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php -/** - * Elgg messages topbar extender - * - * @package ElggMessages - */ - -gatekeeper(); - -//get unread messages -$num_messages = count_unread_messages(); -if($num_messages){ - $num = $num_messages; -} else { - $num = 0; -} - -if($num == 0) { -?> - <a href="<?php echo elgg_get_site_url(); ?>pg/messages/<?php echo get_loggedin_user()->username; ?>" class="privatemessages" > </a> -<?php - }else{ -?> - <a href="<?php echo elgg_get_site_url(); ?>pg/messages/<?php echo get_loggedin_user()->username; ?>" class="privatemessages new" ><span><?php echo $num; ?></span></a> -<?php - } diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php deleted file mode 100644 index 65091689a..000000000 --- a/mod/messages/views/default/messages/view.php +++ /dev/null @@ -1,121 +0,0 @@ -<?php -/** - * Elgg messages view page - * - * @package ElggMessages - * - * @uses $vars['entity'] An array of messages to view - * @uses $vars['page_view'] This is the page the messages are being accessed from; inbox or sentbox - * - */ - -$limit = $vars['limit']; if (empty($limit)) $limit = 10; -$offset = $vars['offset']; if (!isset($offset)) $offset = 0; - -// If there are any messages to view, view them -if (isloggedin()) -if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { - - // get the correct display for the inbox view - if($vars['page_view'] == "inbox") { - - $counter = 0; - - foreach($vars['entity'] as $message) { - if ($message->owner_guid == get_loggedin_userid() || $message->toId == get_loggedin_userid()) { - - //make sure to only display the messages that have not been 'deleted' (1 = deleted) - if($message->hiddenFrom != 1){ - // check to see if the message has been read, if so, set the correct container class - if($message->readYet == 1){ - echo "<div class='message read clearfix'>"; - }else{ - echo "<div class='message notread clearfix'>"; - } - // get the icon of the user who owns the message - $from = get_entity($message->fromId); - echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>"; - // message block (message sender, message subject, delete checkbox) - echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>"; - // display message subject - echo "<div class='message_subject'>"; - // display delete button - echo "<span class='delete_button'>" . elgg_view("output/confirmlink", array( - 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')), - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm'), - )) . "</span>"; - echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />"; - echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>"; - echo "</div></div></div>"; // close the message container - }//end of hiddenFrom if statement - } // end of user check - $counter++; - if ($counter == $limit) break; - - }//end of for each loop - }//end of inbox if statement - - // get the correct display for the sentbox view - if($vars['page_view'] == "sent") { - - $counter = 0; - - foreach($vars['entity'] as $message) { - - //make sure to only display the messages that have not been 'deleted' (1 = deleted) - if($message->hiddenTo != 1){ - - //get the correct user entity - $user = get_entity($message->toId); - echo "<div class='message sent clearfix'>"; - //get the icon for the user the message was sent to - echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>"; - echo "<div class='entity_listing_info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>"; - // display message subject - echo "<div class='message_subject'>"; - //display the link to 'delete' - echo "<div class='delete_button'>" . elgg_view("output/confirmlink", array( - 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')), - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm'), - )) . "</div>"; - echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> "; - echo "<a href=\"{$message->getURL()}?type=sent\">" . $message->title . "</a></p>"; - echo "</div></div></div>"; // close the message container - }//close hiddeTo if statement - - $counter++; - if ($counter == $limit) break; - - }//close foreach - - }//close page_view sent if statement - - $baseurl = $_SERVER['REQUEST_URI']; - $nav = ''; - - if (sizeof($vars['entity']) > $limit) { - $newoffset = $offset + $limit; - $nexturl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset)); - - $nav .= '<a class="pagination_previous" href="'.$nexturl.'">« ' . elgg_echo('previous') . '</a> '; - } - - if ($offset > 0) { - $newoffset = $offset - $limit; - if ($newoffset < 0) $newoffset = 0; - - $prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset)); - - $nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' »</a> '; - } - - - if (!empty($nav)) { - echo '<div class="pagination"><p>'.$nav.'</p></div>'; - } - -} else { - echo "<p>".elgg_echo("messages:nomessages")."</p>"; -} diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php new file mode 100644 index 000000000..b12f98522 --- /dev/null +++ b/mod/messages/views/default/object/messages.php @@ -0,0 +1,86 @@ +<?php +/** + * File renderer. + * + * @package ElggFile + */ + +$full = elgg_extract('full_view', $vars, false); +$message = elgg_extract('entity', $vars, false); + +if (!$message) { + return true; +} + +if ($message->toId == elgg_get_page_owner_guid()) { + // received + $user = get_entity($message->fromId); + if ($user) { + $icon = elgg_view_entity_icon($user, 'tiny'); + $user_link = elgg_view('output/url', array( + 'href' => "messages/compose?send_to=$user->guid", + 'text' => $user->name, + 'is_trusted' => true, + )); + } else { + $icon = ''; + $user_link = elgg_echo('messages:deleted_sender'); + } + + if ($message->readYet) { + $class = 'message read'; + } else { + $class = 'message unread'; + } + +} else { + // sent + $user = get_entity($message->toId); + + if ($user) { + $icon = elgg_view_entity_icon($user, 'tiny'); + $user_link = elgg_view('output/url', array( + 'href' => "messages/compose?send_to=$user->guid", + 'text' => elgg_echo('messages:to_user', array($user->name)), + 'is_trusted' => true, + )); + } else { + $icon = ''; + $user_link = elgg_echo('messages:deleted_sender'); + } + + $class = 'message read'; +} + +$timestamp = elgg_view_friendly_time($message->time_created); + +$subject_info = ''; +if (!$full) { + $subject_info .= "<input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />"; +} +$subject_info .= elgg_view('output/url', array( + 'href' => $message->getURL(), + 'text' => $message->title, + 'is_trusted' => true, +)); + +$delete_link = elgg_view("output/confirmlink", array( + 'href' => "action/messages/delete?guid=" . $message->getGUID(), + 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>", + 'confirm' => elgg_echo('deleteconfirm'), + 'encode_text' => false, + )); + +$body = <<<HTML +<div class="messages-owner">$user_link</div> +<div class="messages-subject">$subject_info</div> +<div class="messages-timestamp">$timestamp</div> +<div class="messages-delete">$delete_link</div> +HTML; + +if ($full) { + echo elgg_view_image_block($icon, $body, array('class' => $class)); + echo elgg_view('output/longtext', array('value' => $message->description)); +} else { + echo elgg_view_image_block($icon, $body, array('class' => $class)); +}
\ No newline at end of file |