From 13796cc18921229f16f9b387e360f1c908336671 Mon Sep 17 00:00:00 2001 From: pete Date: Fri, 12 Mar 2010 12:26:22 +0000 Subject: Updated and simplified generic entity listings metadata block (edit, delete, access) to not use tables. git-svn-id: http://code.elgg.org/elgg/trunk@5375 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/bookmarks/views/default/object/bookmarks.php | 18 +++++++++--------- mod/groups/views/default/forum/topicposts.php | 4 ++-- mod/groups/views/default/groups/css.php | 8 +------- mod/messages/views/default/messages/view.php | 4 ++-- mod/thewire/views/default/object/thewire.php | 4 ++-- 5 files changed, 16 insertions(+), 22 deletions(-) (limited to 'mod') diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 833d160c6..fa5d6e30a 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -26,16 +26,16 @@ if($is_group instanceof ElggGroup){ //we decided to show that the item is in a group, rather than its actual access level $object_acl = "Group: " . $is_group->name; if($membership == 2) - $access_level = "class='group_open'"; + $access_level = "class='access_level group_open'"; else - $access_level = "class='group_closed'"; + $access_level = "class='access_level group_closed'"; }elseif($object_acl == 'Private'){ - $access_level = "class='private'"; + $access_level = "class='access_level private'"; }else{ if(!in_array($object_acl, $general_access)) - $access_level = "class='shared_collection'"; + $access_level = "class='access_level shared_collection'"; else - $access_level = "class='entity_access'"; + $access_level = "class='access_level entity_access'"; } if($vars['entity']->description != '') @@ -58,14 +58,14 @@ $delete .= "" . elgg_view('output/confirmlink',array )) . ""; } - $info = "
"; + $info = "
{$object_acl}"; //include edit and delete options if($vars['entity']->canEdit()){ - $info .= "
"; - $info .= ""; + $info .= "username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . ""; + $info .= $delete; } - $info .= "
{$object_acl}username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "".$delete."
"; + $info .= ""; $info .= "

address}\" target=\"_blank\">{$vars['entity']->title}

"; $info .= "

Bookmarked by username}\">{$owner->name} {$friendlytime} {$view_notes}

"; diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php index 61bca298a..29ce21358 100644 --- a/mod/groups/views/default/forum/topicposts.php +++ b/mod/groups/views/default/forum/topicposts.php @@ -27,11 +27,11 @@ // if comment owner, group owner, or site admin - display edit and delete options if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { echo "
"; - echo "
".elgg_view("output/confirmlink",array( + echo "".elgg_view("output/confirmlink",array( 'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') - ))."
"; + )).""; echo "".elgg_echo('edit').""; echo "
"; diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index a0a03aad0..d4fac1b22 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -115,13 +115,7 @@ } /* Group forum */ -.topic .link { - color:#aaaaaa; - margin-right:10px; -} -.topic .entity_metadata .delete_button { - margin-top:3px; -} + /* all browsers - force tinyMCE on edit forum posts to be full-width */ .edit_comment .defaultSkin table.mceLayout { width: 694px !important; diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php index 90b9e518e..2de060e33 100644 --- a/mod/messages/views/default/messages/view.php +++ b/mod/messages/views/default/messages/view.php @@ -44,11 +44,11 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { // display message subject echo "
"; // display delete button - echo "
" . elgg_view("output/confirmlink", array( + 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 "

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

"; echo "
"; // close the message container diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index b5fa9512a..b84a74779 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -39,11 +39,11 @@ if (isset($vars['entity'])) { }//close reply if statement // if the user looking at thewire post can edit, show the delete link if ($vars['entity']->canEdit()) { - echo "
" . elgg_view("output/confirmlink",array( + echo "" . elgg_view("output/confirmlink",array( 'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), - )) . "
"; + )) . ""; } ?> -- cgit v1.2.3