From 70b08afa64465f4d3457ba6e1c4cc2df1dd2069b Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 20:41:31 +0000 Subject: More views cleanup. git-svn-id: http://code.elgg.org/elgg/trunk@3556 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/contentwrapper.php | 18 ++- views/default/page_elements/elgg_topbar.php | 59 ++++---- views/default/page_elements/footer.php | 33 ++--- views/default/page_elements/header.php | 103 +++++++------ views/default/page_elements/header_contents.php | 21 ++- views/default/page_elements/owner_block.php | 189 ++++++++++++------------ views/default/page_elements/spotlight.php | 35 ++--- views/default/page_elements/title.php | 83 ++++++----- 8 files changed, 268 insertions(+), 273 deletions(-) (limited to 'views/default/page_elements') diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php index 2cb001b05..81b7b5c7c 100644 --- a/views/default/page_elements/contentwrapper.php +++ b/views/default/page_elements/contentwrapper.php @@ -1,11 +1,23 @@ +
\ No newline at end of file diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index 46314f2ad..b9609910c 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -1,19 +1,18 @@
@@ -21,41 +20,40 @@
- + - +
- - - -
+ ?> + +
- + - + admin || $vars['user']->siteadmin) { - + if ($vars['user']->admin || $vars['user']->siteadmin) { + ?> - + - +
@@ -79,5 +77,4 @@
\ No newline at end of file + } \ No newline at end of file diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php index 0679a988e..31c62a76e 100644 --- a/views/default/page_elements/footer.php +++ b/views/default/page_elements/footer.php @@ -1,18 +1,17 @@ @@ -24,7 +23,7 @@ - + diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php index 5235ed740..48073654c 100644 --- a/views/default/page_elements/header.php +++ b/views/default/page_elements/header.php @@ -1,54 +1,53 @@ 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 = $url2 = full_url(); + if (substr_count($url,'?')) { + $url .= "&view=rss"; + } else { + $url .= "?view=rss"; + } + if (substr_count($url2,'?')) { + $url2 .= "&view=odd"; + } else { + $url2 .= "?view=opendd"; + } + $feedref = <<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 = $url2 = full_url(); - if (substr_count($url,'?')) { - $url .= "&view=rss"; - } else { - $url .= "?view=rss"; - } - if (substr_count($url2,'?')) { - $url2 .= "&view=odd"; - } else { - $url2 .= "?view=opendd"; - } - $feedref = << - + END; - } else { - $feedref = ""; - } - - $version = get_version(); - $release = get_version(true); +} else { + $feedref = ""; +} + +$version = get_version(); +$release = get_version(true); ?> @@ -58,7 +57,7 @@ END; <?php echo $title; ?> - + @@ -74,14 +73,14 @@ END; ?> - - diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php index 2786a720e..ac47d8962 100644 --- a/views/default/page_elements/header_contents.php +++ b/views/default/page_elements/header_contents.php @@ -1,17 +1,14 @@
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index 535d1b064..46397c4c2 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -1,100 +1,95 @@ $owner, 'size' => 'tiny')); + if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { + //$info = $owner->name; + $info = '' . $owner->name . ''; + } + $display = "
" . $icon . "
"; + $display .= "
" . $info . "
"; + + if ($owner->briefdescription) { + $desc = $owner->briefdescription; + $display .= "
" . $desc . "
"; + } + + $contents .= $display; +} + +// Are there feeds to display? +global $autofeed; + +if (isset($autofeed) && $autofeed == true) { + $url = $url2 = full_url(); + if (substr_count($url,'?')) { + $url .= "&view=rss"; + } else { + $url .= "?view=rss"; + } + //if (substr_count($url2,'?')) { + // $url2 .= "&view=odd"; + //} else { + // $url2 .= "?view=opendd"; + //} + $label = elgg_echo('feed:rss'); + //$label2 = elgg_echo('feed:odd'); + $contents .= <<{$label}
- /** - * Elgg owner block - * Displays page ownership information - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd - - * @link http://elgg.org/ - * - */ - - $contents = ""; - - // Is there a page owner? - $owner = page_owner_entity(); - // if (!$owner && isloggedin()) $owner = $_SESSION['user']; - if ($owner instanceof ElggEntity) { - $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny')); - if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { - //$info = $owner->name; - $info = '' . $owner->name . ''; - } - $display = "
" . $icon . "
"; - $display .= "
" . $info . "
"; - - if ($owner->briefdescription) { - $desc = $owner->briefdescription; - $display .= "
" . $desc . "
"; - } - - $contents .= $display; - } - - // Are there feeds to display? - global $autofeed; - - if (isset($autofeed) && $autofeed == true) { - $url = $url2 = full_url(); - if (substr_count($url,'?')) { - $url .= "&view=rss"; - } else { - $url .= "?view=rss"; - } - //if (substr_count($url2,'?')) { - // $url2 .= "&view=odd"; - //} else { - // $url2 .= "?view=opendd"; - //} - $label = elgg_echo('feed:rss'); - //$label2 = elgg_echo('feed:odd'); - $contents .= <<{$label}
- END; - } - - //the follow are for logged in users only - if(isloggedin()){ - - //is the bookmark plugin installed? - if(is_plugin_enabled('bookmarks')){ - - $label3 = elgg_echo('bookmarks:this'); - $contents .= ""; - - } - - //report this button - if (is_plugin_enabled('reportedcontent')) - { - $label4 = elgg_echo('reportedcontent:report'); - $contents .= ""; - } - - } - - - $contents .= elgg_view('owner_block/extend'); - - // Have we been asked to inject any content? If so, display it - if (isset($vars['content'])) - $contents .= $vars['content']; - - // Initialise the submenu - $submenu = get_submenu(); // elgg_view('canvas_header/submenu'); - if (!empty($submenu)) - $contents .= "
" . $submenu . "
"; // plugins can extend this to add menu options - - if (!empty($contents)) { - echo "
"; - echo $contents; - echo "
"; - } - -?> \ No newline at end of file +} + +//the follow are for logged in users only +if(isloggedin()){ + + //is the bookmark plugin installed? + if(is_plugin_enabled('bookmarks')){ + + $label3 = elgg_echo('bookmarks:this'); + $contents .= ""; + + } + + //report this button + if (is_plugin_enabled('reportedcontent')) + { + $label4 = elgg_echo('reportedcontent:report'); + $contents .= ""; + } + +} + + +$contents .= elgg_view('owner_block/extend'); + +// Have we been asked to inject any content? If so, display it +if (isset($vars['content'])) + $contents .= $vars['content']; + +// Initialise the submenu +$submenu = get_submenu(); // elgg_view('canvas_header/submenu'); +if (!empty($submenu)) + $contents .= "
" . $submenu . "
"; // plugins can extend this to add menu options + +if (!empty($contents)) { + echo "
"; + echo $contents; + echo "
"; +} \ No newline at end of file diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php index 5b5a90ac7..670e0e4c5 100644 --- a/views/default/page_elements/spotlight.php +++ b/views/default/page_elements/spotlight.php @@ -1,20 +1,19 @@
- +
spotlightclosed) { - + $closed = true; - + } } if ($closed) { ?> + - - @@ -50,13 +49,9 @@ } else { echo elgg_view("spotlight/default"); } - - - - ?>
- +
\ No newline at end of file diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php index 173672cb3..5123c14a7 100644 --- a/views/default/page_elements/title.php +++ b/views/default/page_elements/title.php @@ -1,46 +1,47 @@ " . $submenu . ""; - - if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) { - $info = "

" . $vars['title'] . "

"; - if($page_owner_user instanceOf ElggGroup) { - $display = "
" . $info . "
"; - } else { - $display = "
" . $info . "
"; - } - if (!empty($submenu) && $vars['submenu'] == true) - $display .= "
" . $submenu . "
"; // plugins can extend this to add menu options +/** + * Elgg title element + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * + * @uses $vars['title'] The page title + */ + +$page_owner = page_owner(); +$page_owner_user = get_entity($page_owner); + +$submenu = get_submenu(); // elgg_view('canvas_header/submenu'); +if (!empty($submenu)) { + $submenu = "
    " . $submenu . "
"; +} + +if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) { + $info = "

" . $vars['title'] . "

"; + if($page_owner_user instanceOf ElggGroup) { + $display = "
" . $info . "
"; } else { - $info = "

" . $vars['title'] . "

"; - if($page_owner_user instanceOf ElggGroup) { - $display = "
" . $info . "
"; - } else { - $display = "
" . $info . "
"; - } - if (!empty($submenu) && $vars['submenu'] == true) - $display .= "
" . $submenu . "
"; // plugins can extend this to add menu options + $display = "
" . $info . "
"; } + if (!empty($submenu) && $vars['submenu'] == true) { + // plugins can extend this to add menu options + $display .= "
" . $submenu . "
"; + } +} else { + $info = "

" . $vars['title'] . "

"; + if($page_owner_user instanceOf ElggGroup) { + $display = "
" . $info . "
"; + } else { + $display = "
" . $info . "
"; + } + if (!empty($submenu) && $vars['submenu'] == true) { + // plugins can extend this to add menu options + $display .= "
" . $submenu . "
"; + } +} - //print to screen - echo $display; - - - -?> \ No newline at end of file +//print to screen +echo $display; \ No newline at end of file -- cgit v1.2.3