From 58e7394e2dabe3bcf92b5efdc1c3917973cdf943 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 4 Dec 2010 15:52:14 +0000 Subject: refs #1402 first cut of the new sidebar layout code (plus some other stuff - very non-atomic commit). blog plugin uses the one sidebar layout and bookmarks uses the two sidebar layout (for testing purposes) git-svn-id: http://code.elgg.org/elgg/trunk@7528 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/content.php | 6 ++---- views/default/page_elements/footer.php | 4 ++-- views/default/page_elements/header.php | 4 ++-- views/default/page_elements/header_logo.php | 10 +++++---- views/default/page_elements/main_header.php | 27 ------------------------ views/default/page_elements/main_module.php | 5 ----- views/default/page_elements/main_nav.php | 32 ----------------------------- views/default/page_elements/topbar.php | 4 ++-- 8 files changed, 14 insertions(+), 78 deletions(-) delete mode 100644 views/default/page_elements/main_header.php delete mode 100644 views/default/page_elements/main_module.php delete mode 100644 views/default/page_elements/main_nav.php (limited to 'views/default/page_elements') diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php index 946237828..14292ce59 100644 --- a/views/default/page_elements/content.php +++ b/views/default/page_elements/content.php @@ -7,9 +7,7 @@ $body = elgg_get_array_value('body', $vars, ''); echo << -
- $body -
+
+ $body
HTML; diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php index 0e417e030..42cb6a2fc 100644 --- a/views/default/page_elements/footer.php +++ b/views/default/page_elements/footer.php @@ -9,8 +9,8 @@ */ ?> -
-
+
+
Powered by Elgg diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php index f6d158f06..476919591 100644 --- a/views/default/page_elements/header.php +++ b/views/default/page_elements/header.php @@ -5,8 +5,8 @@ **/ ?> -
-
+
+
-

-sitename; ?> -

+

+ + sitename; ?> + +

diff --git a/views/default/page_elements/main_header.php b/views/default/page_elements/main_header.php deleted file mode 100644 index 438a6c432..000000000 --- a/views/default/page_elements/main_header.php +++ /dev/null @@ -1,27 +0,0 @@ -username; - -$title = elgg_echo($type); - -$new_button = ''; -if (isloggedin()) { - $new_link = elgg_get_array_value('new_link', $vars, "pg/$type/$username/new"); - $params = array( - 'href' => $new_link = elgg_normalize_url($new_link), - 'text' => elgg_echo("$type:new"), - 'class' => 'action-button right', - ); - $new_button = elgg_view('output/url', $params); -} - -echo <<$title -$new_button -HTML; diff --git a/views/default/page_elements/main_module.php b/views/default/page_elements/main_module.php deleted file mode 100644 index 388a500fe..000000000 --- a/views/default/page_elements/main_module.php +++ /dev/null @@ -1,5 +0,0 @@ -username; - -// so we know if the user is looking at their own, everyone's or all friends -$filter_context = $vars['context']; - -// generate a list of default tabs -$default_tabs = array( - 'all' => array( - 'title' => elgg_echo('all'), - 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$type/", - '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 = elgg_get_array_value('tabs', $vars, $default_tabs); -echo elgg_view('navigation/tabs', array('tabs' => $tabs)); \ No newline at end of file diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php index 0ccfc15c6..0f7b8f467 100644 --- a/views/default/page_elements/topbar.php +++ b/views/default/page_elements/topbar.php @@ -6,8 +6,8 @@ $user = get_loggedin_user(); if (($user instanceof ElggUser) && ($user->guid > 0)) { - echo '
'; - echo '
'; + echo '
'; + echo '
'; // Elgg logo echo ''; -- cgit v1.2.3