Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

12 files changed, 36 insertions, 43 deletions

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index 2b2ec9e4a..cd03541d5 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -22,7 +22,7 @@ if ($notices) {
 		$notices_html .= elgg_view_entity($notice);
 	}
 
-	$notices_html = "<div class=\"admin_notices\">$notices_html</div>";
+	$notices_html = "<div class=\"elgg-admin-notices\">$notices_html</div>";
 }
 
 ?>
diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index f03eb1109..149ceeaf8 100644
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -39,6 +39,7 @@ if (isset($vars['item_class'])) {
 	$item_class = "$item_class {$vars['item_class']}";
 }
 
+$nav = '';
 if ($pagination && $count) {
 	$nav .= elgg_view('navigation/pagination', array(
 		'offset' => $offset,
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index c83fa0966..c0db50bc5 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -17,10 +17,10 @@
  */
 
 $items = $vars['items'];
-$offset = $vars['offset'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$base_url = $vars['base_url'];
+$offset = elgg_extract('offset', $vars);
+$limit = elgg_extract('limit', $vars);
+$count = elgg_extract('count', $vars);
+$base_url = elgg_extract('base_url', $vars, '');
 $pagination = elgg_extract('pagination', $vars, true);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php
index f7b9da59c..7e1eaff20 100644
--- a/views/default/page/components/module.php
+++ b/views/default/page/components/module.php
@@ -2,10 +2,10 @@
 /**
  * Elgg module element
  *
- * @uses $vars['title']        Title text
- * @uses $vars['header']       HTML content of the header
+ * @uses $vars['title']        Optional title text (do not pass header with this option)
+ * @uses $vars['header']       Optional HTML content of the header
  * @uses $vars['body']         HTML content of the body
- * @uses $vars['footer']       HTML content of the footer
+ * @uses $vars['footer']       Optional HTML content of the footer
  * @uses $vars['class']        Optional additional class for module
  * @uses $vars['id']           Optional id for module
  * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
@@ -29,19 +29,15 @@ if (isset($vars['id'])) {
 }
 
 if (isset($vars['header'])) {
-	if ($vars['header']) {
-		$header = "<div class=\"elgg-head\">$header</div>";
-	}
-} else {
+	$header = "<div class=\"elgg-head\">$header</div>";
+} elseif ($title) {
 	$header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
 }
 
 $body = "<div class=\"elgg-body\">$body</div>";
 
-if (isset($vars['footer'])) {
-	if ($vars['footer']) {
-		$footer = "<div class=\"elgg-foot\">$footer</div>";
-	}
+if ($footer) {
+	$footer = "<div class=\"elgg-foot\">$footer</div>";
 }
 
 $contents = $header . $body . $footer;
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 06fdb84a5..ded2cea9a 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -12,10 +12,11 @@ echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-me
 
 $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
 
-echo '<div class="mts clearfloat right">';
+echo '<div class="mts clearfloat float-alt">';
 echo elgg_view('output/url', array(
 	'href' => 'http://elgg.org',
 	'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
 	'class' => '',
+	'is_trusted' => true,
 ));
 echo '</div>';
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 8776f07a7..e968e95ce 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -48,11 +48,15 @@ $release = get_version(true);
 
 <?php
 	$ie_url = elgg_get_simplecache_url('css', 'ie');
+	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
 	$ie6_url = elgg_get_simplecache_url('css', 'ie6');
 ?>
-	<!--[if gt IE 6]>
+	<!--[if gt IE 7]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
 	<![endif]-->
+	<!--[if IE 7]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+	<![endif]-->
 	<!--[if IE 6]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
 	<![endif]-->
diff --git a/views/default/page/elements/sidebar.php b/views/default/page/elements/sidebar.php
index e1d25eed5..fe6bb450e 100644
--- a/views/default/page/elements/sidebar.php
+++ b/views/default/page/elements/sidebar.php
@@ -6,7 +6,7 @@
  */
 
 echo elgg_view_menu('extras', array(
-	'sort_by' => 'name',
+	'sort_by' => 'priority',
 	'class' => 'elgg-menu-hz',
 ));
 
diff --git a/views/default/page/elements/tagcloud_block.php b/views/default/page/elements/tagcloud_block.php
index 8b67c9e37..258951c41 100644
--- a/views/default/page/elements/tagcloud_block.php
+++ b/views/default/page/elements/tagcloud_block.php
@@ -50,6 +50,7 @@ $cloud .= elgg_view_icon('tag');
 $cloud .= elgg_view('output/url', array(
 	'href' => 'tags',
 	'text' => elgg_echo('tagcloud:allsitetags'),
+	'is_trusted' => true,
 ));
 $cloud .= '</p>';
 
diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index 7546a4cdf..491d5b459 100644
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -30,7 +30,9 @@ $nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
 		echo $vars['content'];
 		
 		// @deprecated 1.8
-		echo $vars['area1'];
+		if (isset($vars['area1'])) {
+			echo $vars['area1'];
+		}
 	?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/page/layouts/widgets.php b/views/default/page/layouts/widgets.php
index b2c54e854..e3819cc20 100644
--- a/views/default/page/layouts/widgets.php
+++ b/views/default/page/layouts/widgets.php
@@ -39,10 +39,14 @@ echo $vars['content'];
 
 $widget_class = "elgg-col-1of{$num_columns}";
 for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
-	$column_widgets = $widgets[$column_index];
+	if (isset($widgets[$column_index])) {
+		$column_widgets = $widgets[$column_index];
+	} else {
+		$column_widgets = array();
+	}
 
 	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
-	if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
+	if (sizeof($column_widgets) > 0) {
 		foreach ($column_widgets as $widget) {
 			if (array_key_exists($widget->handler, $widget_types)) {
 				echo elgg_view_entity($widget, array('show_access' => $show_access));
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 89e83b096..c33a45f99 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -10,6 +10,7 @@
 		'text' => elgg_echo('widgets:add'),
 		'class' => 'elgg-button elgg-button-action',
 		'rel' => 'toggle',
+		'is_trusted' => true,
 	));
 ?>
 </div>
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 95d17fcff..ff8e317c7 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -7,12 +7,9 @@
 
 // Set the content type
 header("Content-type: text/html; charset=UTF-8");
-
-$site = elgg_get_site_entity();
-$title = $site->name;
-
 ?>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -21,22 +18,8 @@ $title = $site->name;
 	<div class="elgg-page-messages">
 		<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
 	</div>
-	<div class="elgg-page-body">
-		<div id="elgg-walledgarden">
-			<div id="elgg-walledgarden-intro">
-				<h1 class="elgg-heading-walledgarden">
-					<?php
-						echo elgg_echo('walled_garden:welcome');
-						echo ': <br/>';
-						echo $title;
-					?>
-				</h1>
-			</div>
-			<div id="elgg-walledgarden-login">
-				<?php echo $vars['body']; ?>
-			</div>
-		</div>
-		<div id="elgg-walledgarden-bottom"></div>
+	<div class="elgg-body-walledgarden">
+		<?php echo $vars['body']; ?>
 	</div>
 </div>
 <?php echo elgg_view('page/elements/foot'); ?>