From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Mar 2010 17:53:05 +0000 Subject: Pulled in the interface changes. git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/messages/views/default/messages/css.php | 234 +++++++++++++++++++++ .../views/default/messages/forms/message.php | 94 +++++++++ .../views/default/messages/forms/reply.php | 53 +++++ mod/messages/views/default/messages/forms/view.php | 15 ++ mod/messages/views/default/messages/menu.php | 26 +++ mod/messages/views/default/messages/messages.php | 165 +++++++++++++++ mod/messages/views/default/messages/topbar.php | 38 ++++ mod/messages/views/default/messages/view.php | 150 +++++++++++++ mod/messages/views/default/object/messages.php | 0 .../views/default/widgets/messages/edit.php | 0 .../views/default/widgets/messages/view.php | 13 ++ 11 files changed, 788 insertions(+) create mode 100644 mod/messages/views/default/messages/css.php create mode 100644 mod/messages/views/default/messages/forms/message.php create mode 100644 mod/messages/views/default/messages/forms/reply.php create mode 100644 mod/messages/views/default/messages/forms/view.php create mode 100644 mod/messages/views/default/messages/menu.php create mode 100644 mod/messages/views/default/messages/messages.php create mode 100644 mod/messages/views/default/messages/topbar.php create mode 100644 mod/messages/views/default/messages/view.php create mode 100644 mod/messages/views/default/object/messages.php create mode 100644 mod/messages/views/default/widgets/messages/edit.php create mode 100644 mod/messages/views/default/widgets/messages/view.php (limited to 'mod/messages/views/default') diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php new file mode 100644 index 000000000..6a8a6ed30 --- /dev/null +++ b/mod/messages/views/default/messages/css.php @@ -0,0 +1,234 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + +?> + +/*------------------------------- +MESSAGING PLUGIN +-------------------------------*/ +#messages { + margin:0 10px 0 10px; +} +.actiontitle { + font-weight: bold; + font-size: 110%; + margin: 0 0 10px 0; +} +#messages .pagination { + margin:5px 0 5px 0; +} +#messages input[type="checkbox"] { + margin:0; + padding:0; + border:none; +} +.messages_buttonbank { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; + margin:5px 10px; + padding:5px; + text-align: right; +} +.messages_buttonbank input { + margin:0 0 0 10px; +} +.messages_buttonbank input[type="button"] { + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: #4690D6; + background:#dddddd; + border: 1px solid #999999; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + height: 25px; + padding: 2px 6px 2px 6px; + margin:0 0 0 10px; + cursor: pointer; +} +.messages_buttonbank input[type="button"]:hover { + background: #0054a7; + border: 1px solid #0054a7; + color:white; +} + +#messages td { + text-align: left; + vertical-align:middle; + padding: 5px; +} +#messages .message_sent { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + margin-bottom: 5px; + background: white; + border:1px solid #cccccc; +} +#messages .message_notread { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + margin-bottom: 5px; + background: #F7DAD8; + border:1px solid #ff6c7c; +} +#messages .message_read { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + margin-bottom: 5px; + background: white; + border:1px solid #cccccc; +} +#messages .message_notread td { + +} +#messages .message_read td { + +} + +#messages .delete_msg a { + display:block; + cursor: pointer; + width:14px; + height:14px; + margin:0; + background: url("_graphics/icon_customise_remove.png") no-repeat right 0; + text-indent: -9000px; + float:right; +} +#messages .delete_msg a:hover { + background-position: right -16px; +} +/* IE6 */ +* html #messages .delete_msg a { background-position: right 4px; } +* html #messages .delete_msg a:hover { background-position: right 4px; } + +#messages .usericon, +#messages .groupicon { + float: left; + margin: 0 15px 0 0; +} + +#messages .msgsender { + color:#666666; + line-height: 1em; + margin:0; + padding:0; + float:left; +} +#messages .msgsender small { + color:#AAAAAA; +} + + +#messages .msgsubject { + font-size: 120%; + line-height: 100%; +} + +.msgsubject { + font-weight:bold; +} + +.messages_single_icon { + float: left; + width:110px; +} + +.messages_single_icon .usericon, +.messages_single_icon .groupicon { + float: left; + margin: 0 10px 10px 0; +} + +/* view and reply to message view */ +.message_body { + margin-left: 120px; +} +.message_body .messagebody { + padding:0; + margin:10px 0 10px 0; + font-size: 120%; + border-bottom:1px solid #cccccc; +} + +/* drop down message reply form */ +#message_reply_form { display:none; } + +.new_messages_count { + color:#666666; +} +/* tinyMCE container */ +#message_reply_editor #message_tbl { + width:680px !important; +} +/* IE6 */ +* html #message_reply_editor #message_tbl { width:676px !important;} + +#messages_return { + margin:4px 0 4px 10px; +} +#messages_return p { + margin:0; +} +.messages_single { + background: white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + margin:0 10px 10px 10px; + padding:10px; +} +/* when displaying original msg in reply view */ +.previous_message { + background:#dedede; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + padding:10px; + margin:0 0 20px 0; +} +.previous_message p { + padding:0; + margin:0 0 5px 0; + font-size: 100%; +} + + + + +#notificationstable td.sitetogglefield { + width:50px; + text-align: center; + vertical-align: middle; +} +#notificationstable td.sitetogglefield input { + margin-right:36px; + margin-top:5px; +} +#notificationstable td.sitetogglefield a { + width:46px; + height:24px; + cursor: pointer; + display: block; + outline: none; +} +#notificationstable td.sitetogglefield a.sitetoggleOff { + background: url(mod/messages/graphics/icon_notifications_site.gif) no-repeat right 2px; +} +#notificationstable td.sitetogglefield a.sitetoggleOn { + background: url(mod/messages/graphics/icon_notifications_site.gif) no-repeat right -36px; +} + + + + + + diff --git a/mod/messages/views/default/messages/forms/message.php b/mod/messages/views/default/messages/forms/message.php new file mode 100644 index 000000000..3a926b0d3 --- /dev/null +++ b/mod/messages/views/default/messages/forms/message.php @@ -0,0 +1,94 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @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']); + + + +?> +
+
+ + " . elgg_echo("messages:to") . ":
" . elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny')) . $user->username; + echo "

"; + //set the hidden input field to the recipients guid + echo ""; + + + }else{ + + ?> + +

+

+ + + +

+

+

" />

+ +
+
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php new file mode 100644 index 000000000..7b949ec36 --- /dev/null +++ b/mod/messages/views/default/messages/forms/reply.php @@ -0,0 +1,53 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @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; + } +exit; + $reply_title = str_replace("'", "\\'", $reply_title); +?> + +
+ + +

+

+ +

+ getGUID() . "' />"; + //pass along the owner of the message being replied to + echo "fromId . "' />"; + + ?> + " /> +

+ +
+ + " . elgg_echo("messages:replying") . ""; + echo $vars['entity']->description; + + } + ?> diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php new file mode 100644 index 000000000..adcd3a589 --- /dev/null +++ b/mod/messages/views/default/messages/forms/view.php @@ -0,0 +1,15 @@ +'; + $body .= ''; + $body .= ''; + $body .= ' '; + $body .= ' '; + $body .= ''; + $body .= ''; + + echo elgg_view('input/form',array('body' => $body, 'action' => $vars['url'] . 'action/messages/delete', 'method' => 'post')); + +?> \ No newline at end of file diff --git a/mod/messages/views/default/messages/menu.php b/mod/messages/views/default/messages/menu.php new file mode 100644 index 000000000..9f8da1fb1 --- /dev/null +++ b/mod/messages/views/default/messages/menu.php @@ -0,0 +1,26 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + + //need to be logged in to send a message + if (isloggedin()) { + +?> + +

+ +

+ + \ No newline at end of file diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php new file mode 100644 index 000000000..cdc6e4483 --- /dev/null +++ b/mod/messages/views/default/messages/messages.php @@ -0,0 +1,165 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * + * @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 = $vars['url'] . "mod/messages/sent.php"; + + //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 = $vars['url'] . "pg/messages/" . $vars['user']->username; + + //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 == $vars['user']->guid + || $vars['entity']->owner_guid == $vars['user']->guid) { + +?> + +
+

«

+
+ +
+ +
+ + toId); + echo " " . elgg_view("profile/icon",array('entity' => $user_object, 'size' => 'tiny')); + echo "

".elgg_echo('messages:to').": " . $user_object->name . "
"; + } else { + echo " " . elgg_view("profile/icon",array('entity' => get_entity($vars['entity']->fromId), 'size' => 'tiny')); + echo "

".elgg_echo('messages:from').": " . get_entity($vars['entity']->fromId)->name . "
"; + } + ?> + + time_created); ?> +

+
+ +
+ + (anyone?) + if($main_message = $vars['entity']->getEntitiesFromRelationship("reply")){ + + if($type == "sent"){ + echo "

".elgg_echo('messages:original').":

"; + }else{ + echo "

".elgg_echo('messages:yours').":

"; + } + + echo $main_message[0][description] . "

"; + + } + ?> + + +
+

title; ?>

+
+ + +
+

$vars['entity']->description)); ?>

+
+ + +
+ + + + +

".elgg_echo('messages:answer')."   "; ?> $vars['url'] . "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'), + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm'), + )); ?> +

+
+ +
+ + +
+
+ +

+

+
+ "message", + "value" => '', + )); + + ?>
+ +

+ getGUID() . "' />"; + //pass along the owner of the message being replied to + echo "fromId . "' />"; + + ?> + " /> +

+
+
+ +
+ + diff --git a/mod/messages/views/default/messages/topbar.php b/mod/messages/views/default/messages/topbar.php new file mode 100644 index 000000000..179167561 --- /dev/null +++ b/mod/messages/views/default/messages/topbar.php @@ -0,0 +1,38 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + + //need to be logged in to send a message + gatekeeper(); + + //get unread messages + $num_messages = count_unread_messages(); + if($num_messages){ + $num = $num_messages; + } else { + $num = 0; + } + + if($num == 0){ + +?> + +   + + + + [] + + \ No newline at end of file diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php new file mode 100644 index 000000000..501be8bb3 --- /dev/null +++ b/mod/messages/views/default/messages/view.php @@ -0,0 +1,150 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @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) { + +?> +
+ +owner_guid == $vars['user']->guid + || $message->toId == $vars['user']->guid) { + + //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, get the correct background color + if($message->readYet == 1){ + echo "
"; + }else{ + echo "
"; + } + + //set the table + echo ""; + //get the icon of the user who owns the message + $from = get_entity($message->fromId); + echo ""; + //display the message title + echo ""; + //display the link to 'delete' + + echo "
" . elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny')) . "
" . $from->name . "
" . friendly_time($message->time_created) . "
"; + echo "guid}\" /> "; + echo "getURL()}\">" . $message->title . "
"; + echo "
" . elgg_view("output/confirmlink", array( + 'href' => $vars['url'] . "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')), + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm'), + )) . "
"; + + echo "
"; + echo "
"; // close the message background div + + }//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 "
"; + echo ""; + + //get the icon for the user the message was sent to + echo ""; + //display the message title + echo ""; + //display the link to 'delete' + + echo "
" . elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny')) . "
" . $user->name . "
" . friendly_time($message->time_created) . "
"; + echo "guid}\" /> "; + echo "getURL()}?type=sent\">" . $message->title . "
"; + echo "
" . elgg_view("output/confirmlink", array( + 'href' => $vars['url'] . "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')), + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm'), + )) . "
"; + echo "
"; + + }//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 .= '« ' . elgg_echo('previous') . ' '; + } + + if ($offset > 0) { + $newoffset = $offset - $limit; + if ($newoffset < 0) $newoffset = 0; + + $prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset)); + + $nav .= '' . elgg_echo('next') . ' » '; + } + + + if (!empty($nav)) { + echo ''; + } + + echo "
"; // close the main messages wrapper div + + } else { + + echo "

" . elgg_echo("messages:nomessages") . "

"; + + }//end of the first if statement +?> diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php new file mode 100644 index 000000000..e69de29bb diff --git a/mod/messages/views/default/widgets/messages/edit.php b/mod/messages/views/default/widgets/messages/edit.php new file mode 100644 index 000000000..e69de29bb diff --git a/mod/messages/views/default/widgets/messages/view.php b/mod/messages/views/default/widgets/messages/view.php new file mode 100644 index 000000000..e4d138562 --- /dev/null +++ b/mod/messages/views/default/widgets/messages/view.php @@ -0,0 +1,13 @@ + + You have no new messages."; + else { + echo "

" . $num_messages . " new message(s).

"; + echo "username ."\">check them out"; + } + + ?> -- cgit v1.2.3