diff options
| -rw-r--r-- | views/default/css.php | 86 | ||||
| -rw-r--r-- | views/default/page_elements/owner_block.php | 36 |
2 files changed, 6 insertions, 116 deletions
diff --git a/views/default/css.php b/views/default/css.php index cbfb916a0..80eb6e0ca 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -1546,15 +1546,9 @@ PAGE-OWNER BLOCK margin:0 10px 0 0; } #owner_block_rss_feed, -#owner_block_odd_feed, -#owner_block_bookmark_this, -#owner_block_report_this { +#owner_block_odd_feed { padding:5px 0 0 0; } -#owner_block_report_this { - padding-bottom:5px; - border-bottom:1px solid #cccccc; -} #owner_block_rss_feed a { font-size: 90%; color:#999999; @@ -1567,22 +1561,8 @@ PAGE-OWNER BLOCK padding:0 0 4px 20px; background: url(<?php echo $vars['url']; ?>_graphics/icon_odd.gif) no-repeat left top; } -#owner_block_bookmark_this a { - font-size: 90%; - color:#999999; - padding:0 0 4px 20px; - background: url(<?php echo $vars['url']; ?>_graphics/icon_bookmarkthis.gif) no-repeat left top; -} -#owner_block_report_this a { - font-size: 90%; - color:#999999; - padding:0 0 4px 20px; - background: url(<?php echo $vars['url']; ?>_graphics/icon_reportthis.gif) no-repeat left top; -} #owner_block_rss_feed a:hover, -#owner_block_odd_feed a:hover, -#owner_block_bookmark_this a:hover, -#owner_block_report_this a:hover { +#owner_block_odd_feed a:hover { color: #0054a7; } #owner_block_desc { @@ -2472,68 +2452,6 @@ div.ajax_loader { * html #elgg_horizontal_tabbed_nav .selected a { top: 3px; } -/* *************************************** - ADMIN AREA - REPORTED CONTENT -*************************************** */ -.reportedcontent_content { - margin:0 0 5px 0; - padding:0 7px 4px 10px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -.reportedcontent_content p.reportedcontent_detail, -.reportedcontent_content p { - margin:0; -} -.active_report { - border:1px solid #D3322A; - background:#F7DAD8; -} -.archived_report { - border:1px solid #666666; - background:#dedede; -} -a.archive_report_button { - float:right; - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: #ffffff; - background:#4690d6; - border: 1px solid #4690d6; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - width: auto; - padding: 4px; - margin:15px 0 0 20px; - cursor: pointer; -} -a.archive_report_button:hover { - background: #0054a7; - border: 1px solid #0054a7; - text-decoration: none; -} -a.delete_report_button { - float:right; - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: #ffffff; - background:#999999; - border: 1px solid #999999; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - width: auto; - padding: 4px; - margin:15px 0 0 20px; - cursor: pointer; -} -a.delete_report_button:hover { - background: #333333; - border: 1px solid #333333; - text-decoration:none; -} -.reportedcontent_content .collapsible_box { - background: white; -} /* *************************************** diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index 46397c4c2..1a3440135 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -14,11 +14,9 @@ $contents = ""; // Is there a page owner? $owner = page_owner_entity(); -// if (!$owner && isloggedin()) $owner = $_SESSION['user']; if ($owner instanceof ElggEntity) { $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny')); if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { - //$info = $owner->name; $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>'; } $display = "<div id=\"owner_block_icon\">" . $icon . "</div>"; @@ -42,13 +40,7 @@ if (isset($autofeed) && $autofeed == true) { } else { $url .= "?view=rss"; } - //if (substr_count($url2,'?')) { - // $url2 .= "&view=odd"; - //} else { - // $url2 .= "?view=opendd"; - //} $label = elgg_echo('feed:rss'); - //$label2 = elgg_echo('feed:odd'); $contents .= <<<END <div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div> @@ -56,37 +48,17 @@ if (isset($autofeed) && $autofeed == true) { END; } -//the follow are for logged in users only -if(isloggedin()){ - - //is the bookmark plugin installed? - if(is_plugin_enabled('bookmarks')){ - - $label3 = elgg_echo('bookmarks:this'); - $contents .= "<div id=\"owner_block_bookmark_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label3}</a></div>"; - - } - - //report this button - if (is_plugin_enabled('reportedcontent')) - { - $label4 = elgg_echo('reportedcontent:report'); - $contents .= "<div id=\"owner_block_report_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label4}</a></div>"; - } - -} - - $contents .= elgg_view('owner_block/extend'); + // Have we been asked to inject any content? If so, display it if (isset($vars['content'])) $contents .= $vars['content']; -// Initialise the submenu -$submenu = get_submenu(); // elgg_view('canvas_header/submenu'); +// Initialise the submenu (plugins can add to the submenu) +$submenu = get_submenu(); if (!empty($submenu)) - $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options + $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; if (!empty($contents)) { echo "<div id=\"owner_block\">"; |