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 ++++----- views/default/pageshells/pageshell.php | 66 ++++--- views/default/river/dashboard.php | 34 ++-- views/default/river/item/list.php | 66 ++++--- views/default/river/item/noaccess.php | 12 +- views/default/river/item/wrapper.php | 55 +++--- views/default/river/relationship/friend/create.php | 81 +++++---- views/default/river/wrapper.php | 57 +++---- views/default/search/entity_list.php | 118 ++++++------- views/default/search/gallery.php | 71 ++++---- views/default/search/gallery_listing.php | 53 +++--- views/default/search/listing.php | 69 ++++---- views/default/search/startblurb.php | 17 +- 20 files changed, 618 insertions(+), 622 deletions(-) (limited to 'views/default') 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 @@ - +

- + - +

- Powered by Elgg, the leading open source social networking platform + Powered by Elgg, the leading open source social networking platform

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 diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php index 8e7f29667..61396dfbc 100644 --- a/views/default/pageshells/pageshell.php +++ b/views/default/pageshells/pageshell.php @@ -1,32 +1,30 @@ sitename; - } else if (empty($vars['config']->sitename)) { - $title = $vars['title']; - } else { - $title = $vars['config']->sitename . ": " . $vars['title']; - } - +/** + * Elgg pageshell + * The standard HTML page shell that everything else fits into + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * + * @uses $vars['config'] The site configuration settings, imported + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page + * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages() + */ + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +// Set title +if (empty($vars['title'])) { + $title = $vars['config']->sitename; +} else if (empty($vars['config']->sitename)) { + $title = $vars['title']; +} else { + $title = $vars['config']->sitename . ": " . $vars['title']; +} ?> @@ -34,7 +32,7 @@ - + $vars['sysmessages'])); ?> @@ -48,13 +46,13 @@
- - + + - + \ No newline at end of file diff --git a/views/default/river/dashboard.php b/views/default/river/dashboard.php index aa9b65615..b049348f1 100644 --- a/views/default/river/dashboard.php +++ b/views/default/river/dashboard.php @@ -1,23 +1,23 @@
- 0)) - { - foreach ($river as $r) echo $r; - //echo "
$r
"; +0)) { + foreach ($river as $r) { + echo $r; } - else - echo elgg_echo('river:widget:noactivity'); - ?> +} else { + echo elgg_echo('river:widget:noactivity'); +} +?>
\ No newline at end of file diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php index 7bbac0044..9508a0da6 100644 --- a/views/default/river/item/list.php +++ b/views/default/river/item/list.php @@ -1,51 +1,65 @@ - +
= $vars['limit']) break; - + if (!empty($vars['items'])) { + foreach($vars['items'] as $item) { + echo elgg_view_river_item($item); + $i++; + if ($i >= $vars['limit']) { + break; + } + } } - } - + if ($vars['pagination'] !== false) { - $baseurl = $_SERVER['REQUEST_URI']; - $baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); - + $baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); + $nav = ''; - + if (sizeof($vars['items']) > $vars['limit']) { $newoffset = $vars['offset'] + $vars['limit']; $urladdition = 'offset='.$newoffset; - if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition; - + if (substr_count($baseurl,'?')) { + $nexturl = $baseurl . '&' . $urladdition; + } else { + $nexturl=$baseurl . '?' . $urladdition; + } + $nav .= '« ' . elgg_echo('previous') . ' '; } - + if ($vars['offset'] > 0) { $newoffset = $vars['offset'] - $vars['limit']; - if ($newoffset < 0) $newoffset = 0; + if ($newoffset < 0) { + $newoffset = 0; + } $urladdition = 'offset='.$newoffset; - if (substr_count($baseurl,'?')) $prevurl=$baseurl . '&' . $urladdition; else $prevurl=$baseurl . '?' . $urladdition; - + if (substr_count($baseurl,'?')) { + $prevurl=$baseurl . '&' . $urladdition; + } else { + $prevurl=$baseurl . '?' . $urladdition; + } + $nav .= '' . elgg_echo('next') . ' » '; } - - + if (!empty($nav)) { echo '

'.$nav.'

'; } - } - ?>
\ No newline at end of file diff --git a/views/default/river/item/noaccess.php b/views/default/river/item/noaccess.php index 96958170b..a993423a0 100644 --- a/views/default/river/item/noaccess.php +++ b/views/default/river/item/noaccess.php @@ -1,5 +1,11 @@ \ No newline at end of file +echo elgg_echo('river:noaccess'); \ No newline at end of file diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php index c8d18e9dd..27de4affd 100644 --- a/views/default/river/item/wrapper.php +++ b/views/default/river/item/wrapper.php @@ -1,51 +1,48 @@ +if($avatar_icon == "icon"){ + ?>
-
+
action_type; ?>">

(posted); + echo friendly_time($vars['item']->posted); ?>)

-
+
- - + +
- + get_entity($vars['item']->subject_guid), 'size' => 'tiny')); ?> @@ -62,6 +59,6 @@

- \ No newline at end of file diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php index 1378d8088..f42bf30c6 100644 --- a/views/default/river/relationship/friend/create.php +++ b/views/default/river/relationship/friend/create.php @@ -1,45 +1,40 @@ getSubject(); - $event = $statement->getEvent(); - $object = $statement->getObject(); - - if (is_array($object)) - { - switch ($object['relationship']) - { - // Friending - case 'friend' : - case 'friends' : // 'friends' shouldn't be used, but just incase :) - - // Get second object - $userb = $object['object']; - - // Only users can be friends - if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser)) - { - // User A - echo "getURL()}\">{$performed_by->name} "; - - // Verb - echo elgg_echo('river:relationship:friend'); - - // user B - echo " getURL()}\">{$userb->name}"; - } - - break; - } +/** + * Elgg relationship create event. + * Display something in the river when a relationship is created. + * + * @package Elgg + * @author Curverider Ltd + * @link http://elgg.com/ + */ + +$statement = $vars['statement']; + +$performed_by = $statement->getSubject(); +$event = $statement->getEvent(); +$object = $statement->getObject(); + +if (is_array($object)) { + switch ($object['relationship']) { + // Friending + case 'friend' : + case 'friends' : // 'friends' shouldn't be used, but just incase :) + + // Get second object + $userb = $object['object']; + + // Only users can be friends + if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser)) { + // User A + echo "getURL()}\">{$performed_by->name} "; + + // Verb + echo elgg_echo('river:relationship:friend'); + + // user B + echo " getURL()}\">{$userb->name}"; + } + + break; } - -?> \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php index cba00ff5a..0b5bfad62 100644 --- a/views/default/river/wrapper.php +++ b/views/default/river/wrapper.php @@ -1,31 +1,28 @@ getObject() instanceof ElggEntity) { - - $obj = $statement->getObject(); - $subtype = $obj->getSubtype(); - if (empty($subtype)) $subtype = $obj->type; - if (empty($subtype)) $subtype = "general"; - } else if (is_array($statement->getObject())) { - $obj = $statement->getObject(); - $subtype = "relationship_" . $obj['relationship']; - } +$statement = $vars['statement']; +$time = $vars['time']; +$event = $vars['event']; +$entry = $vars['entry']; + +if ($statement->getObject() instanceof ElggEntity) { + + $obj = $statement->getObject(); + $subtype = $obj->getSubtype(); + if (empty($subtype)) $subtype = $obj->type; + if (empty($subtype)) $subtype = "general"; +} else if (is_array($statement->getObject())) { + $obj = $statement->getObject(); + $subtype = "relationship_" . $obj['relationship']; +} ?>
@@ -33,15 +30,15 @@

()

diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php index f0438fa11..07e76e955 100644 --- a/views/default/search/entity_list.php +++ b/views/default/search/entity_list.php @@ -1,62 +1,64 @@ 0 && $viewtypetoggle) { + $nav .= elgg_view("navigation/viewtype",array( + 'baseurl' => $baseurl, + 'offset' => $offset, + 'count' => $count, + 'viewtype' => $viewtype, + )); +} + +if ($pagination) { + $nav .= elgg_view('navigation/pagination',array( + 'baseurl' => $baseurl, + 'offset' => $offset, + 'count' => $count, + 'limit' => $limit, + )); +} + +$html .= $nav; + +if ($viewtype == "list") { + if (is_array($entities) && sizeof($entities) > 0) { + foreach($entities as $entity) { + $html .= elgg_view_entity($entity, $fullview); } + } +} else { + if (is_array($entities) && sizeof($entities) > 0) { + $html .= elgg_view("search/gallery",array('entities' => $entities)); + } +} + +if ($count) { + $html .= $nav; +} - if ($context == "search" && $count > 0 && $viewtypetoggle) { - $nav .= elgg_view("navigation/viewtype",array( - - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'viewtype' => $viewtype, - - )); - } - - if ($pagination) - $nav .= elgg_view('navigation/pagination',array( - - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'limit' => $limit, - - )); - - $html .= $nav; - - if ($viewtype == "list") { - if (is_array($entities) && sizeof($entities) > 0) { - foreach($entities as $entity) { - $html .= elgg_view_entity($entity, $fullview); - } - } - } else { - if (is_array($entities) && sizeof($entities) > 0) - $html .= elgg_view("search/gallery",array('entities' => $entities)); - } - - if ($count) - $html .= $nav; - - echo $html; - -?> +echo $html; \ No newline at end of file diff --git a/views/default/search/gallery.php b/views/default/search/gallery.php index 366cd713b..52c4d0b92 100644 --- a/views/default/search/gallery.php +++ b/views/default/search/gallery.php @@ -1,49 +1,44 @@ 0) { - /** - * Elgg gallery view - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - $entities = $vars['entities']; - if (is_array($entities) && sizeof($entities) > 0) { - ?> - +
"; + + } + echo ""; + $col++; + if ($col > 3) { + echo ""; $col = 0; - foreach($entities as $entity) { - if ($col == 0) { - - echo ""; - - } - echo ""; - $col++; - if ($col > 3) { - echo ""; - $col = 0; - } - } - if ($col > 0) echo ""; - + } + } + if ($col > 0) echo ""; + ?> -
"; + echo elgg_view_entity($entity); + echo "
"; - echo elgg_view_entity($entity); - echo "
+ \ No newline at end of file + +} \ No newline at end of file diff --git a/views/default/search/gallery_listing.php b/views/default/search/gallery_listing.php index 4c0f40643..900b22832 100644 --- a/views/default/search/gallery_listing.php +++ b/views/default/search/gallery_listing.php @@ -1,35 +1,32 @@ -
- -
- - - -
-
+
+ +
+ -
- -
\ No newline at end of file + +
+
+ +
+ +
\ No newline at end of file diff --git a/views/default/search/listing.php b/views/default/search/listing.php index 0a9d01fee..fa1719069 100644 --- a/views/default/search/listing.php +++ b/views/default/search/listing.php @@ -1,45 +1,38 @@ -
- -
- -
-
- -
- +
+ +
+
- - + +
+ +
+ + \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php index 82b4aef8c..7c78cbf16 100644 --- a/views/default/search/startblurb.php +++ b/views/default/search/startblurb.php @@ -1,8 +1,15 @@ - +
-
\ No newline at end of file -- cgit v1.2.3