diff options
| -rw-r--r-- | mod/bookmarks/views/default/object/bookmarks.php | 18 | ||||
| -rw-r--r-- | mod/groups/views/default/forum/topicposts.php | 4 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/css.php | 8 | ||||
| -rw-r--r-- | mod/messages/views/default/messages/view.php | 4 | ||||
| -rw-r--r-- | mod/thewire/views/default/object/thewire.php | 4 | ||||
| -rw-r--r-- | views/default/css.php | 21 |
6 files changed, 23 insertions, 36 deletions
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 .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array )) . "</span>"; } - $info = "<div class='entity_metadata'><table><tr><td><span {$access_level}>{$object_acl}</span></td>"; + $info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span>"; //include edit and delete options if($vars['entity']->canEdit()){ - $info .= "<td class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></td>"; - $info .= "<td class='entity_delete'>".$delete."</td>"; + $info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>"; + $info .= $delete; } - $info .= "</tr></table></div>"; + $info .= "</div>"; $info .= "<p class='entity_title'><a href=\"{$vars['entity']->address}\" target=\"_blank\">{$vars['entity']->title}</a></p>"; $info .= "<p class='entity_subtext'>Bookmarked by <a href=\"{$vars['url']}pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>"; 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 "<div class='entity_metadata'>"; - echo "<div class='delete_button'>".elgg_view("output/confirmlink",array( + echo "<span class='delete_button'>".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') - ))."</div>"; + ))."</span>"; echo "<a class='link' onclick=\"elgg_slide_toggle(this,'.topic','.edit_comment');\">".elgg_echo('edit')."</a>"; echo "</div>"; 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 "<div class='message_subject'>"; // display delete button - echo "<div class='delete_button'>" . elgg_view("output/confirmlink", array( + echo "<span class='delete_button'>" . 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'), - )) . "</div>"; + )) . "</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 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 "<div class='delete_button'>" . elgg_view("output/confirmlink",array( + echo "<span class='delete_button'>" . elgg_view("output/confirmlink",array( 'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), - )) . "</div>"; + )) . "</span>"; } ?> </div> diff --git a/views/default/css.php b/views/default/css.php index 1d2eca907..61b736af6 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -970,26 +970,18 @@ select.styled .select_option { color:#aaaaaa; font-size: 90%; } -.entity_metadata table { - width:280px; -} -.entity_metadata table td { - height:30px; - vertical-align:middle; -} -.entity_metadata table td.entity_edit { +.entity_metadata span { + margin-left:14px; text-align:right; } -.entity_metadata table td.entity_edit a { +.entity_metadata a { color:#aaaaaa; - margin:0 0 0 10px; } -.entity_metadata table td.entity_edit a:hover { +.entity_metadata a:hover { color:#0054a7; } -.entity_metadata table td.entity_delete { - padding-top:2px; - width:26px; +.entity_metadata .delete_button { + margin-top:3px; } /* override hover for lists of site users/members */ .members_list .entity_listing:hover { @@ -1312,6 +1304,7 @@ a.action_button:focus { height:14px; background: url("<?php echo $vars['url']; ?>_graphics/icon_delete.png") no-repeat 0 0; text-indent: -9000px; + text-align: left; } .delete_button a:hover { background-position: 0 -16px; |