diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-04 15:52:14 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-04 15:52:14 +0000 |
| commit | 58e7394e2dabe3bcf92b5efdc1c3917973cdf943 (patch) | |
| tree | b2cb6dfa30447d537fe10b4ebf312ea0a112f6a0 /views/default/page_elements | |
| parent | 3d25a1293f4caf6b94e87bc214c1631ea1164229 (diff) | |
| download | elgg-58e7394e2dabe3bcf92b5efdc1c3917973cdf943.tar.gz elgg-58e7394e2dabe3bcf92b5efdc1c3917973cdf943.tar.bz2 | |
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
Diffstat (limited to 'views/default/page_elements')
| -rw-r--r-- | views/default/page_elements/content.php | 6 | ||||
| -rw-r--r-- | views/default/page_elements/footer.php | 4 | ||||
| -rw-r--r-- | views/default/page_elements/header.php | 4 | ||||
| -rw-r--r-- | views/default/page_elements/header_logo.php | 10 | ||||
| -rw-r--r-- | views/default/page_elements/main_header.php | 27 | ||||
| -rw-r--r-- | views/default/page_elements/main_module.php | 5 | ||||
| -rw-r--r-- | views/default/page_elements/main_nav.php | 32 | ||||
| -rw-r--r-- | views/default/page_elements/topbar.php | 4 |
8 files changed, 14 insertions, 78 deletions
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 <<<HTML -<div id="elgg-page-body" class="elgg-body"> - <div id="elgg_page-body-inner" class="elgg-inner elgg-center elgg-width-classic clearfix"> - $body - </div> +<div id="elgg-page-body"> + $body </div> 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 @@ */ ?> -<div id="elgg-page-footer" class="elgg-footer"> - <div id="elgg-page-footer-inner" class="elgg-inner elgg-center elgg-width-classic clearfix"> +<div id="elgg-page-footer"> + <div id="elgg-page-footer-inner" class="elgg-center elgg-width-classic clearfix"> <?php echo elgg_view('footer/links'); ?> <a href="http://www.elgg.org" class="right"> <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="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 @@ **/ ?> -<div id="elgg-page-header" class="elgg-header"> - <div id="elgg-page-header-inner" class="elgg-inner elgg-center elgg-width-classic"> +<div id="elgg-page-header"> + <div id="elgg-page-header-inner" class="elgg-center elgg-width-classic"> <?php // link back to main site. echo elgg_view('page_elements/header_logo', $vars); diff --git a/views/default/page_elements/header_logo.php b/views/default/page_elements/header_logo.php index c782310f0..6ae6a0fab 100644 --- a/views/default/page_elements/header_logo.php +++ b/views/default/page_elements/header_logo.php @@ -2,9 +2,11 @@ /** * Elgg header logo * The logo to display in elgg-header. - **/ + */ ?> -<h1><a href="<?php echo elgg_get_site_url(); ?>"> -<span class='network-title'><?php echo $vars['config']->sitename; ?></span> -</a></h1> +<h1> + <a href="<?php echo elgg_get_site_url(); ?>"> + <span class='network-title'><?php echo $vars['config']->sitename; ?></span> + </a> +</h1> 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 @@ -<?php -/** - * Header for main module - * - * @uses string $vars['type'] The section type. Should be the same as the page handler. Used for generating URLs. - */ - -$type = $vars['type']; -$username = get_loggedin_user()->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 <<<HTML -<h2 class="elgg-module-heading">$title</h2> -$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 @@ -<?php - -$vars['class'] = 'elgg-module-maincontent'; -$vars['header_class'] = 'elgg-maincontent-header clearfix'; -echo elgg_view_layout('module', $vars);
\ No newline at end of file diff --git a/views/default/page_elements/main_nav.php b/views/default/page_elements/main_nav.php deleted file mode 100644 index 0c267b3f2..000000000 --- a/views/default/page_elements/main_nav.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php - -// page handler type -$type = $vars['type']; - -$username = get_loggedin_user()->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 '<div id="elgg-topbar">'; - echo '<div id="elgg-topbar-inner" class="elgg-inner">'; + echo '<div id="elgg-page-topbar">'; + echo '<div id="elgg-page-topbar-inner">'; // Elgg logo echo '<a href="http://www.elgg.org">'; |