aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-14 23:09:41 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-14 23:09:41 +0000
commitcbc74d984665a8bc0de18e0fa7c2fe270e9b7476 (patch)
tree9480e8183649e485493eb497e862be787498d810
parentb5aed25425ff58d544726f97d3cca0ef142f8c94 (diff)
downloadelgg-cbc74d984665a8bc0de18e0fa7c2fe270e9b7476.tar.gz
elgg-cbc74d984665a8bc0de18e0fa7c2fe270e9b7476.tar.bz2
moved account views into core views - account forms are next
git-svn-id: http://code.elgg.org/elgg/trunk@7622 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php2
-rw-r--r--engine/lib/users.php2
-rw-r--r--index.php2
-rw-r--r--mod/sitepages/start.php2
-rw-r--r--views/default/core/account/login_box.php (renamed from views/default/account/login_box.php)0
-rw-r--r--views/default/core/account/login_dropdown.php (renamed from views/default/account/login_dropdown.php)0
-rw-r--r--views/default/core/account/login_walled_garden.php (renamed from views/default/account/login_walled_garden.php)0
-rw-r--r--views/default/page/elements/header.php2
8 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index cb0ee4e72..f9073cf6c 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2206,7 +2206,7 @@ function css_page_handler($page) {
* @return void
*/
function elgg_walled_garden_index() {
- $login = elgg_view('account/login_walled_garden');
+ $login = elgg_view('core/account/login_walled_garden');
echo elgg_view_page('', $login, 'walled_garden');
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 39c6cc622..033a4bdb6 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1404,7 +1404,7 @@ function registration_page_handler($page_elements) {
* @todo finish
*/
function elgg_user_login_page_handler() {
- $login_box = elgg_view('account/login_box');
+ $login_box = elgg_view('core/account/login_box');
$content = elgg_view_layout('one_column', array('content' => $login_box));
echo elgg_view_page(elgg_echo('login'), $content);
}
diff --git a/index.php b/index.php
index 680374ac1..33f51cb9b 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@ global $autofeed;
$autofeed = FALSE;
// if drop-down login in header option not selected
-$login_box = elgg_view('account/login_box');
+$login_box = elgg_view('core/account/login_box');
$content = $title . $activity;
$params = array(
diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index a99ec8436..844187503 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -149,7 +149,7 @@ function sitepages_page_handler($page) {
*/
function sitepages_ecml_keyword_hook($hook, $entity_type, $return_value, $params) {
$return_value['loginbox'] = array(
- 'view' => 'account/login_box',
+ 'view' => 'core/account/login_box',
'description' => elgg_echo('sitepages:ecml:keywords:loginbox:desc'),
'usage' => elgg_echo('sitepages:ecml:keywords:loginbox:usage'),
'restricted' => array('sitepages/custom_frontpage')
diff --git a/views/default/account/login_box.php b/views/default/core/account/login_box.php
index eb37d7554..eb37d7554 100644
--- a/views/default/account/login_box.php
+++ b/views/default/core/account/login_box.php
diff --git a/views/default/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index dc124f4e8..dc124f4e8 100644
--- a/views/default/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
diff --git a/views/default/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index 9f407bdff..9f407bdff 100644
--- a/views/default/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index efef1e09f..0cedd33e2 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -12,7 +12,7 @@
echo elgg_view('page/elements/header_logo', $vars);
// drop-down login
- echo elgg_view('account/login-dropdown');
+ echo elgg_view('core/account/login_dropdown');
// insert site-wide navigation
echo elgg_view('navigation/site_nav');