From 17d053eb735d7e3830704db644301db2d8c91d1c Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 22 Jun 2011 22:05:28 -0400
Subject: backward compatibility of the admin page shell was broken when we
 reorganized the page view directory

---
 views/default/page/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/default/page')

diff --git a/views/default/page/default.php b/views/default/page/default.php
index 9effce1ec..0e27cda52 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -17,7 +17,7 @@ if (elgg_get_context() == 'admin') {
 	elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
 	elgg_admin_add_plugin_settings_menu();
 	elgg_unregister_css('elgg');
-	echo elgg_view('page/shells/admin', $vars);
+	echo elgg_view('page/admin', $vars);
 	return true;
 }
 
-- 
cgit v1.2.3


From 43e2672f65d12a36d75ad9257a936dc93a2108f3 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 24 Jun 2011 19:55:58 -0400
Subject: cleaned up the list/gallery css classes to use standard class naming
 - minor modifications only

---
 engine/lib/views.php                      |  4 ++--
 mod/search/views/default/search/list.php  |  4 ++--
 views/default/css/admin.php               |  2 +-
 views/default/css/elements/components.php |  4 ++--
 views/default/object/elements/summary.php |  2 +-
 views/default/page/components/gallery.php | 31 ++++++++++++++++++++++++++++---
 views/default/page/components/list.php    |  6 +++---
 7 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'views/default/page')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 4911171c8..df69593f9 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -969,7 +969,7 @@ $list_type_toggle = true, $pagination = true) {
 		// new function
 		$defaults = array(
 			'items' => $entities,
-			'list_class' => 'elgg-entity-list',
+			'list_class' => 'elgg-list-entity',
 			'full_view' => true,
 			'pagination' => true,
 			'gallery' => false,
@@ -992,7 +992,7 @@ $list_type_toggle = true, $pagination = true) {
 			'pagination' => $pagination,
 			'gallery' => false,
 			'list_type_toggle' => $list_type_toggle,
-			'list_class' => 'elgg-entity-list',
+			'list_class' => 'elgg-list-entity',
 		);
 	}
 
diff --git a/mod/search/views/default/search/list.php b/mod/search/views/default/search/list.php
index c5afaaa86..11860c094 100644
--- a/mod/search/views/default/search/list.php
+++ b/mod/search/views/default/search/list.php
@@ -82,7 +82,7 @@ $more = ($more_check > 0) ? $more_check : 0;
 if ($more) {
 	$title_key = ($more == 1) ? 'comment' : 'comments';
 	$more_str = elgg_echo('search:more', array($count, $type_str));
-	$more_link = "<li class='elgg-list-item'><a href=\"$url\">$more_str</a></li>";
+	$more_link = "<li class='elgg-item'><a href=\"$url\">$more_str</a></li>";
 } else {
 	$more_link = '';
 }
@@ -98,7 +98,7 @@ if ($view) {
 	$body .= '<ul class="elgg-list search-list">';
 	foreach ($entities as $entity) {
 		$id = "elgg-{$entity->getType()}-{$entity->getGUID()}";
-		$body .= "<li id=\"$id\" class=\"elgg-list-item\">";
+		$body .= "<li id=\"$id\" class=\"elgg-item\">";
 		$body .= elgg_view($view, array(
 			'entity' => $entity,
 			'params' => $vars['params'],
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index a56c7b214..d7c154438 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -383,7 +383,7 @@ table.mceLayout {
 	margin-left: 5px;
 }
 
-.elgg-list-item {
+.elgg-item {
 	margin: 3px;
 }
 .elgg-menu-metadata {
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 203f6d257..594694e60 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -47,10 +47,10 @@
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-list-item .elgg-subtext {
+.elgg-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-list-content {
+.elgg-item .elgg-content {
 	margin: 10px 5px;
 }
 
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index d3a6ea862..9206ada66 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -49,5 +49,5 @@ echo "<h3>$title_link</h3>";
 echo "<div class=\"elgg-subtext\">$subtitle</div>";
 echo $tags;
 if ($content) {
-	echo "<div class=\"elgg-list-content\">$content</div>";
+	echo "<div class=\"elgg-content\">$content</div>";
 }
diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index e86b9f885..f03eb1109 100644
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -2,7 +2,17 @@
 /**
  * Gallery view
  *
- * @uses $vars['items']
+ * Implemented as an unorder list
+ *
+ * @uses $vars['items']         Array of ElggEntity or ElggAnnotation objects
+ * @uses $vars['offset']        Index of the first list item in complete list
+ * @uses $vars['limit']         Number of items per page
+ * @uses $vars['count']         Number of items in the complete list
+ * @uses $vars['pagination']    Show pagination? (default: true)
+ * @uses $vars['position']      Position of the pagination: before, after, or both
+ * @uses $vars['full_view']     Show the full view of the items (default: false)
+ * @uses $vars['gallery_class'] Additional CSS class for the <ul> element
+ * @uses $vars['item_class']    Additional CSS class for the <li> elements
  */
 
 $items = $vars['items'];
@@ -19,6 +29,16 @@ $pagination = elgg_extract('pagination', $vars, true);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
 
+$gallery_class = 'elgg-gallery';
+if (isset($vars['gallery_class'])) {
+	$gallery_class = "$gallery_class {$vars['gallery_class']}";
+}
+
+$item_class = 'elgg-item';
+if (isset($vars['item_class'])) {
+	$item_class = "$item_class {$vars['item_class']}";
+}
+
 if ($pagination && $count) {
 	$nav .= elgg_view('navigation/pagination', array(
 		'offset' => $offset,
@@ -33,10 +53,15 @@ if ($position == 'before' || $position == 'both') {
 }
 
 ?>
-<ul class="elgg-gallery">
+<ul class="<?php echo $gallery_class; ?>">
 	<?php
 		foreach ($items as $item) {
-			echo '<li>';
+			if (elgg_instanceof($item)) {
+			$id = "elgg-{$item->getType()}-{$item->getGUID()}";
+			} else {
+				$id = "item-{$item->getType()}-{$item->id}";
+			}
+			echo "<li id=\"$id\" class=\"$item_class\">";
 			echo elgg_view_list_item($item, $vars);
 			echo "</li>";
 		}
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index ae951c89f..c83fa0966 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -27,12 +27,12 @@ $position = elgg_extract('position', $vars, 'after');
 
 $list_class = 'elgg-list';
 if (isset($vars['list_class'])) {
-	$list_class = "{$vars['list_class']} $list_class";
+	$list_class = "$list_class {$vars['list_class']}";
 }
 
-$item_class = 'elgg-list-item';
+$item_class = 'elgg-item';
 if (isset($vars['item_class'])) {
-	$item_class = "{$vars['item_class']} $item_class";
+	$item_class = "$item_class {$vars['item_class']}";
 }
 
 $html = "";
-- 
cgit v1.2.3


From 59774f1999752f941d48dcae43d53d4a6cc8c0c0 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 25 Jun 2011 20:27:02 -0400
Subject: one_column layout was not showing title and nav

---
 views/default/css/elements/layout.php     |  3 ---
 views/default/page/layouts/one_column.php | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'views/default/page')

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index a5854f8c1..9f028d8b5 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -75,9 +75,6 @@
 .elgg-layout {
 	min-height: 360px;
 }
-.elgg-layout-one-column {
-	padding: 10px 0;
-}
 .elgg-layout-one-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }
diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index c59a574e7..7546a4cdf 100644
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -13,11 +13,22 @@ $class = 'elgg-layout elgg-layout-one-column clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
+
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
 ?>
 <div class="<?php echo $class; ?>">
-	<div class="elgg-body">
-	<?php echo $vars['content']; ?>
+	<div class="elgg-body elgg-main">
 	<?php
+		echo $nav;
+
+		if (isset($vars['title'])) {
+			echo elgg_view_title($vars['title']);
+		}
+
+		echo $vars['content'];
+		
 		// @deprecated 1.8
 		echo $vars['area1'];
 	?>
-- 
cgit v1.2.3


From b0b197ee2e73974a8b0c080086945383a863410e Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 26 Jun 2011 06:41:39 -0400
Subject: Fixes #3614 updated use of elgg_view_entity() throughout core

---
 engine/classes/ElggEntity.php                        | 2 +-
 mod/blog/lib/blog.php                                | 2 +-
 mod/bookmarks/pages/bookmarks/view.php               | 2 +-
 mod/file/pages/file/view.php                         | 2 +-
 mod/groups/lib/discussion.php                        | 2 +-
 mod/groups/views/default/groups/sidebar/featured.php | 2 +-
 mod/messages/pages/messages/read.php                 | 2 +-
 mod/pages/pages/pages/view.php                       | 2 +-
 mod/search/views/default/search/entity.php           | 2 +-
 pages/entities/index.php                             | 2 +-
 views/default/page/elements/owner_block.php          | 2 +-
 views/json/entities/entity_list.php                  | 4 ++--
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'views/default/page')

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 5b78f5db5..6edc99dd4 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -1628,7 +1628,7 @@ abstract class ElggEntity extends ElggData implements
 		 */
 
 		elgg_set_viewtype('default');
-		$view = elgg_view_entity($this, true);
+		$view = elgg_view_entity($this, array('full_view' => true));
 		elgg_set_viewtype();
 
 		$tmp[] = new ODDMetaData($uuid . "volatile/renderedentity/", $uuid,
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 8964d5b53..6bdbc8b1f 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -38,7 +38,7 @@ function blog_get_page_content_read($guid = NULL) {
 	}
 
 	elgg_push_breadcrumb($blog->title);
-	$return['content'] = elgg_view_entity($blog, TRUE);
+	$return['content'] = elgg_view_entity($blog, array('full_view' => true));
 	//check to see if comment are on
 	if ($blog->comments_on != 'Off') {
 		$return['content'] .= elgg_view_comments($blog);
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index d0a9c630a..8e097b090 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -21,7 +21,7 @@ $title = $bookmark->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($bookmark, true);
+$content = elgg_view_entity($bookmark, array('full_view' => true));
 $content .= elgg_view_comments($bookmark);
 
 $body = elgg_view_layout('content', array(
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 45e112d4d..4b395d20d 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -22,7 +22,7 @@ $title = $file->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($file, true);
+$content = elgg_view_entity($file, array('full_view' => true));
 $content .= elgg_view_comments($file);
 
 $download = elgg_view('output/url', array(
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 94d212ef6..342115c81 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -167,7 +167,7 @@ function discussion_handle_view_page($guid) {
 	elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
 	elgg_push_breadcrumb($topic->title);
 
-	$content = elgg_view_entity($topic, true);
+	$content = elgg_view_entity($topic, array('full_view' => true));
 	if ($topic->status == 'closed') {
 		$content .= elgg_view('discussion/replies', array(
 			'entity' => $topic,
diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 695782783..8bd51ab5c 100644
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -17,7 +17,7 @@ if ($featured_groups) {
 	elgg_push_context('widgets');
 	$body = '';
 	foreach ($featured_groups as $group) {
-		$body .= elgg_view_entity($group, false);
+		$body .= elgg_view_entity($group, array('full_view' => false));
 	}
 	elgg_pop_context();
 
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index 5397d33e5..9bedbd08a 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -27,7 +27,7 @@ if ($page_owner->getGUID() == $message->toId) {
 elgg_push_breadcrumb($title);
 
 $buttons = '';
-$content = elgg_view_entity($message, true);
+$content = elgg_view_entity($message, array('full_view' => true));
 if ($inbox) {
 	$form_params = array(
 		'id' => 'messages-reply-form',
diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index b73bc985c..06064d993 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -29,7 +29,7 @@ if (elgg_instanceof($container, 'group')) {
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($page, true);
+$content = elgg_view_entity($page, array('full_view' => true));
 $content .= elgg_view_comments($page);
 
 $buttons = '';
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index 2193a70d8..e04d08836 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -27,7 +27,7 @@ if (!$icon) {
 	} else {
 		// display a generic icon if no owner, though there will probably be
 		// other problems if the owner can't be found.
-		$icon = elgg_view_entity($entity, 'tiny');
+		$icon = elgg_view_entity_icon($entity, 'tiny');
 	}
 }
 
diff --git a/pages/entities/index.php b/pages/entities/index.php
index 13aea9e5a..d3b935dc4 100644
--- a/pages/entities/index.php
+++ b/pages/entities/index.php
@@ -36,7 +36,7 @@ if ($entity = get_entity($guid)) {
 	} else if ($entity instanceof ElggEntity) {
 		$title = $entity->name;
 	}
-	$area1 = elgg_view_entity($entity, true);
+	$area1 = elgg_view_entity($entity, array('full_view' => true));
 	if ($shell) {
 		$body = elgg_view_layout('one_column', array('content' => $area1));
 	} else {
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index c525a38aa..fc7f0f6d2 100644
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -15,7 +15,7 @@ $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
 	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
-	$header = elgg_view_entity($owner, false);
+	$header = elgg_view_entity($owner, array('full_view' => false));
 
 	$body = elgg_view_menu('owner_block', array('entity' => $owner));
 
diff --git a/views/json/entities/entity_list.php b/views/json/entities/entity_list.php
index b583588c3..d5b134a71 100644
--- a/views/json/entities/entity_list.php
+++ b/views/json/entities/entity_list.php
@@ -4,7 +4,7 @@ $entities = $vars['entities'];
 $full_view = $vars['full_view'];
 
 if (is_array($entities) && sizeof($entities) > 0) {
-	foreach($entities as $entity) {
-		echo elgg_view_entity($entity, $full_view);
+	foreach ($entities as $entity) {
+		echo elgg_view_entity($entity, array('full_view' => $full_view));
 	}
 }
-- 
cgit v1.2.3


From 32387e6db0c56935e93314217b52eab4d9dca016 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 26 Jun 2011 08:16:19 -0400
Subject: Fixes #3470 using rel=toggle now

---
 engine/classes/ElggMenuItem.php                               |  4 ++++
 engine/lib/navigation.php                                     |  2 +-
 js/lib/ui.js                                                  |  6 +++---
 mod/groups/start.php                                          |  4 ++--
 mod/logbrowser/views/default/logbrowser/form.php              |  8 ++++----
 mod/profile/views/default/profile/owner_block.php             |  2 +-
 mod/reportedcontent/views/default/object/reported_content.php |  2 +-
 views/default/object/plugin/advanced.php                      |  2 +-
 views/default/object/plugin/invalid.php                       |  2 +-
 views/default/object/widget/elements/controls.php             |  6 ++++--
 views/default/page/layouts/widgets/add_button.php             | 11 ++++++++---
 11 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'views/default/page')

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index cd6267ad6..1181583f2 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -504,6 +504,10 @@ class ElggMenuItem {
 			$vars['class'] = $this->getLinkClass();
 		}
 
+		if ($this->link_rel) {
+			$vars['rel'] = $this->link_rel;
+		}
+
 		if ($this->rel) {
 			$vars['rel'] = $this->rel;
 		}
diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index b51c63b49..4b2c998a2 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -276,7 +276,7 @@ function elgg_river_menu_setup($hook, $type, $return, $params) {
 					'href' => "#comments-add-$object->guid",
 					'text' => elgg_view_icon('speech-bubble'),
 					'title' => elgg_echo('comment:this'),
-					'link_class' => "elgg-toggler",
+					'link_rel' => 'toggle',
 					'priority' => 50,
 				);
 				$return[] = ElggMenuItem::factory($options);
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 89a996122..fd20acbd1 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -11,7 +11,7 @@ elgg.ui.init = function () {
 	$('.elgg-system-messages li').animate({opacity: 0.9}, 6000);
 	$('.elgg-system-messages li').fadeOut('slow');
 
-	$('.elgg-toggler').live('click', elgg.ui.toggles);
+	$('[rel=toggle]').live('click', elgg.ui.toggles);
 
 	$('[rel=popup]').live('click', elgg.ui.popsUp);
 
@@ -27,8 +27,8 @@ elgg.ui.init = function () {
 /**
  * Toggles an element based on clicking a separate element
  *
- * Use .elgg-toggler on the toggler element
- * Set the href to target the item you want to toggle (<a class="elgg-toggler" href="#id-of-target">)
+ * Use rel="toggle" on the toggler element
+ * Set the href to target the item you want to toggle (<a rel="toggle" href="#id-of-target">)
  *
  * @param {Object} event
  * @return void
diff --git a/mod/groups/start.php b/mod/groups/start.php
index f35c058b6..57c40af5d 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -764,7 +764,7 @@ function discussion_owner_block_menu($hook, $type, $return, $params) {
  * Add the reply button for the river
  */
 function discussion_add_to_river_menu($hook, $type, $return, $params) {
-	if (elgg_is_logged_in() && !elgg_get_context('widgets')) {
+	if (elgg_is_logged_in() && !elgg_in_context('widgets')) {
 		$item = $params['item'];
 		$object = $item->getObjectEntity();
 		if (elgg_instanceof($object, 'object', 'groupforumtopic')) {
@@ -776,7 +776,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) {
 						'href' => "#groups-reply-$object->guid",
 						'text' => elgg_view_icon('speech-bubble'),
 						'title' => elgg_echo('reply:this'),
-						'link_class' => "elgg-toggler",
+						'link_rel' => 'toggle',
 						'priority' => 50,
 					);
 					$return[] = ElggMenuItem::factory($options);
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index d2476afac..d5cf9f6b8 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -59,9 +59,12 @@
 	$toggle_link = elgg_view('output/url', array(
 		'href' => '#log-browser-search-form',
 		'text' => elgg_echo('logbrowser:search'),
-		'class' => 'elgg-toggler',
+		'rel' => 'toggle',
 	));
 ?>
+	<p>
+		<?php echo $toggle_link; ?>
+	</p>
 	<div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
 		<div class="elgg-head">
 			<h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
@@ -70,7 +73,4 @@
 			<?php echo $wrappedform; ?>
 		</div>
 	</div>
-	<p>
-		<?php echo $toggle_link; ?>
-	</p>
 </div>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 48d7ff24f..5a65a3a26 100644
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -35,7 +35,7 @@ if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page
 	$text = elgg_echo('admin:options');
 
 	$admin_links = '<ul class="profile-admin-menu-wrapper">';
-	$admin_links .= "<li><a class=\"elgg-toggler\" href=\"#profile-menu-admin\">$text&hellip;</a>";
+	$admin_links .= "<li><a rel=\"toggle\" href=\"#profile-menu-admin\">$text&hellip;</a>";
 	$admin_links .= '<ul class="profile-admin-menu" id="profile-menu-admin">';
 	foreach ($admin as $menu_item) {
 		$admin_links .= elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index b8c443450..6bcbf6e5d 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -58,7 +58,7 @@ if ($report->state == 'archived') {
 			<?php echo elgg_view('output/url', array(
 				'href' => "#report-$report->guid",
 				'text' => elgg_echo('reportedcontent:moreinfo'),
-				'class' => "elgg-toggler",
+				'rel' => "toggle",
 			));
 			?>
 		</p>
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 51fb69d17..84fc0439b 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -242,7 +242,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 				echo elgg_view('output/url', array(
 					'href' => "#elgg-plugin-manifest-{$plugin->getID()}",
 					'text' => elgg_echo("admin:plugins:label:moreinfo"),
-					'class' => 'elgg-toggler',
+					'rel' => 'toggle',
 				));
 			?>
 			</div>
diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index 9e239b7ca..f29ee8d12 100644
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -29,7 +29,7 @@ $error = $plugin->getError();
 				echo elgg_view('output/url', array(
 					'href' => "#elgg-plugin-manifest-{$plugin->getID()}",
 					'text' => elgg_echo("admin:plugins:label:moreinfo"),
-					'class' => 'elgg-toggler',
+					'rel' => 'toggle',
 				));
 			?>
 		</div>
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index 83a2f5767..abf2154fc 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -12,7 +12,8 @@ $show_edit = elgg_extract('show_edit', $vars, true);
 $params = array(
 	'text' => ' ',
 	'href' => "#elgg-widget-content-$widget->guid",
-	'class' => 'elgg-widget-collapse-button elgg-toggler',
+	'class' => 'elgg-widget-collapse-button',
+	'rel' => 'toggle',
 );
 $collapse_link = elgg_view('output/url', $params);
 
@@ -33,7 +34,8 @@ if ($widget->canEdit()) {
 			'text' => elgg_view_icon('settings-alt'),
 			'title' => elgg_echo('widget:edit'),
 			'href' => "#widget-edit-$widget->guid",
-			'class' => "elgg-toggler elgg-widget-edit-button",
+			'class' => "elgg-widget-edit-button",
+			'rel' => 'toggle',
 		);
 		$edit_link = elgg_view('output/url', $params);
 	}
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index a8670146b..89e83b096 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,12 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-	<a class="elgg-button elgg-button-action elgg-toggler" href="#widgets-add-panel">
-		<?php echo elgg_echo('widgets:add'); ?>
-	</a>
+<?php
+	echo elgg_view('output/url', array(
+		'href' => '#widgets-add-panel',
+		'text' => elgg_echo('widgets:add'),
+		'class' => 'elgg-button elgg-button-action',
+		'rel' => 'toggle',
+	));
+?>
 </div>
-- 
cgit v1.2.3


From 3c34ddf59804767e6a7deea3e3ee6c81d4a09601 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sun, 26 Jun 2011 15:13:50 -0400
Subject: removed buttons logic from content header view, created convenience
 function rather than copying and pasting, and updated the blog plugin

---
 engine/lib/navigation.php                     | 35 +++++++++++++++++++++++++++
 mod/blog/lib/blog.php                         |  6 +++--
 views/default/page/layouts/content.php        |  1 -
 views/default/page/layouts/content/header.php | 30 ++++++++---------------
 4 files changed, 49 insertions(+), 23 deletions(-)

(limited to 'views/default/page')

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 4b2c998a2..1cb289654 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -153,6 +153,41 @@ function elgg_is_menu_item_registered($menu_name, $item_name) {
 	return false;
 }
 
+/**
+ * Convenience function for registering an add content button to title menu
+ *
+ * The add URL must be $handler/add/$guid where $guid is the guid of the page owner.
+ * The label of the button is "$handler:add" so that must be defined in a
+ * language file.
+ *
+ * @param string $handler The handler to use or null to autodetect from context
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_register_add_button($handler = null) {
+	if (elgg_is_logged_in()) {
+
+		if (!$handler) {
+			$handler = elgg_get_context();
+		}
+
+		$owner = elgg_get_page_owner_entity();
+		if (!$owner) {
+			// no owns the page so this is probably an all site list page
+			$owner = elgg_get_logged_in_user_entity();
+		}
+		if ($owner && $owner->canWriteToContainer()) {
+			$guid = $owner->getGUID();
+			elgg_register_menu_item('title', array(
+				'name' => 'add',
+				'href' => "$handler/add/$guid",
+				'text' => elgg_echo("$handler:add"),
+				'link_class' => 'elgg-button elgg-button-action',
+			));
+		}
+	}
+}
+
 /**
  * Adds a breadcrumb to the breadcrumbs stack.
  *
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 4d1edd50e..d13b2244e 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -92,6 +92,8 @@ function blog_get_page_content_list($container_guid = NULL) {
 		elgg_push_breadcrumb(elgg_echo('blog:blogs'));
 	}
 
+	elgg_register_add_button();
+
 	// show all posts for admin or users looking at their own blogs
 	// show only published posts for other users.
 	if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $container_guid == $loggedin_userid))) {
@@ -129,6 +131,8 @@ function blog_get_page_content_friends($user_guid) {
 	elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
 	elgg_push_breadcrumb(elgg_echo('friends'));
 
+	elgg_register_add_button();
+
 	if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
 		$return['content'] .= elgg_echo('friends:none:you');
 		return $return;
@@ -235,7 +239,6 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	return array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 }
@@ -253,7 +256,6 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 	elgg_load_js('elgg.blog');
 
 	$return = array(
-		'buttons' => '',
 		'filter' => '',
 	);
 
diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
index 35d695f0a..c406c9faf 100644
--- a/views/default/page/layouts/content.php
+++ b/views/default/page/layouts/content.php
@@ -10,7 +10,6 @@
  * @uses $vars['filter']         HTML of the content area filter (override)
  * @uses $vars['title']          Title text (override)
  * @uses $vars['context']        Page context (override)
- * @uses $vars['buttons']        Content header buttons (override)
  * @uses $vars['filter_context'] Filter context: everyone, friends, mine
  * @uses $vars['class']          Additional class to apply to layout
  */
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 403da8a0a..345163bdd 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -7,9 +7,13 @@
  * @uses $vars['header_override'] HTML for overriding the default header (override)
  * @uses $vars['title']           Title text (override)
  * @uses $vars['context']         Page context (override)
- * @uses $vars['buttons']         Content header buttons (override)
  */
 
+if (isset($vars['buttons'])) {
+	// it was a bad idea to implement buttons with a pass through
+	elgg_deprecated_notice("Use elgg_register_menu_item() to register for the title menu", 1.0);
+}
+
 if (isset($vars['header_override'])) {
 	echo $vars['header_override'];
 	return true;
@@ -22,27 +26,13 @@ if ($context) {
 		$title = elgg_echo($context);
 	}
 
-	if (isset($vars['buttons'])) {
+	if (isset($vars['buttons']) && $vars['buttons']) {
 		$buttons = $vars['buttons'];
 	} else {
-		if (elgg_is_logged_in() && $context) {
-			$owner = elgg_get_page_owner_entity();
-			if (!$owner) {
-				// this is probably an all page
-				$owner = elgg_get_logged_in_user_entity();
-			}
-			if ($owner && $owner->canWriteToContainer()) {
-				$guid = $owner->getGUID();
-				elgg_register_menu_item('title', array(
-					'name' => 'add',
-					'href' => elgg_extract('new_link', $vars, "$context/add/$guid"),
-					'text' => elgg_echo("$context:add"),
-					'link_class' => 'elgg-button elgg-button-action',
-				));
-			}
-		}
-		
-		$buttons = elgg_view_menu('title', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
+		$buttons = elgg_view_menu('title', array(
+			'sort_by' => 'priority',
+			'class' => 'elgg-menu-hz',
+		));
 	}
 	echo <<<HTML
 <div class="elgg-head clearfix">
-- 
cgit v1.2.3


From eb43980ad428e9c64406579de0677da7a4fcd081 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 28 Jun 2011 07:30:22 -0400
Subject: using elgg_view_title() in content layout header

---
 engine/lib/views.php                          | 15 +++++++-----
 views/default/page/layouts/content/header.php | 35 ++++++++++++++-------------
 2 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'views/default/page')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 7358fc0ba..aff0dbd0d 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1076,21 +1076,24 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full_view = true) {
 }
 
 /**
- * Returns a rendered title.
+ * Renders a title.
  *
  * This is a shortcut for {@elgg_view page/elements/title}.
  *
- * @param string $title   The page title
- * @param string $submenu Should a submenu be displayed? (deprecated)
+ * @param string $title The page title
+ * @param string $vars  View variables (was submenu be displayed? (deprecated))
  *
  * @return string The HTML (etc)
  */
-function elgg_view_title($title, $submenu = false) {
-	if ($submenu !== false) {
+function elgg_view_title($title, $vars = array()) {
+	if (!is_array($vars)) {
 		elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8);
+		$vars = array('submenu' => $vars);
 	}
 
-	return elgg_view('page/elements/title', array('title' => $title, 'submenu' => $submenu));
+	$vars['title'] = $title;
+
+	return elgg_view('page/elements/title', $vars);
 }
 
 /**
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 345163bdd..1e66e52db 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -2,7 +2,7 @@
 /**
  * Main content header
  *
- * This includes a title and a new content button by default
+ * Title and title menu
  *
  * @uses $vars['header_override'] HTML for overriding the default header (override)
  * @uses $vars['title']           Title text (override)
@@ -20,23 +20,24 @@ if (isset($vars['header_override'])) {
 }
 
 $context = elgg_extract('context', $vars, elgg_get_context());
-if ($context) {
-	$title = elgg_extract('title', $vars, '');
-	if (!$title) {
-		$title = elgg_echo($context);
-	}
 
-	if (isset($vars['buttons']) && $vars['buttons']) {
-		$buttons = $vars['buttons'];
-	} else {
-		$buttons = elgg_view_menu('title', array(
-			'sort_by' => 'priority',
-			'class' => 'elgg-menu-hz',
-		));
-	}
-	echo <<<HTML
+$title = elgg_extract('title', $vars, '');
+if (!$title) {
+	$title = elgg_echo($context);
+}
+$title = elgg_view_title($title, array('class' => 'elgg-heading-main'));
+
+if (isset($vars['buttons']) && $vars['buttons']) {
+	$buttons = $vars['buttons'];
+} else {
+	$buttons = elgg_view_menu('title', array(
+		'sort_by' => 'priority',
+		'class' => 'elgg-menu-hz',
+	));
+}
+
+echo <<<HTML
 <div class="elgg-head clearfix">
-	<h2 class="elgg-heading-main">$title</h2>$buttons
+	$title$buttons
 </div>
 HTML;
-}
-- 
cgit v1.2.3


From a07f6da7110885ec8600dad1fd63af833a258241 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 28 Jun 2011 07:40:49 -0400
Subject: Fixes #3519 admin area now has title buttons

---
 views/default/css/admin.php          | 12 ++++++++++++
 views/default/page/layouts/admin.php |  5 +++++
 2 files changed, 17 insertions(+)

(limited to 'views/default/page')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index d7c154438..ce271f49b 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -604,6 +604,18 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	padding-bottom: 15px;
 }
 
+/* ***************************************
+	TITLE MENU
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
+}
+
 /* ***************************************
 	FOOTER MENU
 *************************************** */
diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php
index 890c8a06e..8dbdc27e6 100644
--- a/views/default/page/layouts/admin.php
+++ b/views/default/page/layouts/admin.php
@@ -21,6 +21,11 @@
 	<div class="elgg-main elgg-body">
 		<div class="elgg-head">
 		<?php
+			echo elgg_view_menu('title', array(
+				'sort_by' => 'priority',
+				'class' => 'elgg-menu-hz',
+			));
+
 			if (isset($vars['title'])) {
 				echo elgg_view_title($vars['title']);
 			}
-- 
cgit v1.2.3


From 0750728e977c04a4a358bac0496b9d31c958238f Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 29 Jun 2011 20:34:55 -0400
Subject: added backward compatibility for the view
 page_elements/content_wrapper

---
 engine/lib/views.php                    | 14 ++++++++++++++
 views/default/page/elements/wrapper.php | 22 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 views/default/page/elements/wrapper.php

(limited to 'views/default/page')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index aff0dbd0d..8745d3117 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1514,6 +1514,19 @@ function elgg_views_add_rss_link() {
 	}
 }
 
+/**
+ * Registers deprecated views to avoid making some pages from older plugins
+ * completely empty.
+ *
+ * @private
+ */
+function elgg_views_handle_deprecated_views() {
+	$location = elgg_get_view_location('page_elements/contentwrapper');
+	if ($location === "/var/www/views/") {
+		elgg_extend_view('page_elements/contentwrapper', 'page/elements/wrapper');
+	}
+}
+
 /**
  * Initialize viewtypes on system boot event
  * This ensures simplecache is cleared during upgrades. See #2252
@@ -1560,3 +1573,4 @@ function elgg_views_boot() {
 }
 
 elgg_register_event_handler('boot', 'system', 'elgg_views_boot', 1000);
+elgg_register_event_handler('init', 'system', 'elgg_views_handle_deprecated_views');
diff --git a/views/default/page/elements/wrapper.php b/views/default/page/elements/wrapper.php
new file mode 100644
index 000000000..61828832d
--- /dev/null
+++ b/views/default/page/elements/wrapper.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Deprecated content wrapper view from Elgg 1.5 through 1.7
+ *
+ * @uses $vars['body'] The content to display inside content wrapper
+ * @uses $vars['subclass'] Additional css class
+ */
+
+elgg_deprecated_notice("The 'page_elements/contentwrapper' has been deprecated", 1.8);
+?>
+
+<div class="contentWrapper<?php
+
+	if (isset($vars['subclass'])) {
+		echo ' ' . $vars['subclass'];
+	}
+
+?>">
+<?php
+	echo $vars['body'];
+?>
+</div>
-- 
cgit v1.2.3


From c2cbd1fa8f488d8f7f769ae09e680eb2e22fc640 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sun, 3 Jul 2011 13:46:37 -0400
Subject: reformatted the code in page/elements/header_logo view due to line
 length

---
 views/default/page/elements/header_logo.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'views/default/page')

diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php
index 4295deaa4..7fe721c40 100644
--- a/views/default/page/elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
@@ -1,13 +1,15 @@
 <?php
 /**
  * Elgg header logo
- * The logo to display in elgg-header.
  */
 
 $site = elgg_get_site_entity();
 $site_name = $site->name;
+$site_url = elgg_get_site_url();
 ?>
 
 <h1>
-	<a class="elgg-heading-site" href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
+	<a class="elgg-heading-site" href="<?php echo $site_url; ?>">
+		<?php echo $site_name; ?>
+	</a>
 </h1>
-- 
cgit v1.2.3


From 647cadfb03e7a1a837c483d437de690231404fcd Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 25 Aug 2011 09:30:55 -0700
Subject: Fixes #3662. Pulled out shortcut_icon to its own view for easier
 overriding.

---
 views/default/page/elements/head.php          | 2 +-
 views/default/page/elements/shortcut_icon.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 views/default/page/elements/shortcut_icon.php

(limited to 'views/default/page')

diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 048edec40..8776f07a7 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -40,7 +40,7 @@ $release = get_version(true);
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $title; ?></title>
-	<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
+	<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
 
 <?php foreach ($css as $link) { ?>
 	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php
new file mode 100644
index 000000000..12fe9c1f8
--- /dev/null
+++ b/views/default/page/elements/shortcut_icon.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
\ No newline at end of file
-- 
cgit v1.2.3