From 46c365abd6e190a5c389b0dd49b02cd6e878ccd9 Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 23 Aug 2013 04:57:44 +0200 Subject: Updated to Elgg 1.8.16. --- views/default/page/default.php | 13 ++++++++---- views/default/page/elements/foot.php | 11 ---------- views/default/page/elements/footer.php | 4 ++-- views/default/page/elements/owner_block.php | 31 ----------------------------- views/default/page/walled_garden.php | 15 +++++++++++++- views/default/search/search_box.php | 2 +- 6 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 views/default/page/elements/foot.php delete mode 100644 views/default/page/elements/owner_block.php diff --git a/views/default/page/default.php b/views/default/page/default.php index 491f691f4..aba69aebc 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -30,9 +30,14 @@ $header = elgg_view('page/elements/header', $vars); $body = elgg_view('page/elements/body', $vars); $footer = elgg_view('page/elements/footer', $vars); +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +$lang = get_current_language(); + ?> - + @@ -41,14 +46,14 @@ $footer = elgg_view('page/elements/footer', $vars);
- - + +
- +
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php deleted file mode 100644 index a56b373b4..000000000 --- a/views/default/page/elements/foot.php +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php index ded2cea9a..318a98b2d 100644 --- a/views/default/page/elements/footer.php +++ b/views/default/page/elements/footer.php @@ -12,11 +12,11 @@ echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-me $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif"; -echo '
'; +echo '
'; echo elgg_view('output/url', array( 'href' => 'http://elgg.org', 'text' => "\"Powered", 'class' => '', 'is_trusted' => true, )); -echo '
'; +echo ''; diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php deleted file mode 100644 index fc7f0f6d2..000000000 --- a/views/default/page/elements/owner_block.php +++ /dev/null @@ -1,31 +0,0 @@ -getGUID() != elgg_get_logged_in_user_guid())) { - - $header = elgg_view_entity($owner, array('full_view' => false)); - - $body = elgg_view_menu('owner_block', array('entity' => $owner)); - - $body .= elgg_view('page/elements/owner_block/extend', $vars); - - echo elgg_view('page/components/module', array( - 'header' => $header, - 'body' => $body, - 'class' => 'elgg-owner-block', - )); -} - -elgg_pop_context(); \ No newline at end of file diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 77c901d8c..26d1235c2 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -5,6 +5,12 @@ * Used for the walled garden index page */ +$is_sticky_register = elgg_is_sticky_form('register'); +$wg_body_class = 'elgg-body-walledgarden'; +if ($is_sticky_register) { + $wg_body_class .= ' hidden'; +} + // Set the content type header("Content-type: text/html; charset=UTF-8"); ?> @@ -18,10 +24,17 @@ header("Content-type: text/html; charset=UTF-8");
$vars['sysmessages'])); ?>
-
+
+ + + diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php index c1ea40705..4223661b3 100644 --- a/views/default/search/search_box.php +++ b/views/default/search/search_box.php @@ -34,7 +34,7 @@ $display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
- +
-- cgit v1.2.3