aboutsummaryrefslogtreecommitdiff
path: root/views/default/page_elements
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/page_elements')
-rwxr-xr-xviews/default/page_elements/breadcrumbs.php26
-rwxr-xr-xviews/default/page_elements/content_header.php71
-rwxr-xr-xviews/default/page_elements/content_header_member.php25
-rw-r--r--views/default/page_elements/contentwrapper.php23
-rwxr-xr-xviews/default/page_elements/elgg_content.php9
-rwxr-xr-xviews/default/page_elements/elgg_footer.php30
-rw-r--r--views/default/page_elements/elgg_header.php25
-rw-r--r--views/default/page_elements/elgg_topbar.php96
-rw-r--r--views/default/page_elements/footer.php62
-rw-r--r--views/default/page_elements/header_contents.php22
-rw-r--r--views/default/page_elements/html_begin.php (renamed from views/default/page_elements/header.php)52
-rw-r--r--views/default/page_elements/html_end.php11
-rw-r--r--views/default/page_elements/owner_block.php41
-rw-r--r--views/default/page_elements/spotlight.php57
-rw-r--r--views/default/page_elements/title.php10
15 files changed, 283 insertions, 277 deletions
diff --git a/views/default/page_elements/breadcrumbs.php b/views/default/page_elements/breadcrumbs.php
new file mode 100755
index 000000000..165a6c7dd
--- /dev/null
+++ b/views/default/page_elements/breadcrumbs.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Breadcrumbs
+**/
+// @todo spk to Brett re. making this simpler / scalable
+// grab variables from array
+$breadcrumb_root_url = $vars['breadcrumb_root_url'];
+$breadcrumb_root_text = $vars['breadcrumb_root_text'];
+$breadcrumb_level1_url = $vars['breadcrumb_level1_url'];
+$breadcrumb_level1_text = $vars['breadcrumb_level1_text'];
+$breadcrumb_level2_url = $vars['breadcrumb_level2_url'];
+$breadcrumb_level2_text = $vars['breadcrumb_level2_text'];
+$breadcrumb_currentpage = $vars['breadcrumb_currentpage'];
+?>
+<div id="breadcrumbs">
+ <a href="<?php echo $breadcrumb_root_url; ?>"><?php echo $breadcrumb_root_text; ?></a> &gt;
+ <?php
+ if (isset($vars['breadcrumb_level1_url']) && $vars['breadcrumb_level1_url']) { ?>
+ <a href="<?php echo $breadcrumb_level1_url; ?>"><?php echo $breadcrumb_level1_text; ?></a> &gt;
+ <?php }
+ if (isset($vars['breadcrumb_level2_url']) && $vars['breadcrumb_level2_url']) { ?>
+ <a href="<?php echo $breadcrumb_level2_url; ?>"><?php echo $breadcrumb_level2_text; ?></a> &gt;
+ <?php }
+ echo $breadcrumb_currentpage; ?>
+</div> \ No newline at end of file
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
new file mode 100755
index 000000000..9d7bea08a
--- /dev/null
+++ b/views/default/page_elements/content_header.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Page Content header
+ holds the filter menu and any content action buttons
+ used on bookmarks, blog, file, pages,
+ **/
+
+global $CONFIG;
+
+// set variables
+$page_owner = page_owner_entity();
+$filter_context = $vars['context']; // so we know if the user is looking at their own, everyone's or all friends
+$type = $vars['type']; // get the object type
+$mine_selected = '';
+$all_selected = '';
+$friend_selected = '';
+$action_buttons = '';
+$title = '';
+/* $dash_selected = ''; */
+
+if(!($page_owner instanceof ElggGroup)){
+ if($filter_context == 'mine') {
+ $mine_selected = "SELECTED";
+ }
+ if($filter_context == 'everyone') {
+ $all_selected = "SELECTED";
+ }
+ if($filter_context == 'friends') {
+ $friend_selected = "SELECTED";
+ }
+ if($filter_context == 'action') {
+ // if this is an action page, we'll not be displaying the filter
+ }
+/*
+ if($filter_context == 'dashboard')
+ $dash_selected = "SELECTED";
+*/
+}
+
+// must be logged in to see the filter menu and any action buttons
+if(isloggedin()) {
+ // if we're not on an action page (add bookmark, create page, upload a file etc)
+ if ($filter_context != 'action') {
+ $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='styled' >";
+ $location_filter .= "<option {$mine_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}\" >" . elgg_echo($type . ':yours') . "</option>";
+ $location_filter .= "<option {$all_selected} class='select_option' value=\"{$vars['url']}mod/{$type}/all.php\">" . elgg_echo($type . ':all') . "</option>";
+ $location_filter .= "<option {$friend_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}/friends/\">". elgg_echo($type . ':friends') . "</option>";
+ $location_filter .= "</select>";
+ $location_filter = "<div class='content_header_filter'>".$location_filter."</div>";
+
+ // action buttons
+ if(get_context() != 'bookmarks'){
+ $url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/new/";
+ } else {
+ $url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/add";
+ }
+ $action_buttons = "<a href=\"{$url}\" class='action_button'>" . elgg_echo($type . ':new') . "</a>";
+ $action_buttons = "<div class='content_header_options'>".$action_buttons."</div>";
+
+ } else {
+ // if we're on an action page - we'll just have a simple page title, and no filter menu
+ $title = "<div class='content_header_title'>".elgg_view_title($title = elgg_echo($type . ':add'))."</div>";
+ }
+}
+?>
+<!-- construct the content area header -->
+<div id="content_header" class="clearfloat">
+ <?php echo $title; ?>
+ <?php echo $location_filter; ?>
+ <?php echo $action_buttons; ?>
+</div>
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
new file mode 100755
index 000000000..0a75bb7f5
--- /dev/null
+++ b/views/default/page_elements/content_header_member.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Page Content header when viewing another members entities
+ holds the filter menu and any content action buttons
+ used on bookmarks, blog, file, pages,
+ **/
+$type = $vars['type'];//get the object type
+$user = page_owner_entity();
+$user_name = elgg_view_title($user->name . "'s " . elgg_echo($type));
+?>
+<div id="content_header" class="clearfloat">
+ <div class="content_header_title">
+ <?php echo $user_name; ?>
+ </div>
+<!--
+ <div class="content_header_options">
+ <?php // if we're on bookmarks
+ if((get_context() == 'bookmarks') && ($user instanceof ElggGroup)) {
+ $upload_link = "<a href=\"{$vars['url']}pg/{$type}/{$user->username}/add\" class='action_button'>" . elgg_echo($type . ':new') . "</a>";
+ echo $upload_link;
+ }
+ ?>
+ </div>
+-->
+</div> \ No newline at end of file
diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php
deleted file mode 100644
index 81b7b5c7c..000000000
--- a/views/default/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['value'] The URL to display
- *
- */
-?>
-<div class="contentWrapper<?php
-
- if (isset($vars['subclass'])) {
- echo ' ' . $vars['subclass'];
- }
-
-?>">
-<?php
- echo $vars['body'];
-?>
-</div> \ No newline at end of file
diff --git a/views/default/page_elements/elgg_content.php b/views/default/page_elements/elgg_content.php
new file mode 100755
index 000000000..35e67232c
--- /dev/null
+++ b/views/default/page_elements/elgg_content.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Elgg content wrapper
+ * This file holds the main content
+ **/
+
+$content = isset($vars['body']) ? $vars['body'] : '';
+
+echo $content;
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
new file mode 100755
index 000000000..4113b84c7
--- /dev/null
+++ b/views/default/page_elements/elgg_footer.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+?>
+<div id="elgg_footer">
+ <div id="elgg_footer_contents">
+ <?php
+ if(is_plugin_enabled('reportedcontent') && isloggedin()){
+ ?>
+ <div id="report_this">
+ <a href="javascript:location.href='<?php echo $vars['url']; ?>mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)">Report this</a>
+ </div>
+ <?php
+ }
+ ?>
+ <?php echo elgg_view('footer/links'); ?>
+ <a href="http://www.elgg.org" target="_blank" class="powered_by_elgg_badge">
+ <img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" alt="Powered by Elgg" />
+ </a>
+ </div>
+</div>
diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php
new file mode 100644
index 000000000..565368607
--- /dev/null
+++ b/views/default/page_elements/elgg_header.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg header contents
+ * This file holds the header output that a user will see
+ **/
+
+?>
+<div id="elgg_header">
+ <div id="elgg_header_contents">
+ <!-- display site name -->
+ <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
+ <?php
+ // insert a view which can be extended
+ echo elgg_view('header/extend');
+ ?>
+
+ <div id="elgg_search">
+ <form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+ <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" />
+ <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
+ </form>
+ </div>
+
+ </div>
+</div> \ No newline at end of file
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 7734e61de..c57020e79 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -2,12 +2,6 @@
/**
* Elgg top toolbar
* The standard elgg top toolbar
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
*/
?>
@@ -15,65 +9,51 @@
if (isloggedin()) {
?>
-<div id="elgg_topbar">
+<div id="elgg_topbar" class="clearfloat">
+<div id="elgg_topbar_contents">
+ <a href="http://www.elgg.org" target="_blank"><img class="site_logo" src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" /></a>
+ <a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
-<div id="elgg_topbar_container_left">
- <div class="toolbarimages">
- <a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="toolbar_logo graphic" /></a>
+ <?php
+ // elgg tools menu
+ echo elgg_view("navigation/topbar_tools");
- <a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
-
- </div>
- <div class="toolbarlinks">
- <a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
- </div>
- <?php
-
- echo elgg_view("navigation/topbar_tools");
-
- ?>
-
- <div class="toolbarlinks2">
- <?php
- //allow people to extend this top menu
+ // enable elgg topbar extending
echo elgg_view('elgg_topbar/extend', $vars);
- ?>
-
- <a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
-
- <?php
-
- // The administration link is for admin or site admin users only
- if ($vars['user']->admin || $vars['user']->siteadmin) {
-
- ?>
-
- <a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
-
- <?php
-
- }
-
- ?>
+ ?>
+
+ <div class="log_out">
+ <?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
</div>
+ <?php
+ if(is_plugin_enabled('shared_access')){
+ ?>
+ <a href="<?php echo $vars['url']; ?>pg/shared_access/home" class="shared_access"><?php echo elgg_echo('shared_access:shared_access'); ?></a>
+ <?php
+ }
+ ?>
+ <a href="<?php echo $vars['url']; ?>pg/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a>
+ <?php
+ if(is_plugin_enabled('help')){
+ ?>
+ <a href="<?php echo $vars['url']; ?>mod/help/index.php" class="help">Help</a>
+ <?php
+ }
+ ?>
+ <?php
+ // The administration link is for admin or site admin users only
+ if ($vars['user']->admin || $vars['user']->siteadmin) {
+ ?>
+ <a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a>
+
+ <?php
+ }
+ ?>
</div>
-
-<div id="elgg_topbar_container_right">
- <small>
- <?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
- </small>
-</div>
-
-<div id="elgg_topbar_container_search">
-<?php echo elgg_view('page_elements/searchbox'); ?>
</div>
-
-</div><!-- /#elgg_topbar -->
-
-<div class="clearfloat"></div>
-
<?php
- }
+ }
+?> \ No newline at end of file
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
deleted file mode 100644
index 31c62a76e..000000000
--- a/views/default/page_elements/footer.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Elgg footer
- * The standard HTML footer that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-// get the tools menu
-//$menu = get_register('menu');
-
-?>
-
-<div class="clearfloat"></div>
-
-<div id="layout_footer">
-<table width="958" height="79" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td width="210" height="50">
-
- </td>
-
- <td width="748" height="50" align="right">
- <p class="footer_toolbar_links">
- <?php
- echo elgg_view('footer/links');
- ?>
- </p>
- </td>
- </tr>
-
- <tr>
- <td width="210" height="28">
- <a href="http://www.elgg.org" target="_blank">
- <img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" />
- </a>
- </td>
-
- <td width="748" height="28" align="right">
- <p class="footer_legal_links"><small>
- Powered by Elgg, the leading open source social networking platform
- </small>
- </p>
- </td>
- </tr>
-</table>
-</div><!-- /#layout_footer -->
-
-<div class="clearfloat"></div>
-
-</div><!-- /#page_wrapper -->
-</div><!-- /#page_container -->
-<!-- insert an analytics view to be extended -->
-<?php
- echo elgg_view('footer/analytics');
-?>
-</body>
-</html> \ No newline at end of file
diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php
deleted file mode 100644
index ac47d8962..000000000
--- a/views/default/page_elements/header_contents.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg header contents
- * This file holds the header output that a user will see
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- **/
-
-?>
-
-<div id="page_container">
-<div id="page_wrapper">
-
-<div id="layout_header">
-<div id="wrapper_header">
- <!-- display the page title -->
- <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
-</div><!-- /#wrapper_header -->
-</div><!-- /#layout_header --> \ No newline at end of file
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/html_begin.php
index 6cbb2fcb9..6836c5ee4 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/html_begin.php
@@ -1,13 +1,7 @@
<?php
/**
- * Elgg pageshell
+ * Start html output.
* The standard HTML header that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
* @uses $vars['config'] The site configuration settings, imported
* @uses $vars['title'] The page title
* @uses $vars['body'] The main content of the page
@@ -26,20 +20,14 @@ global $autofeed;
if (isset($autofeed) && $autofeed == true) {
$url = $url2 = full_url();
if (substr_count($url,'?')) {
- $url .= "&view=rss";
+ $url .= "&amp;view=rss";
} else {
$url .= "?view=rss";
}
- if (substr_count($url2,'?')) {
- $url2 .= "&view=odd";
- } else {
- $url2 .= "?view=opendd";
- }
$feedref = <<<END
<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
- <link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" />
-
+
END;
} else {
$feedref = "";
@@ -51,18 +39,31 @@ header('Content-type: text/html; charset=utf-8');
$version = get_version();
$release = get_version(true);
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="ElggRelease" content="<?php echo $release; ?>" />
<meta name="ElggVersion" content="<?php echo $version; ?>" />
<title><?php echo $title; ?></title>
+ <link REL="SHORTCUT ICON" HREF="<?php echo $vars['url']; ?>_graphics/favicon.ico">
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script>
+ <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.min.js"></script>
+ <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
+ <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/custom-form-elements.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+
+ <?php
+ echo $feedref;
+ echo elgg_view('metatags',$vars);
+ ?>
+ <script type="text/javascript">
+ jQuery(document).ready(function($) {
+ });
+ </script>
+
<?php
global $pickerinuse;
if (isset($pickerinuse) && $pickerinuse == true) {
@@ -76,14 +77,13 @@ $release = get_version(true);
<!-- include the default css file -->
<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;viewtype=<?php echo $vars['view']; ?>" type="text/css" />
- <?php
- echo $feedref;
- echo elgg_view('metatags',$vars);
- ?>
- <script type="text/javascript">
- jQuery(document).ready(function($) {
- });
- </script>
+ <!--[if IE 6]>
+ <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie6.php" />
+ <![endif]-->
+
+ <!--[if gt IE 6]>
+ <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie.php" />
+ <![endif]-->
</head>
<body>
diff --git a/views/default/page_elements/html_end.php b/views/default/page_elements/html_end.php
new file mode 100644
index 000000000..0862934cf
--- /dev/null
+++ b/views/default/page_elements/html_end.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Start html output.
+ * The standard HTML header that displays across the site
+ * @uses $vars['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ */
+?>
+</body>
+</html>
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 1a3440135..eb18a733e 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -12,24 +12,25 @@
$contents = "";
-// Is there a page owner?
-$owner = page_owner_entity();
-if ($owner instanceof ElggEntity) {
- $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
- if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
- $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+if(is_plugin_enabled('profile')) {
+ // Is there a page owner?
+ $owner = page_owner_entity();
+ if ($owner instanceof ElggEntity) {
+ $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+ if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
+ $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+ }
+ $display = "<div id='owner_block_icon'>" . $icon . "</div>";
+ $display .= "<div id='owner_block_content'>" . $info . "</div><div class='clearfloat ownerblockline'></div>";
+
+ if ($owner->briefdescription) {
+ $desc = $owner->briefdescription;
+ $display .= "<div id='owner_block_desc'>" . $desc . "</div>";
+ }
+
+ $contents .= "<div id='owner_block'>".$display."</div><div id='owner_block_bottom'></div>";
}
- $display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
- $display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
-
- if ($owner->briefdescription) {
- $desc = $owner->briefdescription;
- $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
- }
-
- $contents .= $display;
}
-
// Are there feeds to display?
global $autofeed;
@@ -43,7 +44,7 @@ if (isset($autofeed) && $autofeed == true) {
$label = elgg_echo('feed:rss');
$contents .= <<<END
-<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
+<div id="rss_link"><a href="{$url}" rel="nofollow">{$label}</a></div>
END;
}
@@ -55,13 +56,11 @@ $contents .= elgg_view('owner_block/extend');
if (isset($vars['content']))
$contents .= $vars['content'];
-// Initialise the submenu (plugins can add to the submenu)
+// Initialise the current tool/page submenu (plugins can add to the submenu)
$submenu = get_submenu();
if (!empty($submenu))
- $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>";
+ $contents .= "<div class='submenu page_navigation'>" . $submenu . "</div>";
if (!empty($contents)) {
- echo "<div id=\"owner_block\">";
echo $contents;
- echo "</div><div id=\"owner_block_bottom\"></div>";
} \ No newline at end of file
diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php
deleted file mode 100644
index 0c7e49c0f..000000000
--- a/views/default/page_elements/spotlight.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Elgg spotlight
- * The spotlight area that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-?>
-
-<div id="layout_spotlight">
-<div id="wrapper_spotlight">
-
-<div class="collapsable_box no_space_after">
- <div class="collapsable_box_header">
-<?php
-
- $closed = false;
- if ($_SESSION['user'] instanceof ElggUser) {
- if ($_SESSION['user']->spotlightclosed) {
-
- $closed = true;
-
- }
- }
- if ($closed) {
-?>
- <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=false"); ?>')">+</a>
-<?php
- } else {
-?>
- <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=true"); ?>')">-</a>
-<?php
-
- }
-
-?>
- <h1><?php echo elgg_echo("spotlight"); ?></h1>
- </div>
- <div class="collapsable_box_content" <?php if ($closed) echo "style=\"display:none\"" ?>>
-<?php
-
- $context = get_context();
- if (!empty($context) && elgg_view_exists("spotlight/{$context}")) {
- echo elgg_view("spotlight/{$context}");
- } else {
- echo elgg_view("spotlight/default");
- }
-?>
- </div><!-- /.collapsable_box_content -->
-</div><!-- /.collapsable_box -->
-
-</div><!-- /#wrapper_spotlight -->
-</div><!-- /#layout_spotlight -->
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index 5123c14a7..99bc0fc6d 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -1,12 +1,6 @@
<?php
/**
* Elgg title element
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
* @uses $vars['title'] The page title
*/
@@ -23,7 +17,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
if($page_owner_user instanceOf ElggGroup) {
$display = "<div id=\"content_area_group_title\">" . $info . "</div>";
} else {
- $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
+ $display = $info;
}
if (!empty($submenu) && $vars['submenu'] == true) {
// plugins can extend this to add menu options
@@ -34,7 +28,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
if($page_owner_user instanceOf ElggGroup) {
$display = "<div id=\"content_area_group_title\">" . $info . "</div>";
} else {
- $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
+ $display = $info;
}
if (!empty($submenu) && $vars['submenu'] == true) {
// plugins can extend this to add menu options
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 19:17:06 +0000