From 5831aeef5e747f7d4e14d9d255a401adf395e5e6 Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 4 Mar 2010 04:05:00 +0000 Subject: Merged walledgarden changes. git-svn-id: http://code.elgg.org/elgg/trunk@5273 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/walledgarden/index.php | 43 +++++++++---------- .../views/default/account/forms/login.php | 30 -------------- .../views/default/canvas/layouts/new_index.php | 30 -------------- .../views/default/walledgarden/css.php | 48 +++++----------------- 4 files changed, 33 insertions(+), 118 deletions(-) delete mode 100644 mod/walledgarden/views/default/account/forms/login.php delete mode 100644 mod/walledgarden/views/default/canvas/layouts/new_index.php (limited to 'mod/walledgarden') diff --git a/mod/walledgarden/index.php b/mod/walledgarden/index.php index ca822d78a..251725496 100644 --- a/mod/walledgarden/index.php +++ b/mod/walledgarden/index.php @@ -1,24 +1,25 @@ + * @copyright Curverider Ltd 2008 + * @link http://elgg.com/ + */ - /** - * Elgg custom index - * - * @package ElggCustomIndex - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ - */ - - // Get the Elgg engine - require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - - //grab the login form - $login = elgg_view("account/forms/login"); +// Get the Elgg engine +require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - //display the contents in our new canvas layout - $body = elgg_view_layout('new_index',$login); - - page_draw($title, $body); - -?> \ No newline at end of file +//grab the login form +$login = elgg_view("account/forms/login"); + +//temp message +$area1 = "This site is running in walled garden mode.
+ Therefore you will need to be invited & logged in to see anything."; + +//display the contents in our new canvas layout +$body = elgg_view_layout('one_column_with_sidebar', $login, $area1); + +page_draw($title, $body); \ No newline at end of file diff --git a/mod/walledgarden/views/default/account/forms/login.php b/mod/walledgarden/views/default/account/forms/login.php deleted file mode 100644 index 86ff473e5..000000000 --- a/mod/walledgarden/views/default/account/forms/login.php +++ /dev/null @@ -1,30 +0,0 @@ -"; - $form_body .= "
"; - $form_body .= "
"; - $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "

"; - $form_body .= "

"; - $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "" . elgg_echo('register') . " | " : ""; - - // -?> - -

-

- $form_body, 'action' => "{$vars['url']}action/login")); ?> - -
diff --git a/mod/walledgarden/views/default/canvas/layouts/new_index.php b/mod/walledgarden/views/default/canvas/layouts/new_index.php deleted file mode 100644 index d29b2c6e6..000000000 --- a/mod/walledgarden/views/default/canvas/layouts/new_index.php +++ /dev/null @@ -1,30 +0,0 @@ - - -
- - -
-
"; - } - ?> -
- -
- \ No newline at end of file diff --git a/mod/walledgarden/views/default/walledgarden/css.php b/mod/walledgarden/views/default/walledgarden/css.php index cef2dde8d..509e5f9de 100644 --- a/mod/walledgarden/views/default/walledgarden/css.php +++ b/mod/walledgarden/views/default/walledgarden/css.php @@ -1,37 +1,11 @@ -#custom_index { - margin:10px; -} -#index_left { - width:442px; - float:left; - margin:0 0 30px 0; - padding:0 0 20px 0; -} -#index_right { - width:442px; - float:right; - margin:0 0 30px 0; - padding:0 20px 20px 0; -} -#index_welcome { - padding:5px 20px; - border:1px solid silver; - background: white; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; -} -#index_welcome #login-box { - margin:10px 0 10px 0; - padding:0; -} -#index_box h2 { - color:#0054A7; - font-size:1.35em; - line-height:1.2em; - margin:0 0 0 8px; - padding:5px; -} -#index_box .index_members { - float:left; - margin:0pt 5px 5px 0pt; -} + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ +?> \ No newline at end of file -- cgit v1.2.3