From c5cc2821311012a8a4385a304a043c4b41f2afbb Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 31 Aug 2009 19:05:21 +0000 Subject: All line endings are now Unix-style. git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/contentwrapper.php | 20 +-- views/default/page_elements/header_contents.php | 44 +++--- views/default/page_elements/owner_block.php | 194 ++++++++++++------------ 3 files changed, 129 insertions(+), 129 deletions(-) (limited to 'views/default/page_elements') diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php index ff54a0b6e..2cb001b05 100644 --- a/views/default/page_elements/contentwrapper.php +++ b/views/default/page_elements/contentwrapper.php @@ -1,11 +1,11 @@ -
- +
+
\ No newline at end of file diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php index 904378ef4..2786a720e 100644 --- a/views/default/page_elements/header_contents.php +++ b/views/default/page_elements/header_contents.php @@ -1,25 +1,25 @@ - - -
-
- -
- + * @author Curverider Ltd + + * @link http://elgg.org/ + **/ + +?> + +
+
+ +
+
\ No newline at end of file diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index 8296f2e5e..535d1b064 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -1,100 +1,100 @@ - $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 "
"; + } - * @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 -- cgit v1.2.3