diff options
| -rw-r--r-- | index.php | 25 | ||||
| -rw-r--r-- | languages/en.php | 12 | ||||
| -rw-r--r-- | settings/plugins.php | 2 | ||||
| -rw-r--r-- | settings/statistics.php | 2 | ||||
| -rw-r--r-- | settings/user.php | 2 |
5 files changed, 22 insertions, 21 deletions
@@ -11,26 +11,27 @@ /** * Start the Elgg engine */ -define('externalpage',true); +define('externalpage', TRUE); require_once(dirname(__FILE__) . "/engine/start.php"); if (!trigger_plugin_hook('index', 'system', null, FALSE)) { - /** - * Check to see if user is logged in, if not display login form - **/ - if (isloggedin()) { forward('pg/dashboard/'); } - //Load the front page - global $CONFIG; - $title = elgg_view_title(elgg_echo('content:latest')); - set_context('search'); - $content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group'))); - set_context('main'); + /* + River dashboard should respond to the index:system plugin hook instead of + being hard-coded here. + if(is_plugin_enabled('riverdashboard')){ + $title = elgg_view_title(elgg_echo('content:latest')); + set_context('search'); + $content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group'))); + set_context('main'); + } + */ + global $autofeed; $autofeed = FALSE; - $content = elgg_view_layout('two_column_left_sidebar', '', $title . $content, elgg_view("account/forms/login")); + $content = elgg_view_layout('one_column_with_sidebar', elgg_view('account/forms/login'), $title . $content); page_draw(null, $content); } diff --git a/languages/en.php b/languages/en.php index 04910b927..1e2984b0d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -1,8 +1,8 @@ <?php /** - * Activity viewer + * Core English Lange * - * @package Elgg + * @package ElggLanguage * @subpackage Core * @author Curverider Ltd * @link http://elgg.org/ @@ -259,7 +259,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", * Friends */ - 'friends' => "Friends", + 'friends' => "My Friends", 'friends:yours' => "Your friends", 'friends:owned' => "%s's friends", 'friend:add' => "Add friend", @@ -384,8 +384,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'account' => "Account", 'settings' => "Settings", - 'tools' => "Tools", - 'tools:yours' => "Your tools", + 'tools' => "My stuff", + 'tools:yours' => "My tools", 'register' => "Register", 'registerok' => "You have successfully registered for %s.", @@ -411,7 +411,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'item:object:reported_content' => "Reported items", 'user:set:name' => "Account name settings", - 'user:name:label' => "Your name", + 'user:name:label' => "My display name", 'user:name:success' => "Successfully changed your name on the system.", 'user:name:fail' => "Could not change your name on the system. Please make sure your name isn't too long and try again.", diff --git a/settings/plugins.php b/settings/plugins.php index 219302ebc..d26f626f7 100644 --- a/settings/plugins.php +++ b/settings/plugins.php @@ -20,4 +20,4 @@ if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { } // Display main admin menu -page_draw(elgg_echo("usersettings:plugins"),elgg_view_layout('two_column_left_sidebar','',elgg_view_title(elgg_echo("usersettings:plugins")) . elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins())))); +page_draw(elgg_echo("usersettings:plugins"),elgg_view_layout('one_column_with_sidebar', '', elgg_view_title(elgg_echo("usersettings:plugins")) . elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins())))); diff --git a/settings/statistics.php b/settings/statistics.php index f0bbcfe63..48bf46a04 100644 --- a/settings/statistics.php +++ b/settings/statistics.php @@ -20,4 +20,4 @@ if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { } // Display main admin menu -page_draw(elgg_echo("usersettings:statistics"),elgg_view_layout('two_column_left_sidebar','',elgg_view_title(elgg_echo("usersettings:statistics")) . elgg_view("usersettings/statistics")));
\ No newline at end of file +page_draw(elgg_echo("usersettings:statistics"),elgg_view_layout('one_column_with_sidebar','',elgg_view_title(elgg_echo("usersettings:statistics")) . elgg_view("usersettings/statistics")));
\ No newline at end of file diff --git a/settings/user.php b/settings/user.php index ae9dd5061..8bfdc87fa 100644 --- a/settings/user.php +++ b/settings/user.php @@ -22,5 +22,5 @@ if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { // Display main admin menu page_draw( elgg_echo("usersettings:user"), - elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form")) + elgg_view_layout("one_column_with_sidebar", '', elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form")) );
\ No newline at end of file |