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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index cb0ee4e72c58176a7a9b003223221a67b0847b41..f9073cf6c88711391fd84a56098104833def1bfb 100644 (file)
--- 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 39c6cc6220f90cc10a6561a9495503faab10282d..033a4bdb6701f6eb692983cf766e86e8dc85a416 100644 (file)
--- 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 680374ac11f81e177d64756baf6b4e7028023fa6..33f51cb9bb0cd742e72002d29de5b253cf21465f 100644 (file)
--- 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 a99ec843646b03e45e6001eff9dcdf2eecff4c90..844187503cf1c144826fd0b61e2517ed78eb696e 100644 (file)
--- 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
similarity index 100%
rename from views/default/account/login_box.php
rename to views/default/core/account/login_box.php

diff --git a/views/default/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
similarity index 100%
rename from views/default/account/login_dropdown.php
rename to 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
similarity index 100%
rename from views/default/account/login_walled_garden.php
rename to 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 efef1e09f3623a67a7b67293354313d874d07015..0cedd33e276632318625f7a0e89e82bec5c2a418 100644 (file)
--- 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');