change theme to extend front page instead of redeclaring it.

diff --git a/index.php b/index.php
deleted file mode 100644 (file)
index 0716540..0000000
--- a/index.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Elgg index page for web-based applications
- *
- * @package Elgg
- * @subpackage Core
- */
-
-if (elgg_is_logged_in()) {
-       forward('activity');
-}
-
-elgg_load_css('n1:landing_page');
-
-$content = elgg_view('n1_theme/landing');
-$content .= elgg_view_title(elgg_echo('content:latest'));
-$content .= elgg_list_river();
-
-$login_box = elgg_view('core/account/login_box');
-
-$params = array(
-               'content' => $content,
-               'sidebar' => $login_box
-);
-$body = elgg_view_layout('one_sidebar', $params);
-echo elgg_view_page(null, $body);

diff --git a/start.php b/start.php
index 7766f5fc2b0f853906d2d29c4f2fb30ed934238c..62600757810957ceb1e1cfcec784fce275ae3cf4 100644 (file)
--- a/start.php
+++ b/start.php
@@ -8,13 +8,12 @@ function n1_theme_init() {
        elgg_register_menu_item('topbar', $item);\r
        elgg_register_plugin_hook_handler('register', 'menu:topbar', 'n1_theme_topbar_menu');\r
        \r
-       elgg_register_plugin_hook_handler('index', 'system', 'n1_theme_front_page');\r
-       \r
        elgg_register_simplecache_view('n1_theme/landing');\r
        elgg_register_css('n1:landing_page', elgg_get_simplecache_url('css', 'n1_theme/landing'));\r
        \r
        elgg_extend_view('css/elgg', 'n1_theme/css');\r
        elgg_extend_view('js/elgg', 'n1_theme/js');\r
+       elgg_extend_view('page/elements/title', 'n1_theme/header', 0);\r
        \r
        if (elgg_is_active_plugin('pages')) {\r
                // pages icon url override\r
@@ -26,11 +25,6 @@ function n1_theme_topbar_menu($hook, $type, $returnvalue, $params){
        //var_dump($returnvalue);exit();\r
 }\r
 \r
-function n1_theme_front_page($hook, $type, $returnvalue, $params) {\r
-       include(elgg_get_plugins_path() . 'n1_theme/index.php');\r
-       return true;\r
-}\r
-\r
 /**\r
  * Override the default entity icon for pages and pads\r
  *\r

diff --git a/views/default/n1_theme/header.php b/views/default/n1_theme/header.php
new file mode 100644 (file)
index 0000000..5939df8
--- /dev/null
+++ b/views/default/n1_theme/header.php
@@ -0,0 +1,11 @@
+<?php
+
+$context = elgg_get_context();
+
+$title = $vars['title'];
+
+if ($context === 'main' && $title == elgg_echo('content:latest')) {
+
+       echo elgg_view('n1_theme/landing');
+
+}

diff --git a/views/default/n1_theme/landing.php b/views/default/n1_theme/landing.php
index 83132a9f8ae63b293beb11cdc68655db29b1267d..132b27522ae7fa8ae9e4e50efa9c67da0a95f5fa 100644 (file)
--- a/views/default/n1_theme/landing.php
+++ b/views/default/n1_theme/landing.php
@@ -1,5 +1,7 @@
 <?php
 
+elgg_load_css('n1:landing_page');
+
 $title = elgg_echo('n1_theme:landing:title');
 $subtitle = elgg_echo('n1_theme:landing:subtitle');