Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

4 files changed, 16 insertions, 14 deletions

diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index 7bb2a2543..80187efbc 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -7,10 +7,9 @@
 	<description>A demonstration of how to create a front page plugin.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2009030702</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
 </plugin_manifest>
diff --git a/mod/custom_index/start.php b/mod/custom_index/start.php
index 857798798..48d03f27b 100644
--- a/mod/custom_index/start.php
+++ b/mod/custom_index/start.php
@@ -4,7 +4,7 @@
  * 
  */
 
-register_elgg_event_handler('init', 'system', 'custom_index_init');
+elgg_register_event_handler('init', 'system', 'custom_index_init');
 
 function custom_index_init() {
 
@@ -12,7 +12,7 @@ function custom_index_init() {
 	elgg_extend_view('css/elgg', 'custom_index/css');
 
 	// Replace the default index page
-	register_plugin_hook('index', 'system', 'custom_index');
+	elgg_register_plugin_hook_handler('index', 'system', 'custom_index');
 }
 
 function custom_index($hook, $type, $return, $params) {
diff --git a/mod/custom_index/views/default/custom_index/css.php b/mod/custom_index/views/default/custom_index/css.php
index ef7b0a39c..4c780a905 100644
--- a/mod/custom_index/views/default/custom_index/css.php
+++ b/mod/custom_index/views/default/custom_index/css.php
@@ -11,12 +11,12 @@
 .custom-index {
 	padding: 10px 0;
 }
-.custom-index .elgg-module-featured {
+.elgg-module-highlight {
 	-webkit-box-shadow: 1px 1px 5px #CCC;
 	-moz-box-shadow: 1px 1px 5px #CCC;
 	box-shadow: 1px 1px 5px #CCC;
 }
-.custom-index .elgg-module-featured:hover {
+.elgg-module-highlight:hover {
 	-webkit-box-shadow: 1px 1px 6px #AAA;
 	-moz-box-shadow: 1px 1px 6px #AAA;
 	box-shadow: 1px 1px 6px #AAA;
diff --git a/mod/custom_index/views/default/page/layouts/custom_index.php b/mod/custom_index/views/default/page/layouts/custom_index.php
index 6b3f6d739..1267e19b2 100644
--- a/mod/custom_index/views/default/page/layouts/custom_index.php
+++ b/mod/custom_index/views/default/page/layouts/custom_index.php
@@ -6,6 +6,9 @@
  * Whatever you put in this view will appear on the front page of your site.
  * 
  */
+
+$mod_params = array('class' => 'elgg-module-highlight');
+
 ?>
 
 <div class="custom-index elgg-main elgg-grid clearfix">
@@ -22,19 +25,19 @@ if (elgg_is_logged_in()) {
 } else {
 	$top_box = $vars['login'];
 }
-echo elgg_view_module('featured',  '', $top_box, array('header' => false));
+echo elgg_view_module('featured',  '', $top_box, $mod_params);
 
 // a view for plugins to extend
 echo elgg_view("index/lefthandside");
 
 // files
 if (elgg_is_active_plugin('file')) {
-	echo elgg_view_module('featured',  elgg_echo("custom:files"), $vars['files']);
+	echo elgg_view_module('featured',  elgg_echo("custom:files"), $vars['files'], $mod_params);
 }
 
 // groups
 if (elgg_is_active_plugin('groups')) {
-	echo elgg_view_module('featured',  elgg_echo("custom:groups"), $vars['groups']);
+	echo elgg_view_module('featured',  elgg_echo("custom:groups"), $vars['groups'], $mod_params);
 }
 ?>
 		</div>
@@ -48,16 +51,16 @@ if (elgg_is_active_plugin('groups')) {
 echo elgg_view("index/righthandside");
 
 // files
-echo elgg_view_module('featured',  elgg_echo("custom:members"), $vars['members']);
+echo elgg_view_module('featured',  elgg_echo("custom:members"), $vars['members'], $mod_params);
 
 // groups
 if (elgg_is_active_plugin('blog')) {
-	echo elgg_view_module('featured',  elgg_echo("custom:blogs"), $vars['blogs']);
+	echo elgg_view_module('featured',  elgg_echo("custom:blogs"), $vars['blogs'], $mod_params);
 }
 
 // files
 if (elgg_is_active_plugin('bookmarks')) {
-	echo elgg_view_module('featured',  elgg_echo("custom:bookmarks"), $vars['bookmarks']);
+	echo elgg_view_module('featured',  elgg_echo("custom:bookmarks"), $vars['bookmarks'], $mod_params);
 }
 ?>
 		</div>