From d7adaddab7189bc493d22d96fec424aedca09b11 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 8 Dec 2010 01:19:38 +0000 Subject: reorganized the page views as discussed git-svn-id: http://code.elgg.org/elgg/trunk@7559 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 2 +- engine/lib/views.php | 8 +- mod/blog/lib/blog.php | 1 - mod/bookmarks/bookmarklet.php | 2 +- mod/bookmarks/start.php | 6 +- mod/diagnostics/index.php | 4 +- mod/file/friends.php | 2 +- mod/file/index.php | 4 +- mod/file/search.php | 8 +- mod/file/world.php | 2 +- mod/groups/all.php | 2 +- mod/groups/index.php | 2 +- mod/groups/membership.php | 2 +- mod/members/index.php | 2 +- mod/search/index.php | 4 +- mod/sitepages/sitepages_functions.php | 4 +- views/default/layout/shells/two_sidebar.php | 2 +- views/default/page/elements/body.php | 14 + views/default/page/elements/content.php | 14 + views/default/page/elements/content_header.php | 94 +++++++ .../page/elements/content_header_member.php | 24 ++ views/default/page/elements/footer.php | 21 ++ views/default/page/elements/header.php | 24 ++ views/default/page/elements/header_logo.php | 12 + views/default/page/elements/html_begin.php | 93 +++++++ views/default/page/elements/html_end.php | 11 + views/default/page/elements/messages.php | 28 ++ views/default/page/elements/topbar.php | 44 ++++ views/default/page/elements/topbar_logout.php | 14 + views/default/page/shells/admin.php | 29 +++ views/default/page/shells/default.php | 37 +++ views/default/page/shells/walled_garden.php | 281 +++++++++++++++++++++ views/default/page_elements/body.php | 14 - views/default/page_elements/content.php | 14 - views/default/page_elements/content_header.php | 94 ------- .../page_elements/content_header_member.php | 24 -- views/default/page_elements/footer.php | 21 -- views/default/page_elements/header.php | 24 -- views/default/page_elements/header_logo.php | 12 - views/default/page_elements/html_begin.php | 93 ------- views/default/page_elements/html_end.php | 11 - views/default/page_elements/messages.php | 28 -- views/default/page_elements/topbar.php | 44 ---- views/default/page_elements/topbar_logout.php | 14 - views/default/page_shells/admin.php | 29 --- views/default/page_shells/default.php | 37 --- views/default/page_shells/walled_garden.php | 281 --------------------- views/failsafe/page/shells/default.php | 60 +++++ views/failsafe/page_shells/default.php | 60 ----- views/foaf/page/shells/default.php | 48 ++++ views/foaf/page_elements/contentwrapper.php | 8 - views/foaf/page_shells/default.php | 48 ---- views/ical/page/shells/default.php | 18 ++ views/ical/pageshells/pageshell.php | 18 -- views/installation/page/shells/default.php | 52 ++++ views/installation/page_shells/default.php | 52 ---- views/json/page/shells/default.php | 18 ++ views/json/page_elements/contentwrapper.php | 9 - views/json/page_shells/default.php | 18 -- views/opendd/page/shells/default.php | 16 ++ views/opendd/pageshells/pageshell.php | 16 -- views/php/page/shells/default.php | 10 + views/php/page_shells/default.php | 10 - views/rss/page/shells/default.php | 43 ++++ views/rss/page_elements/contentwrapper.php | 7 - views/rss/page_shells/default.php | 43 ---- views/xml/page/shells/default.php | 14 + views/xml/page_shells/default.php | 14 - 68 files changed, 1047 insertions(+), 1072 deletions(-) create mode 100644 views/default/page/elements/body.php create mode 100644 views/default/page/elements/content.php create mode 100644 views/default/page/elements/content_header.php create mode 100644 views/default/page/elements/content_header_member.php create mode 100644 views/default/page/elements/footer.php create mode 100644 views/default/page/elements/header.php create mode 100644 views/default/page/elements/header_logo.php create mode 100644 views/default/page/elements/html_begin.php create mode 100644 views/default/page/elements/html_end.php create mode 100644 views/default/page/elements/messages.php create mode 100644 views/default/page/elements/topbar.php create mode 100644 views/default/page/elements/topbar_logout.php create mode 100644 views/default/page/shells/admin.php create mode 100644 views/default/page/shells/default.php create mode 100644 views/default/page/shells/walled_garden.php delete mode 100644 views/default/page_elements/body.php delete mode 100644 views/default/page_elements/content.php delete mode 100644 views/default/page_elements/content_header.php delete mode 100644 views/default/page_elements/content_header_member.php delete mode 100644 views/default/page_elements/footer.php delete mode 100644 views/default/page_elements/header.php delete mode 100644 views/default/page_elements/header_logo.php delete mode 100644 views/default/page_elements/html_begin.php delete mode 100644 views/default/page_elements/html_end.php delete mode 100644 views/default/page_elements/messages.php delete mode 100644 views/default/page_elements/topbar.php delete mode 100644 views/default/page_elements/topbar_logout.php delete mode 100644 views/default/page_shells/admin.php delete mode 100644 views/default/page_shells/default.php delete mode 100644 views/default/page_shells/walled_garden.php create mode 100644 views/failsafe/page/shells/default.php delete mode 100644 views/failsafe/page_shells/default.php create mode 100644 views/foaf/page/shells/default.php delete mode 100644 views/foaf/page_elements/contentwrapper.php delete mode 100644 views/foaf/page_shells/default.php create mode 100644 views/ical/page/shells/default.php delete mode 100644 views/ical/pageshells/pageshell.php create mode 100644 views/installation/page/shells/default.php delete mode 100644 views/installation/page_shells/default.php create mode 100644 views/json/page/shells/default.php delete mode 100644 views/json/page_elements/contentwrapper.php delete mode 100644 views/json/page_shells/default.php create mode 100644 views/opendd/page/shells/default.php delete mode 100644 views/opendd/pageshells/pageshell.php create mode 100644 views/php/page/shells/default.php delete mode 100644 views/php/page_shells/default.php create mode 100644 views/rss/page/shells/default.php delete mode 100644 views/rss/page_elements/contentwrapper.php delete mode 100644 views/rss/page_shells/default.php create mode 100644 views/xml/page/shells/default.php delete mode 100644 views/xml/page_shells/default.php diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index e8014f2a2..856aa2d36 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -587,7 +587,7 @@ function get_register($register_name) { * * The method of displaying these messages differs depending upon plugins and * viewtypes. The core default viewtype retrieves messages in - * {@link views/default/page_shells/default.php} and displays messages as + * {@link views/default/page/shells/default.php} and displays messages as * javascript popups. * * @internal Messages are stored as strings in the $_SESSION['msg'][$register] array. diff --git a/engine/lib/views.php b/engine/lib/views.php index 26d48be2f..6fd6cfb8c 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -552,7 +552,7 @@ function extend_view($view, $view_name, $priority = 501, $viewtype = '') { * * @param string $title Title * @param string $body Body - * @param string $page_shell Optional page shell to use. See page_shells view directory + * @param string $page_shell Optional page shell to use. See page/shells view directory * @param array $vars Optional vars array to pass to the page * shell. Automatically adds title, body, and sysmessages * @@ -578,7 +578,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) $vars['sysmessages'] = $messages; // Draw the page - $output = elgg_view("page_shells/$page_shell", $vars); + $output = elgg_view("page/shells/$page_shell", $vars); $vars['page_shell'] = $page_shell; @@ -884,7 +884,7 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full = true) { /** * Returns a rendered title. * - * This is a shortcut for {@elgg_view page_elements/title}. + * This is a shortcut for {@elgg_view layout/elements/title}. * * @param string $title The page title * @param string $submenu Should a submenu be displayed? (default false, use not recommended and deprecated) @@ -896,7 +896,7 @@ function elgg_view_title($title, $submenu = false) { elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8); } - $title = elgg_view('page_elements/title', array('title' => $title, 'submenu' => $submenu)); + $title = elgg_view('layout/elements/title', array('title' => $title, 'submenu' => $submenu)); return $title; } diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index 331871fc8..035105a7d 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -161,7 +161,6 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) { $now = time(); elgg_push_breadcrumb(elgg_echo('blog:archives')); - //$content = elgg_view('page_elements/content_header_member', array('type' => 'blog')); if ($lower) { $lower = (int)$lower; diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php index 7a2f1a16f..7a0c88a8d 100644 --- a/mod/bookmarks/bookmarklet.php +++ b/mod/bookmarks/bookmarklet.php @@ -19,7 +19,7 @@ if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) { } // get the content area header -$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'bookmarks')); +$area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'bookmarks')); // List bookmarks $area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet')); diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index cc34d6e76..e3f7394d2 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -222,11 +222,11 @@ function bookmarks_page_handler($page) { //select the header depending on whether a user is looking at their bookmarks or someone elses if($owner){ if ($owner != $logged_in_user && !($owner instanceof ElggGroup)) { - $header .= elgg_view("page_elements/content_header_member", array( + $header .= elgg_view("page/elements/content_header_member", array( 'type' => 'bookmarks' )); }else{ - $header .= elgg_view("page_elements/content_header", array( + $header .= elgg_view("page/elements/content_header", array( 'context' => $context, 'type' => 'bookmarks', 'all_link' => "pg/bookmarks/", @@ -234,7 +234,7 @@ function bookmarks_page_handler($page) { )); } }else{ - $header .= elgg_view("page_elements/content_header", array( + $header .= elgg_view("page/elements/content_header", array( 'context' => $context, 'type' => 'bookmarks', 'all_link' => "pg/bookmarks/", diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php index ad77b5085..4f746c1c1 100644 --- a/mod/diagnostics/index.php +++ b/mod/diagnostics/index.php @@ -13,7 +13,7 @@ elgg_set_context('admin'); // system diagnostics $content = elgg_view_title(elgg_echo('diagnostics')); $content .= "
"; -$content .= elgg_view('page_elements/content', array('body' => +$content .= elgg_view('page/elements/content', array('body' => "

".elgg_echo('diagnostics:report')."

".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download')) ); @@ -32,7 +32,7 @@ if (isset($CONFIG->debug)) { $test_body .= elgg_echo('diagnostics:unittester:debug'); } -$content .= elgg_view('page_elements/content', array( +$content .= elgg_view('page/elements/content', array( 'body' => $test_body) ); $content .= "
"; diff --git a/mod/file/friends.php b/mod/file/friends.php index 44532dfba..6ead3cf40 100644 --- a/mod/file/friends.php +++ b/mod/file/friends.php @@ -14,7 +14,7 @@ $owner = elgg_get_page_owner(); $title = elgg_echo("file:friends",array($owner->name)); - $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); + $area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file')); elgg_push_context('search'); // offset is grabbed in list_user_friends_objects $content = list_user_friends_objects($owner->guid, 'file', 10, false); diff --git a/mod/file/index.php b/mod/file/index.php index ae2353724..e0ec1451f 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -16,10 +16,10 @@ //set the title if (elgg_get_page_owner_guid() == get_loggedin_userid()) { $title = elgg_echo('file:yours'); - $area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file')); + $area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file')); } else { $title = elgg_echo("file:user",array(elgg_get_page_owner()->name)); - $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); + $area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file')); } // Get objects diff --git a/mod/file/search.php b/mod/file/search.php index 5c6c0a969..fa6c5ea71 100644 --- a/mod/file/search.php +++ b/mod/file/search.php @@ -47,18 +47,18 @@ if (empty($tag)) { $title = elgg_echo('file:type:all'); $area2 = elgg_view_title(elgg_echo('file:type:all')); - $area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file')); + $area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file')); } else { $title = elgg_echo('searchtitle',array($tag)); if (is_array($owner_guid)) { //$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag)); - $area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file')); + $area2 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file')); } else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != get_loggedin_userid()) { //$area2 = elgg_view_title(elgg_echo("file:user:type:" . $tag,array(elgg_get_page_owner()->name))); - $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file')); + $area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file')); } else{ //$area2 = elgg_view_title(elgg_echo("file:type:" . $tag)); - $area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file')); + $area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file')); } } if ($friends) { diff --git a/mod/file/world.php b/mod/file/world.php index 6ac4ba38a..3bacaad00 100644 --- a/mod/file/world.php +++ b/mod/file/world.php @@ -20,7 +20,7 @@ $title = elgg_echo('file:all'); // Get objects - $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file')); + $area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file')); $area1 .= get_filetype_cloud(); // the filter elgg_push_context('search'); $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); diff --git a/mod/groups/all.php b/mod/groups/all.php index 6e472459d..08bdd4a0a 100644 --- a/mod/groups/all.php +++ b/mod/groups/all.php @@ -56,7 +56,7 @@ $title = elgg_echo("groups:all", array(elgg_get_page_owner()->name)); if(isloggedin()){ - $area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new")); + $area1 .= elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new")); } $area1 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects; diff --git a/mod/groups/index.php b/mod/groups/index.php index a8c81b27e..1deabb3de 100644 --- a/mod/groups/index.php +++ b/mod/groups/index.php @@ -13,7 +13,7 @@ $title = elgg_echo("groups:owned"); // Get objects - $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new")); + $area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new")); elgg_push_context('search'); $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); diff --git a/mod/groups/membership.php b/mod/groups/membership.php index 8eea0b6bb..6af38f4ae 100644 --- a/mod/groups/membership.php +++ b/mod/groups/membership.php @@ -19,7 +19,7 @@ } else $title = elgg_echo("groups:owned"); // Get objects - $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new")); + $area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new")); elgg_push_context('search'); // offset is grabbed in the list_entities_from_relationship() function diff --git a/mod/members/index.php b/mod/members/index.php index 5a62e9d46..8e6141dfa 100644 --- a/mod/members/index.php +++ b/mod/members/index.php @@ -71,7 +71,7 @@ switch($filter){ break; } -$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "
".$filter_content."
", 'subclass' => 'members')); +$area2 .= elgg_view('page/elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "
".$filter_content."
", 'subclass' => 'members')); //select the correct canvas area $params = array( diff --git a/mod/search/index.php b/mod/search/index.php index 7f7be9860..4e73b78ae 100644 --- a/mod/search/index.php +++ b/mod/search/index.php @@ -137,7 +137,7 @@ foreach ($custom_types as $type) { // check that we have an actual query if (!$query) { $body = elgg_view_title(elgg_echo('search:search_error')); - $body .= elgg_view('page_elements/content', array('body' => elgg_echo('search:no_query'))); + $body .= elgg_view('page/elements/content', array('body' => elgg_echo('search:no_query'))); $layout = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); echo elgg_view_page($title, $layout); @@ -247,7 +247,7 @@ $highlighted_query = search_highlight_words($searched_words, $query); $body = elgg_view_title(elgg_echo('search:results', array("\"$highlighted_query\""))); if (!$results_html) { - $body .= elgg_view('page_elements/contentwrapper', array('body' => elgg_echo('search:no_results'))); + $body .= elgg_view('page/elements/contentwrapper', array('body' => elgg_echo('search:no_results'))); } else { $body .= $results_html; } diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php index f1dfdd047..3a6c10359 100644 --- a/mod/sitepages/sitepages_functions.php +++ b/mod/sitepages/sitepages_functions.php @@ -92,9 +92,9 @@ function sitepages_get_page_content($page_type) { $sitepage = sitepages_get_sitepage_object($page_type); if ($sitepage) { - $body .= elgg_view('page_elements/content', array('body' => $sitepage->description)); + $body .= elgg_view('page/elements/content', array('body' => $sitepage->description)); } else { - $body .= elgg_view('page_elements/content', array('body' => elgg_echo('sitepages:notset'))); + $body .= elgg_view('page/elements/content', array('body' => elgg_echo('sitepages:notset'))); } $content = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php index d0a6825c9..cc4eee78b 100644 --- a/views/default/layout/shells/two_sidebar.php +++ b/views/default/layout/shells/two_sidebar.php @@ -22,7 +22,7 @@ //$params = $vars; //$params['sidebar'] = $vars['sidebar-alt']; $params = array( - 'sidebar' => elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!')) + 'sidebar' => elgg_view('layout/objects/module', array('title' => 'Testing', 'body' => 'Hello, world!')) ); echo elgg_view('layout/elements/sidebar', $params); ?> diff --git a/views/default/page/elements/body.php b/views/default/page/elements/body.php new file mode 100644 index 000000000..6f7691693 --- /dev/null +++ b/views/default/page/elements/body.php @@ -0,0 +1,14 @@ + + $body + +HTML; diff --git a/views/default/page/elements/content.php b/views/default/page/elements/content.php new file mode 100644 index 000000000..f82720c2f --- /dev/null +++ b/views/default/page/elements/content.php @@ -0,0 +1,14 @@ + + $body + +HTML; diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php new file mode 100644 index 000000000..8809ad8b7 --- /dev/null +++ b/views/default/page/elements/content_header.php @@ -0,0 +1,94 @@ +username; + +if (!$page_owner) { + $page_owner = $logged_in_user; +} + +// so we know if the user is looking at their own, everyone's or all friends +$filter_context = $vars['context']; + +// get the object type +$type = $vars['type']; + +// create an empty string to start with +$new_button = ''; + +// generate a list of default tabs +$default_tabs = array( + 'all' => array( + 'title' => elgg_echo('all'), + 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php", + 'selected' => ($filter_context == 'everyone'), + ), + 'mine' => array( + 'title' => elgg_echo('mine'), + 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username", + 'selected' => ($filter_context == 'mine'), + ), + 'friend' => array( + 'title' => elgg_echo('friends'), + 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends", + 'selected' => ($filter_context == 'friends'), + ), +); + +// determine if using default or overwritten tabs +$tabs = (isset($vars['tabs'])) ? $vars['tabs'] : $default_tabs; +$tab_list = elgg_view('navigation/tabs', array('tabs' => $tabs)); + +$title = elgg_echo($type); +$title = '
' . elgg_view_title($title) . '
'; + +// must be logged in to see any action buttons +if (isloggedin()) { + // only show the new button when not on the add form. + // hide the tabs when on the add form. + if ($filter_context == 'action') { + $tab_list = ''; + } else { + // @todo remove the hard coded reference to the videolist plugin + if (elgg_get_context() == "videolist"){ + $video_link = elgg_get_site_url() . "pg/videolist/browse/$username/"; + $new_button = "" . elgg_echo('videolist:browsemenu') . ''; + } else { + $new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new"); + $new_button = "" . elgg_echo($type . ':new') . ''; + } + $new_button = "
$new_button
"; + } + + // also hide the tabs if in a group context (ie, listing groups) or + // when viewing tools belonging to a group + if (elgg_get_context() == 'groups' || $page_owner instanceof ElggGroup) { + $tab_list = ''; + } +} + +echo << + $title $new_button + +HTML; + +echo $tab_list; diff --git a/views/default/page/elements/content_header_member.php b/views/default/page/elements/content_header_member.php new file mode 100644 index 000000000..4cfee9258 --- /dev/null +++ b/views/default/page/elements/content_header_member.php @@ -0,0 +1,24 @@ +name; + +// get the object type +$type = $vars['type']; + +$title = elgg_echo($type); +$title = $name . "'s " . $type; +?> + +
+ ' . elgg_view_title($title) . '
'; ?> + + diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php new file mode 100644 index 000000000..6c9cdc55e --- /dev/null +++ b/views/default/page/elements/footer.php @@ -0,0 +1,21 @@ + +
+
+ + + Powered by Elgg + +
+
+ + diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php new file mode 100644 index 000000000..148279b2e --- /dev/null +++ b/views/default/page/elements/header.php @@ -0,0 +1,24 @@ + +
+
+ +
+
diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php new file mode 100644 index 000000000..6ae6a0fab --- /dev/null +++ b/views/default/page/elements/header_logo.php @@ -0,0 +1,12 @@ + + +

+ + sitename; ?> + +

diff --git a/views/default/page/elements/html_begin.php b/views/default/page/elements/html_begin.php new file mode 100644 index 000000000..23879dde8 --- /dev/null +++ b/views/default/page/elements/html_begin.php @@ -0,0 +1,93 @@ +sitename; +} else if (empty($vars['config']->sitename)) { + $title = $vars['title']; +} else { + $title = $vars['config']->sitename . ": " . $vars['title']; +} + +global $autofeed; +if (isset($autofeed) && $autofeed == true) { + $url = full_url(); + if (substr_count($url,'?')) { + $url .= "&view=rss"; + } else { + $url .= "?view=rss"; + } + $url = elgg_format_url($url); + $feedref = << + +END; +} else { + $feedref = ""; +} + +$js = elgg_get_js('head'); +$css = elgg_get_css(); + +// we won't trust server configuration but specify utf-8 +header('Content-type: text/html; charset=utf-8'); + +$version = get_version(); +$release = get_version(true); +?> + + + + + + + <?php echo $title; ?> + + + + + + + + + + + + + + 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 @@ + + + diff --git a/views/default/page/elements/messages.php b/views/default/page/elements/messages.php new file mode 100644 index 000000000..f44d1204b --- /dev/null +++ b/views/default/page/elements/messages.php @@ -0,0 +1,28 @@ + 0) { + + echo ''; +} diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php new file mode 100644 index 000000000..75df5fa93 --- /dev/null +++ b/views/default/page/elements/topbar.php @@ -0,0 +1,44 @@ +guid > 0)) { + echo '
'; + echo '
'; + + // Elgg logo + echo ''; + echo "\"Elgg"; + echo ''; + + // avatar + $user_link = $user->getURL(); + $user_image = $user->getIcon('topbar'); + echo "\"User"; + + // logout link + echo elgg_view('page/elements/topbar_logout', $vars); + + // elgg tools menu + // need to echo this empty view for backward compatibility. + echo elgg_view("navigation/topbar_tools"); + + // enable elgg topbar extending + echo elgg_view('elgg_topbar/extend', $vars); + + // user settings + $settings = elgg_echo('settings'); + echo "$settings"; + + // The administration link is for admin or site admin users only + if ($user->isAdmin()) { + $admin = elgg_echo("admin"); + echo "$admin"; + } + + echo '
'; + echo '
'; +} diff --git a/views/default/page/elements/topbar_logout.php b/views/default/page/elements/topbar_logout.php new file mode 100644 index 000000000..2d2ecf67c --- /dev/null +++ b/views/default/page/elements/topbar_logout.php @@ -0,0 +1,14 @@ +'; +echo elgg_view('output/url', array( + 'href' => "action/logout", + 'text' => elgg_echo('logout'), + 'is_action' => TRUE +)); +echo ''; diff --git a/views/default/page/shells/admin.php b/views/default/page/shells/admin.php new file mode 100644 index 000000000..c2581b23f --- /dev/null +++ b/views/default/page/shells/admin.php @@ -0,0 +1,29 @@ + $vars['sysmessages'])); +echo elgg_view('page/elements/content', $vars); +echo elgg_view('page/elements/html_end', $vars); \ No newline at end of file diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php new file mode 100644 index 000000000..080bc7099 --- /dev/null +++ b/views/default/page/shells/default.php @@ -0,0 +1,37 @@ +'; +echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +echo elgg_view('page/elements/topbar', $vars); +echo elgg_view('page/elements/header', $vars); +echo elgg_view('page/elements/body', $vars); +echo elgg_view('page/elements/footer', $vars); +echo ''; + +echo elgg_view('page/elements/html_end', $vars); diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php new file mode 100644 index 000000000..4e64276c1 --- /dev/null +++ b/views/default/page/shells/walled_garden.php @@ -0,0 +1,281 @@ + + + + $vars['sysmessages'])); + +echo "
$view
"; +echo '
'; +echo "

Welcome to:
$title

"; +echo "
{$vars['body']}
"; +echo '
'; +echo '
'; +echo '
'; + +echo elgg_view('page/elements/html_end', $vars); diff --git a/views/default/page_elements/body.php b/views/default/page_elements/body.php deleted file mode 100644 index 6f7691693..000000000 --- a/views/default/page_elements/body.php +++ /dev/null @@ -1,14 +0,0 @@ - - $body - -HTML; diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php deleted file mode 100644 index f82720c2f..000000000 --- a/views/default/page_elements/content.php +++ /dev/null @@ -1,14 +0,0 @@ - - $body - -HTML; diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php deleted file mode 100644 index 8809ad8b7..000000000 --- a/views/default/page_elements/content_header.php +++ /dev/null @@ -1,94 +0,0 @@ -username; - -if (!$page_owner) { - $page_owner = $logged_in_user; -} - -// so we know if the user is looking at their own, everyone's or all friends -$filter_context = $vars['context']; - -// get the object type -$type = $vars['type']; - -// create an empty string to start with -$new_button = ''; - -// generate a list of default tabs -$default_tabs = array( - 'all' => array( - 'title' => elgg_echo('all'), - 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php", - 'selected' => ($filter_context == 'everyone'), - ), - 'mine' => array( - 'title' => elgg_echo('mine'), - 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username", - 'selected' => ($filter_context == 'mine'), - ), - 'friend' => array( - 'title' => elgg_echo('friends'), - 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends", - 'selected' => ($filter_context == 'friends'), - ), -); - -// determine if using default or overwritten tabs -$tabs = (isset($vars['tabs'])) ? $vars['tabs'] : $default_tabs; -$tab_list = elgg_view('navigation/tabs', array('tabs' => $tabs)); - -$title = elgg_echo($type); -$title = '
' . elgg_view_title($title) . '
'; - -// must be logged in to see any action buttons -if (isloggedin()) { - // only show the new button when not on the add form. - // hide the tabs when on the add form. - if ($filter_context == 'action') { - $tab_list = ''; - } else { - // @todo remove the hard coded reference to the videolist plugin - if (elgg_get_context() == "videolist"){ - $video_link = elgg_get_site_url() . "pg/videolist/browse/$username/"; - $new_button = "" . elgg_echo('videolist:browsemenu') . ''; - } else { - $new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new"); - $new_button = "" . elgg_echo($type . ':new') . ''; - } - $new_button = "
$new_button
"; - } - - // also hide the tabs if in a group context (ie, listing groups) or - // when viewing tools belonging to a group - if (elgg_get_context() == 'groups' || $page_owner instanceof ElggGroup) { - $tab_list = ''; - } -} - -echo << - $title $new_button - -HTML; - -echo $tab_list; diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php deleted file mode 100644 index 4cfee9258..000000000 --- a/views/default/page_elements/content_header_member.php +++ /dev/null @@ -1,24 +0,0 @@ -name; - -// get the object type -$type = $vars['type']; - -$title = elgg_echo($type); -$title = $name . "'s " . $type; -?> - -
- ' . elgg_view_title($title) . '
'; ?> - - diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php deleted file mode 100644 index 6c9cdc55e..000000000 --- a/views/default/page_elements/footer.php +++ /dev/null @@ -1,21 +0,0 @@ - -
-
- - - Powered by Elgg - -
-
- - diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php deleted file mode 100644 index df23fcbff..000000000 --- a/views/default/page_elements/header.php +++ /dev/null @@ -1,24 +0,0 @@ - -
-
- -
-
diff --git a/views/default/page_elements/header_logo.php b/views/default/page_elements/header_logo.php deleted file mode 100644 index 6ae6a0fab..000000000 --- a/views/default/page_elements/header_logo.php +++ /dev/null @@ -1,12 +0,0 @@ - - -

- - sitename; ?> - -

diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php deleted file mode 100644 index 23879dde8..000000000 --- a/views/default/page_elements/html_begin.php +++ /dev/null @@ -1,93 +0,0 @@ -sitename; -} else if (empty($vars['config']->sitename)) { - $title = $vars['title']; -} else { - $title = $vars['config']->sitename . ": " . $vars['title']; -} - -global $autofeed; -if (isset($autofeed) && $autofeed == true) { - $url = full_url(); - if (substr_count($url,'?')) { - $url .= "&view=rss"; - } else { - $url .= "?view=rss"; - } - $url = elgg_format_url($url); - $feedref = << - -END; -} else { - $feedref = ""; -} - -$js = elgg_get_js('head'); -$css = elgg_get_css(); - -// we won't trust server configuration but specify utf-8 -header('Content-type: text/html; charset=utf-8'); - -$version = get_version(); -$release = get_version(true); -?> - - - - - - - <?php echo $title; ?> - - - - - - - - - - - - - - diff --git a/views/default/page_elements/html_end.php b/views/default/page_elements/html_end.php deleted file mode 100644 index 0862934cf..000000000 --- a/views/default/page_elements/html_end.php +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/views/default/page_elements/messages.php b/views/default/page_elements/messages.php deleted file mode 100644 index f44d1204b..000000000 --- a/views/default/page_elements/messages.php +++ /dev/null @@ -1,28 +0,0 @@ - 0) { - - echo '
    '; - - foreach ($vars['object'] as $type => $list ) { - foreach ($list as $message) { - echo "
  • "; - echo elgg_view('output/longtext', array( - 'value' => $message, - 'parse_urls' => false - )); - echo '
    • '; - } - } - - echo '
'; -} diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php deleted file mode 100644 index 83ffdf54b..000000000 --- a/views/default/page_elements/topbar.php +++ /dev/null @@ -1,44 +0,0 @@ -guid > 0)) { - echo '
'; - echo '
'; - - // Elgg logo - echo ''; - echo "\"Elgg"; - echo ''; - - // avatar - $user_link = $user->getURL(); - $user_image = $user->getIcon('topbar'); - echo "\"User"; - - // logout link - echo elgg_view('page_elements/topbar_logout', $vars); - - // elgg tools menu - // need to echo this empty view for backward compatibility. - echo elgg_view("navigation/topbar_tools"); - - // enable elgg topbar extending - echo elgg_view('elgg_topbar/extend', $vars); - - // user settings - $settings = elgg_echo('settings'); - echo "$settings"; - - // The administration link is for admin or site admin users only - if ($user->isAdmin()) { - $admin = elgg_echo("admin"); - echo "$admin"; - } - - echo '
'; - echo '
'; -} diff --git a/views/default/page_elements/topbar_logout.php b/views/default/page_elements/topbar_logout.php deleted file mode 100644 index 2d2ecf67c..000000000 --- a/views/default/page_elements/topbar_logout.php +++ /dev/null @@ -1,14 +0,0 @@ -'; -echo elgg_view('output/url', array( - 'href' => "action/logout", - 'text' => elgg_echo('logout'), - 'is_action' => TRUE -)); -echo ''; diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php deleted file mode 100644 index ff427a6b7..000000000 --- a/views/default/page_shells/admin.php +++ /dev/null @@ -1,29 +0,0 @@ - $vars['sysmessages'])); -echo elgg_view('page_elements/content', $vars); -echo elgg_view('page_elements/html_end', $vars); \ No newline at end of file diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php deleted file mode 100644 index 3380188d9..000000000 --- a/views/default/page_shells/default.php +++ /dev/null @@ -1,37 +0,0 @@ -'; -echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages'])); -echo elgg_view('page_elements/topbar', $vars); -echo elgg_view('page_elements/header', $vars); -echo elgg_view('page_elements/body', $vars); -echo elgg_view('page_elements/footer', $vars); -echo ''; - -echo elgg_view('page_elements/html_end', $vars); diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php deleted file mode 100644 index dbd8d3ac0..000000000 --- a/views/default/page_shells/walled_garden.php +++ /dev/null @@ -1,281 +0,0 @@ - - - - $vars['sysmessages'])); - -echo "
$view
"; -echo '
'; -echo "

Welcome to:
$title

"; -echo "
{$vars['body']}
"; -echo '
'; -echo '
'; -echo '
'; - -echo elgg_view('page_elements/html_end', $vars); diff --git a/views/failsafe/page/shells/default.php b/views/failsafe/page/shells/default.php new file mode 100644 index 000000000..0ce63cc1d --- /dev/null +++ b/views/failsafe/page/shells/default.php @@ -0,0 +1,60 @@ + + + + <?php echo $vars['title']; ?> + + + + + + +
+

+ +
+ + diff --git a/views/failsafe/page_shells/default.php b/views/failsafe/page_shells/default.php deleted file mode 100644 index 0ce63cc1d..000000000 --- a/views/failsafe/page_shells/default.php +++ /dev/null @@ -1,60 +0,0 @@ - - - - <?php echo $vars['title']; ?> - - - - - - -
-

- -
- - diff --git a/views/foaf/page/shells/default.php b/views/foaf/page/shells/default.php new file mode 100644 index 000000000..7bd69b875 --- /dev/null +++ b/views/foaf/page/shells/default.php @@ -0,0 +1,48 @@ +\n"; + +if (!$owner = elgg_get_page_owner()) { + if (!isloggedin()) { + exit; + } else { + $owner = get_loggedin_user(); + } +} + +?> + + + + + + + + + + username; ?> + name; ?> + + + + + + diff --git a/views/foaf/page_elements/contentwrapper.php b/views/foaf/page_elements/contentwrapper.php deleted file mode 100644 index 643492a92..000000000 --- a/views/foaf/page_elements/contentwrapper.php +++ /dev/null @@ -1,8 +0,0 @@ -\n"; - -if (!$owner = elgg_get_page_owner()) { - if (!isloggedin()) { - exit; - } else { - $owner = get_loggedin_user(); - } -} - -?> - - - - - - - - - - username; ?> - name; ?> - - - - - - diff --git a/views/ical/page/shells/default.php b/views/ical/page/shells/default.php new file mode 100644 index 000000000..9a529b24f --- /dev/null +++ b/views/ical/page/shells/default.php @@ -0,0 +1,18 @@ + +BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Curverider Ltd//NONSGML Elgg //EN + +END:VCALENDAR diff --git a/views/ical/pageshells/pageshell.php b/views/ical/pageshells/pageshell.php deleted file mode 100644 index 9a529b24f..000000000 --- a/views/ical/pageshells/pageshell.php +++ /dev/null @@ -1,18 +0,0 @@ - -BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//Curverider Ltd//NONSGML Elgg //EN - -END:VCALENDAR diff --git a/views/installation/page/shells/default.php b/views/installation/page/shells/default.php new file mode 100644 index 000000000..fbc5ccbf2 --- /dev/null +++ b/views/installation/page/shells/default.php @@ -0,0 +1,52 @@ + + + + + <?php echo $title; ?> + + + + + +
+
+ +
+
+ +
+
+

+ $vars['sysmessages'])); ?> + +
+
+
+ + + diff --git a/views/installation/page_shells/default.php b/views/installation/page_shells/default.php deleted file mode 100644 index fbc5ccbf2..000000000 --- a/views/installation/page_shells/default.php +++ /dev/null @@ -1,52 +0,0 @@ - - - - - <?php echo $title; ?> - - - - - -
-
- -
-
- -
-
-

- $vars['sysmessages'])); ?> - -
-
-
- - - diff --git a/views/json/page/shells/default.php b/views/json/page/shells/default.php new file mode 100644 index 000000000..d1f86c8a7 --- /dev/null +++ b/views/json/page/shells/default.php @@ -0,0 +1,18 @@ + + + + \ No newline at end of file diff --git a/views/opendd/pageshells/pageshell.php b/views/opendd/pageshells/pageshell.php deleted file mode 100644 index bdd59d45e..000000000 --- a/views/opendd/pageshells/pageshell.php +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/views/php/page/shells/default.php b/views/php/page/shells/default.php new file mode 100644 index 000000000..c7692c432 --- /dev/null +++ b/views/php/page/shells/default.php @@ -0,0 +1,10 @@ +\n"; + +// Set title +if (empty($vars['title'])) { + $title = $vars['config']->sitename; +} else if (empty($vars['config']->sitename)) { + $title = $vars['title']; +} else { + $title = $vars['config']->sitename . ": " . $vars['title']; +} + +// Remove RSS from URL +$url = str_replace('?view=rss','', full_url()); +$url = str_replace('&view=rss','', $url); + +?> + + > + + <![CDATA[<?php echo $title; ?>]]> + + + + + diff --git a/views/rss/page_elements/contentwrapper.php b/views/rss/page_elements/contentwrapper.php deleted file mode 100644 index 3e056ae91..000000000 --- a/views/rss/page_elements/contentwrapper.php +++ /dev/null @@ -1,7 +0,0 @@ -\n"; - -// Set title -if (empty($vars['title'])) { - $title = $vars['config']->sitename; -} else if (empty($vars['config']->sitename)) { - $title = $vars['title']; -} else { - $title = $vars['config']->sitename . ": " . $vars['title']; -} - -// Remove RSS from URL -$url = str_replace('?view=rss','', full_url()); -$url = str_replace('&view=rss','', $url); - -?> - - > - - <![CDATA[<?php echo $title; ?>]]> - - - - - diff --git a/views/xml/page/shells/default.php b/views/xml/page/shells/default.php new file mode 100644 index 000000000..0f0aecbe4 --- /dev/null +++ b/views/xml/page/shells/default.php @@ -0,0 +1,14 @@ +\n"; +echo $vars['body']; \ No newline at end of file diff --git a/views/xml/page_shells/default.php b/views/xml/page_shells/default.php deleted file mode 100644 index 0f0aecbe4..000000000 --- a/views/xml/page_shells/default.php +++ /dev/null @@ -1,14 +0,0 @@ -\n"; -echo $vars['body']; \ No newline at end of file -- cgit v1.2.3