From 43c33492d2ab65a783c17559cf8dabd7832e9ea1 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 15 Jan 2011 22:28:46 +0000 Subject: Updated the messages plugin to use the new CSS/HTML git-svn-id: http://code.elgg.org/elgg/trunk@7886 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/forms/messages/process.php | 41 +++++++ .../views/default/forms/messages/reply.php | 47 ++++++++ mod/messages/views/default/forms/messages/send.php | 47 ++++++++ mod/messages/views/default/messages/css.php | 112 ++++++++----------- .../views/default/messages/forms/reply.php | 44 -------- mod/messages/views/default/messages/forms/send.php | 74 ------------- mod/messages/views/default/messages/forms/view.php | 22 ---- mod/messages/views/default/messages/menu.php | 12 -- mod/messages/views/default/messages/messages.php | 118 -------------------- mod/messages/views/default/messages/topbar.php | 32 +++--- mod/messages/views/default/messages/view.php | 121 --------------------- mod/messages/views/default/object/messages.php | 75 +++++++++++++ 12 files changed, 270 insertions(+), 475 deletions(-) create mode 100644 mod/messages/views/default/forms/messages/process.php create mode 100644 mod/messages/views/default/forms/messages/reply.php create mode 100644 mod/messages/views/default/forms/messages/send.php delete mode 100644 mod/messages/views/default/messages/forms/reply.php delete mode 100644 mod/messages/views/default/messages/forms/send.php delete mode 100644 mod/messages/views/default/messages/forms/view.php delete mode 100644 mod/messages/views/default/messages/menu.php delete mode 100644 mod/messages/views/default/messages/messages.php delete mode 100644 mod/messages/views/default/messages/view.php create mode 100644 mod/messages/views/default/object/messages.php (limited to 'mod/messages/views/default') 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..2c97fcb6f --- /dev/null +++ b/mod/messages/views/default/forms/messages/process.php @@ -0,0 +1,41 @@ +'; +echo elgg_view('input/submit', array( + 'value' => elgg_echo('delete'), + 'internalname' => 'delete', +)); + +if ($vars['folder'] == "inbox") { + echo elgg_view('input/submit', array( + 'value' => elgg_echo('messages:markread'), + 'internalname' => 'read', + )); +} + +echo elgg_view('input/button', array( + 'value' => elgg_echo('messages:toggle'), + 'class' => 'elgg-cancel-button', + 'internalid' => 'messages-toggle', +)); + +echo ''; + +?> + 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..22c982ec2 --- /dev/null +++ b/mod/messages/views/default/forms/messages/reply.php @@ -0,0 +1,47 @@ +title; +if (strncmp($reply_title, "RE:", 3) != 0) { + $reply_title = "RE: " . $reply_title; +} + +echo elgg_view('input/hidden', array( + 'internalname' => 'recipient_guid', + 'value' => $vars['message']->fromId, +)); +?> + +

+ + 'subject', + 'value' => $reply_title, + )); + ?> +

+

+ + 'body', + 'value' => '', + )); + ?> +

+

+ elgg_echo('messages:send'))); ?> +

+ + \ 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..0a251091b --- /dev/null +++ b/mod/messages/views/default/forms/messages/send.php @@ -0,0 +1,47 @@ +guid] = $friend->name; +} + +$recipient_drop_down = elgg_view('input/pulldown', array( + 'internalname' => 'recipient_guid', + 'value' => $recipient_guid, + 'options_values' => $recipients_options, +)); + +?> +

+ + +

+

+ + 'subject', + 'value' => $subject, + )); + ?> +

+

+ + 'body', + 'value' => $body, + )); + ?> +

+

+ elgg_echo('messages:send'))); ?> +

diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php index 3e58c2607..ba8444f03 100644 --- a/mod/messages/views/default/messages/css.php +++ b/mod/messages/views/default/messages/css.php @@ -6,84 +6,60 @@ */ ?> -/* messages/new messages icon & counter in elgg-topbar */ -a.privatemessages { - background:transparent url(mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px; - padding-left:16px; - margin:4px 15px 0 5px; - cursor:pointer; -} -a.privatemessages:hover { - text-decoration: none; - background:transparent url(mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left -36px; + +.message.unread a { + color: #d40005; } -a.privatemessages.new { - background:transparent url(mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px; - padding-left:18px; - margin:4px 15px 0 5px; - color:white; +.messages-buttonbank { + text-align: right; } -a.privatemessages.new:hover { - text-decoration: none; - background:transparent url(mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left -36px; -} -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 metadata ***/ +.messages-owner { + float: left; + width: 20%; + margin-right: 2%; } -.message.notread .entity-listing-info p.entity-title a { - color:#d40005; +.messages-subject { + float: left; + width: 55%; + margin-right: 2%; } -.message_sender { - float:left; - width:180px; - overflow: hidden; +.messages-timestamp { + float: left; + width: 14%; + margin-right: 2%; } -.messages_to { +.messages-delete { float: left; - margin-right: 10px; + width: 5%; } -/* view and reply to message view */ -.message_body { - margin-left: 120px; -} -.message_subject { - float:left; - width:513px; - padding-top:6px; -} -.message .delete-button { - margin-top:3px; -} -.entity-listing.messages:hover { - background-color:white; +/*** messages/new messages icon & counter in elgg-topbar ***/ +.messages-icon { + background:transparent url(mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px; + position: relative; } -.messages_buttonbank { - margin:5px 0; - text-align: right; +.messages-icon:hover { + text-decoration: none; + background-position: left -36px; } -.messages_buttonbank input { - margin:0 0 0 10px; +.messages-icon.new span { + color: white; + 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+ */ + position: absolute; + text-align: center; + top: -2px; + left: 10px; + 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 107b86166..000000000 --- a/mod/messages/views/default/messages/forms/reply.php +++ /dev/null @@ -1,44 +0,0 @@ -title; - if (strncmp($reply_title, "RE:", 3) != 0) { - $reply_title = "RE: " . $reply_title; - } -?> - -
- - - -

-

- -

- getGUID() . "' />"; - //pass along the owner of the message being replied to - echo "fromId . "' />"; - - echo elgg_view('input/submit', array('value' => elgg_echo("messages:fly"))); - ?> -

- -
- - " . elgg_echo("messages:replying") . ""; - 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 6ddf7e543..000000000 --- a/mod/messages/views/default/messages/forms/send.php +++ /dev/null @@ -1,74 +0,0 @@ - -
-
".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."
"; - - //draw it - echo "
".elgg_echo("messages:to").": ".$user->name.""; - //set the hidden input field to the recipients guid - echo ""; - echo "
"; - - } else { - ?> - -

-

- - -

-

- "message", - "value" => $msg_content, - )); - ?> -

-

- elgg_echo("messages:fly"))); - ?> -

-
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 5b9263382..000000000 --- a/mod/messages/views/default/messages/forms/view.php +++ /dev/null @@ -1,22 +0,0 @@ -'; -$body .= ''; -$body .= ''; -$body .= ' '; - -if($vars['page_view'] == "inbox"){ - $body .= ' '; -} - -$body .= ''; -$body .= ''; - -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/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 @@ - -
  • - -
    • \ 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 a1a7fd9ca..000000000 --- a/mod/messages/views/default/messages/messages.php +++ /dev/null @@ -1,118 +0,0 @@ -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'); -?> - -
    -

    title; ?>

    -
    - - "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'), - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm'), - 'class' => "elgg-action-button disabled" - )); - ?> -
    -
    - -
    - toId); - $message_icon = elgg_view("profile/icon",array('entity' => $user_object, 'size' => 'tiny')); - $message_owner = elgg_echo('messages:to').": ".$user_object->name.""; - }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').": ".get_entity($vars['entity']->fromId)->name.""; - } - ?> -
    -

    -

    time_created); ?>

    -
    -
    - -
    - (anyone?) - if($main_message = $vars['entity']->getEntitiesFromRelationship("reply")){ - echo $main_message[0][description]; - } - ?> - - $vars['entity']->description)); ?> -
    - - - - -$num_messages"; } -if($num == 0) { -?> -   - - - 'pg/messages/inbox/' . get_loggedin_user()->username, + 'text' => $text, + 'class' => $class, +)); diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php deleted file mode 100644 index cc0b5ec3a..000000000 --- a/mod/messages/views/default/messages/view.php +++ /dev/null @@ -1,121 +0,0 @@ - 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 "
    "; - }else{ - echo "
    "; - } - // get the icon of the user who owns the message - $from = get_entity($message->fromId); - echo "
    ".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."
    "; - // message block (message sender, message subject, delete checkbox) - echo "
    ".$from->name."

    ".elgg_view_friendly_time($message->time_created)."

    "; - // display message subject - echo "
    "; - // display delete button - echo "" . 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'), - )) . ""; - echo "

    guid}\" />"; - echo "getURL()}\">" . $message->title . "

    "; - echo "
    "; // 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 "
    "; - //get the icon for the user the message was sent to - echo "
    ".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."
    "; - echo "
    ".get_loggedin_user()->name."

    ".elgg_view_friendly_time($message->time_created)."

    "; - // display message subject - echo "
    "; - //display the link to 'delete' - echo "
    " . 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'), - )) . "
    "; - echo "

    guid}\" /> "; - echo "getURL()}?type=sent\">" . $message->title . "

    "; - echo "
    "; // 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 .= '« ' . 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 ''; - } - -} else { - echo "

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

    "; -} diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php new file mode 100644 index 000000000..9aae6b7a8 --- /dev/null +++ b/mod/messages/views/default/object/messages.php @@ -0,0 +1,75 @@ +readYet = true; +} + +if ($message->toId == elgg_get_page_owner_guid()) { + // received + $user = get_entity($message->fromId); + $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); + $user_link = elgg_view('output/url', array( + 'href' => "pg/messages/compose?send_to=$user->guid", + 'text' => $user->name, + )); + + if ($message->readYet) { + $class = 'message read'; + } else { + $class = 'message unread'; + } + +} else { + // sent + $user = get_entity($message->toId); + $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); + $user_link = elgg_view('output/url', array( + 'href' => "pg/messages/compose?send_to=$user->guid", + 'text' => elgg_echo('messages:to_user', array($user->name)), + )); + + $class = 'message read'; +} + +$timestamp = elgg_view_friendly_time($message->time_created); + +$subject_info = ''; +if (!$full) { + $subject_info .= "guid}\" />"; +} +$subject_info .= elgg_view('output/url', array( + 'href' => $message->getURL(), + 'text' => $message->title, +)); + +$delete_link = "" . elgg_view("output/confirmlink", array( + 'href' => "action/messages/delete?guid=" . $message->getGUID(), + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm'), + )) . ""; + +$body = <<$user_link
    +
    $subject_info
    +
    $timestamp
    +
    $delete_link
    +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 -- cgit v1.2.3