diff options
Diffstat (limited to 'views/default/page/elements')
| -rw-r--r-- | views/default/page/elements/body.php | 8 | ||||
| -rw-r--r-- | views/default/page/elements/comments.php | 42 | ||||
| -rw-r--r-- | views/default/page/elements/comments_block.php | 45 | ||||
| -rw-r--r-- | views/default/page/elements/composer.php | 7 | ||||
| -rw-r--r-- | views/default/page/elements/foot.php | 11 | ||||
| -rw-r--r-- | views/default/page/elements/footer.php | 18 | ||||
| -rw-r--r-- | views/default/page/elements/head.php | 39 | ||||
| -rw-r--r-- | views/default/page/elements/header.php | 18 | ||||
| -rw-r--r-- | views/default/page/elements/header_logo.php | 15 | ||||
| -rw-r--r-- | views/default/page/elements/messages.php | 27 | ||||
| -rw-r--r-- | views/default/page/elements/owner_block.php | 7 | ||||
| -rw-r--r-- | views/default/page/elements/shortcut_icon.php | 2 | ||||
| -rw-r--r-- | views/default/page/elements/sidebar.php | 13 | ||||
| -rw-r--r-- | views/default/page/elements/sidebar_alt.php | 20 | ||||
| -rw-r--r-- | views/default/page/elements/tagcloud_block.php | 58 | ||||
| -rw-r--r-- | views/default/page/elements/title.php | 11 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 16 | ||||
| -rw-r--r-- | views/default/page/elements/wrapper.php | 22 |
18 files changed, 306 insertions, 73 deletions
diff --git a/views/default/page/elements/body.php b/views/default/page/elements/body.php new file mode 100644 index 000000000..14c3978d3 --- /dev/null +++ b/views/default/page/elements/body.php @@ -0,0 +1,8 @@ +<?php +/** + * Elgg page body wrapper + * + * @uses $vars['body'] The HTML of the page body + */ + +echo elgg_extract('body', $vars, '');
\ No newline at end of file diff --git a/views/default/page/elements/comments.php b/views/default/page/elements/comments.php new file mode 100644 index 000000000..97cb9574e --- /dev/null +++ b/views/default/page/elements/comments.php @@ -0,0 +1,42 @@ +<?php +/** + * List comments with optional add form + * + * @uses $vars['entity'] ElggEntity + * @uses $vars['show_add_form'] Display add form or not + * @uses $vars['id'] Optional id for the div + * @uses $vars['class'] Optional additional class for the div + */ + +$show_add_form = elgg_extract('show_add_form', $vars, true); + +$id = ''; +if (isset($vars['id'])) { + $id = "id=\"{$vars['id']}\""; +} + +$class = 'elgg-comments'; +if (isset($vars['class'])) { + $class = "$class {$vars['class']}"; +} + +// work around for deprecation code in elgg_view() +unset($vars['internalid']); + +echo "<div $id class=\"$class\">"; + +$options = array( + 'guid' => $vars['entity']->getGUID(), + 'annotation_name' => 'generic_comment' +); +$html = elgg_list_annotations($options); +if ($html) { + echo '<h3>' . elgg_echo('comments') . '</h3>'; + echo $html; +} + +if ($show_add_form) { + echo elgg_view_form('comments/add', array(), $vars); +} + +echo '</div>'; diff --git a/views/default/page/elements/comments_block.php b/views/default/page/elements/comments_block.php new file mode 100644 index 000000000..d0f8ab809 --- /dev/null +++ b/views/default/page/elements/comments_block.php @@ -0,0 +1,45 @@ +<?php +/** + * Display the latest related comments + * + * Generally used in a sidebar. Does not work with groups currently. + * + * @uses $vars['subtypes'] Object subtype string or array of subtypes + * @uses $vars['owner_guid'] The owner of the content being commented on + * @uses $vars['limit'] The number of comments to display + */ + +$owner_guid = elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE); +if (!$owner_guid) { + $owner_guid = ELGG_ENTITIES_ANY_VALUE; +} + +$owner_entity = get_entity($owner_guid); +if ($owner_entity && elgg_instanceof($owner_entity, 'group')) { + // not supporting groups so return + return true; +} + +$options = array( + 'annotation_name' => 'generic_comment', + 'owner_guid' => $owner_guid, + 'reverse_order_by' => true, + 'limit' => elgg_extract('limit', $vars, 4), + 'type' => 'object', + 'subtypes' => elgg_extract('subtypes', $vars, ELGG_ENTITIES_ANY_VALUE), +); + +$title = elgg_echo('generic_comments:latest'); +$comments = elgg_get_annotations($options); +if ($comments) { + $body = elgg_view('page/components/list', array( + 'items' => $comments, + 'pagination' => false, + 'list_class' => 'elgg-latest-comments', + 'full_view' => false, + )); +} else { + $body = '<p>' . elgg_echo('generic_comment:none') . '</p>'; +} + +echo elgg_view_module('aside', $title, $body); diff --git a/views/default/page/elements/composer.php b/views/default/page/elements/composer.php deleted file mode 100644 index 3c92b4e7b..000000000 --- a/views/default/page/elements/composer.php +++ /dev/null @@ -1,7 +0,0 @@ -<div class="elgg-composer"><h4><?php echo elgg_echo('composer:prompt'); ?> :</h4><?php - echo elgg_view_menu('composer', array( - 'entity' => elgg_get_page_owner_entity(), - 'class' => 'elgg-menu-hz', - 'sort_by' => 'priority', - )); - ?></div><script>$('.elgg-composer').tabs({spinner: '',panelTemplate: '<div><div class="elgg-ajax-loader"></div></div>'});</script>
\ No newline at end of file diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php new file mode 100644 index 000000000..a56b373b4 --- /dev/null +++ b/views/default/page/elements/foot.php @@ -0,0 +1,11 @@ +<?php + +echo elgg_view('footer/analytics'); + +$js = elgg_get_loaded_js('footer'); +foreach ($js as $script) { ?> + <script type="text/javascript" src="<?php echo $script; ?>"></script> +<?php +} + +?>
\ No newline at end of file diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php index 5469e0f36..ded2cea9a 100644 --- a/views/default/page/elements/footer.php +++ b/views/default/page/elements/footer.php @@ -14,22 +14,8 @@ $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd echo '<div class="mts clearfloat float-alt">'; echo elgg_view('output/url', array( - 'href' => 'http://blog.wisb.me', - 'text' => elgg_echo('WISB:footer_wisblog'), - 'class' => '', - 'is_trusted' => true, -)); -echo (' · '); -echo elgg_view('output/url', array( - 'href' => 'http://developers.wisb.me', - 'text' => elgg_echo('WISB:footer_developers'), - 'class' => '', - 'is_trusted' => true, -)); -echo (' · '); -echo elgg_view('output/url', array( - 'href' => 'http://www.wisb.me', - 'text' => elgg_echo('WISB:footer_wisb'), + 'href' => 'http://elgg.org', + 'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />", 'class' => '', 'is_trusted' => true, )); diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index 859326bbe..d4a95b4d0 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -9,12 +9,12 @@ if (empty($vars['title'])) { $title = elgg_get_config('sitename'); } else { - $title = elgg_get_config('sitename') . " · " . $vars['title']; + $title = elgg_get_config('sitename') . ": " . $vars['title']; } global $autofeed; if (isset($autofeed) && $autofeed == true) { - $url = full_url(); + $url = current_page_url(); if (substr_count($url,'?')) { $url .= "&view=rss"; } else { @@ -36,28 +36,41 @@ $css = elgg_get_loaded_css(); $version = get_version(); $release = get_version(true); ?> -<meta http-equiv="X-UA-Compatible" content="IE=edge" /> -<title><?php echo $title; ?></title> -<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?> + <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> + <?php echo elgg_view('page/elements/shortcut_icon', $vars); ?> + <?php foreach ($css as $link) { ?> <link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" /> <?php } ?> + <?php $ie_url = elgg_get_simplecache_url('css', 'ie'); $ie7_url = elgg_get_simplecache_url('css', 'ie7'); + $ie6_url = elgg_get_simplecache_url('css', 'ie6'); ?> -<!--[if gt IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> -<![endif]--> -<!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" /> -<![endif]--> + <!--[if gt IE 7]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> + <![endif]--> + <!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" /> + <![endif]--> + <!--[if IE 6]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" /> + <![endif]--> + <?php foreach ($js as $script) { ?> <script type="text/javascript" src="<?php echo $script; ?>"></script> <?php } ?> + <script type="text/javascript"> -<?php echo elgg_view('js/initialize_elgg'); ?> +// <![CDATA[ + <?php echo elgg_view('js/initialize_elgg'); ?> +// ]]> </script> + <?php echo $feedref; @@ -65,4 +78,4 @@ $metatags = elgg_view('metatags', $vars); if ($metatags) { elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8); echo $metatags; -}
\ No newline at end of file +} diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php index 45fb91da8..1a1f5d211 100644 --- a/views/default/page/elements/header.php +++ b/views/default/page/elements/header.php @@ -1,12 +1,14 @@ <?php +/** + * Elgg page header + * In the default theme, the header lives between the topbar and main content area. + */ -$site = elgg_get_site_entity(); +// link back to main site. +echo elgg_view('page/elements/header_logo', $vars); -echo "<h1 id=\"facebook-header-logo\">"; -echo elgg_view('output/url', array( - 'href' => '/', - 'text' => $site->name, -)); -echo "</h1>"; +// drop-down login +echo elgg_view('core/account/login_dropdown'); -echo elgg_view_form('login', array('id' => 'facebook-header-login'));
\ No newline at end of file +// insert site-wide navigation +echo elgg_view_menu('site');
\ No newline at end of file diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php new file mode 100644 index 000000000..7fe721c40 --- /dev/null +++ b/views/default/page/elements/header_logo.php @@ -0,0 +1,15 @@ +<?php +/** + * Elgg header logo + */ + +$site = elgg_get_site_entity(); +$site_name = $site->name; +$site_url = elgg_get_site_url(); +?> + +<h1> + <a class="elgg-heading-site" href="<?php echo $site_url; ?>"> + <?php echo $site_name; ?> + </a> +</h1> diff --git a/views/default/page/elements/messages.php b/views/default/page/elements/messages.php new file mode 100644 index 000000000..edd40d71e --- /dev/null +++ b/views/default/page/elements/messages.php @@ -0,0 +1,27 @@ +<?php +/** + * Elgg global system message list + * Lists all system messages + * + * @package Elgg + * @subpackage Core + * + * @uses $vars['object'] The array of message registers + */ + +echo '<ul class="elgg-system-messages">'; + +// hidden li so we validate +echo '<li class="hidden"></li>'; + +if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) { + foreach ($vars['object'] as $type => $list ) { + foreach ($list as $message) { + echo "<li class=\"elgg-message elgg-state-$type\">"; + echo elgg_autop($message); + echo '</li>'; + } + } +} + +echo '</ul>'; diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php index cee13ebff..fc7f0f6d2 100644 --- a/views/default/page/elements/owner_block.php +++ b/views/default/page/elements/owner_block.php @@ -12,11 +12,12 @@ elgg_push_context('owner_block'); // groups and other users get owner block $owner = elgg_get_page_owner_entity(); -if ($owner instanceof ElggGroup || $owner instanceof ElggUser) { +if ($owner instanceof ElggGroup || + ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) { - $header = elgg_view_entity_icon($owner, 'large'); + $header = elgg_view_entity($owner, array('full_view' => false)); - $body = elgg_view_menu('owner_block', array('entity' => $owner, 'sort_by' => 'priority')); + $body = elgg_view_menu('owner_block', array('entity' => $owner)); $body .= elgg_view('page/elements/owner_block/extend', $vars); diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php index 74ab4f629..12fe9c1f8 100644 --- a/views/default/page/elements/shortcut_icon.php +++ b/views/default/page/elements/shortcut_icon.php @@ -3,4 +3,4 @@ * Displays the default shortcut icon */ ?> -<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>mod/cool_theme/_graphics/favicon.ico" />
\ No newline at end of file +<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
\ No newline at end of file diff --git a/views/default/page/elements/sidebar.php b/views/default/page/elements/sidebar.php index 3bd8abb8e..fe6bb450e 100644 --- a/views/default/page/elements/sidebar.php +++ b/views/default/page/elements/sidebar.php @@ -5,9 +5,14 @@ * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar */ +echo elgg_view_menu('extras', array( + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', +)); + echo elgg_view('page/elements/owner_block', $vars); -echo elgg_view_menu('page', array('sort_by' => 'priority')); +echo elgg_view_menu('page', array('sort_by' => 'name')); // optional 'sidebar' parameter if (isset($vars['sidebar'])) { @@ -24,8 +29,4 @@ if (isset($vars['area2'])) { // optional third parameter of elgg_view_layout if (isset($vars['area3'])) { echo $vars['area3']; -} - -echo elgg_view_menu('extras', array( - 'sort_by' => 'priority', -));
\ No newline at end of file +}
\ No newline at end of file diff --git a/views/default/page/elements/sidebar_alt.php b/views/default/page/elements/sidebar_alt.php index 5d1f54947..6d91ca58b 100644 --- a/views/default/page/elements/sidebar_alt.php +++ b/views/default/page/elements/sidebar_alt.php @@ -1,12 +1,12 @@ -<?php +<?php +/** + * Elgg secondary sidebar contents + * + * You can override, extend, or pass content to it + * + * @uses $vars['sidebar_alt] HTML content for the alternate sidebar + */ +$sidebar = elgg_extract('sidebar_alt', $vars, ''); -$homepage = "/dashboard"; -$currentpage = $_SERVER['REQUEST_URI']; -if($homepage==$currentpage) { -echo "<strong><a href=\"../thanks\">Thanks</a></strong><br /> -edit the sidebar for the dashboard in /mod/cool_theme/views/default/page/elements/sidebar_alt.php<br /> -and enjoy"; -} - -?>
\ No newline at end of file +echo $sidebar; diff --git a/views/default/page/elements/tagcloud_block.php b/views/default/page/elements/tagcloud_block.php new file mode 100644 index 000000000..258951c41 --- /dev/null +++ b/views/default/page/elements/tagcloud_block.php @@ -0,0 +1,58 @@ +<?php +/** + * Display content-based tags + * + * Generally used in a sidebar. Does not work with groups currently. + * + * @uses $vars['subtypes'] Object subtype string or array of subtypes + * @uses $vars['owner_guid'] The owner of the content being tagged + * @uses $vars['limit'] The maxinum number of tags to display + */ + +$owner_guid = elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE); +if (!$owner_guid) { + $owner_guid = ELGG_ENTITIES_ANY_VALUE; +} + +$owner_entity = get_entity($owner_guid); +if ($owner_entity && elgg_instanceof($owner_entity, 'group')) { + // not supporting groups so return + return true; +} + +$options = array( + 'type' => 'object', + 'subtype' => elgg_extract('subtypes', $vars, ELGG_ENTITIES_ANY_VALUE), + 'owner_guid' => $owner_guid, + 'threshold' => 0, + 'limit' => elgg_extract('limit', $vars, 50), + 'tag_name' => 'tags', +); + +$title = elgg_echo('tagcloud'); +if (is_array($options['subtype']) && count($options['subtype']) > 1) { + // we cannot provide links to tagged objects with multiple types + $tag_data = elgg_get_tags($options); + $cloud = elgg_view("output/tagcloud", array( + 'value' => $tag_data, + 'type' => $type, + )); +} else { + $cloud = elgg_view_tagcloud($options); +} +if (!$cloud) { + return true; +} + +// add a link to all site tags +$cloud .= '<p class="small">'; +$cloud .= elgg_view_icon('tag'); +$cloud .= elgg_view('output/url', array( + 'href' => 'tags', + 'text' => elgg_echo('tagcloud:allsitetags'), + 'is_trusted' => true, +)); +$cloud .= '</p>'; + + +echo elgg_view_module('aside', $title, $cloud); diff --git a/views/default/page/elements/title.php b/views/default/page/elements/title.php index 77260212e..19f47f4e6 100644 --- a/views/default/page/elements/title.php +++ b/views/default/page/elements/title.php @@ -6,16 +6,9 @@ * @uses $vars['class'] Optional class for heading */ -if (isset($vars['header'])) { - echo $vars['header']; - return true; -} - -$class = ''; +$class= ''; if (isset($vars['class'])) { $class = " class=\"{$vars['class']}\""; } -echo elgg_view_menu('title', array('sort_by' => 'priority')); -echo "<h1{$class}>{$vars['title']}</h1>"; -echo elgg_view('navigation/breadcrumbs');
\ No newline at end of file +echo "<h2{$class}>{$vars['title']}</h2>"; diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php new file mode 100644 index 000000000..e4c6c86bb --- /dev/null +++ b/views/default/page/elements/topbar.php @@ -0,0 +1,16 @@ +<?php +/** + * Elgg topbar + * The standard elgg top toolbar + */ + +// Elgg logo +echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz'))); + +// elgg tools menu +// need to echo this empty view for backward compatibility. +$content = elgg_view("navigation/topbar_tools"); +if ($content) { + elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8); + echo $content; +} diff --git a/views/default/page/elements/wrapper.php b/views/default/page/elements/wrapper.php new file mode 100644 index 000000000..61828832d --- /dev/null +++ b/views/default/page/elements/wrapper.php @@ -0,0 +1,22 @@ +<?php +/** + * Deprecated content wrapper view from Elgg 1.5 through 1.7 + * + * @uses $vars['body'] The content to display inside content wrapper + * @uses $vars['subclass'] Additional css class + */ + +elgg_deprecated_notice("The 'page_elements/contentwrapper' has been deprecated", 1.8); +?> + +<div class="contentWrapper<?php + + if (isset($vars['subclass'])) { + echo ' ' . $vars['subclass']; + } + +?>"> +<?php + echo $vars['body']; +?> +</div> |