aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 04:05:00 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 04:05:00 +0000
commit5831aeef5e747f7d4e14d9d255a401adf395e5e6 (patch)
tree758074988dd6cf50a4d5f27b34cfc0c4775f62de /mod
parent62b5f00225fdfaab4eb0075cac646592a90bbecf (diff)
downloadelgg-5831aeef5e747f7d4e14d9d255a401adf395e5e6.tar.gz
elgg-5831aeef5e747f7d4e14d9d255a401adf395e5e6.tar.bz2
Merged walledgarden changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5273 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/walledgarden/index.php43
-rw-r--r--mod/walledgarden/views/default/account/forms/login.php30
-rw-r--r--mod/walledgarden/views/default/canvas/layouts/new_index.php30
-rw-r--r--mod/walledgarden/views/default/walledgarden/css.php48
4 files changed, 33 insertions, 118 deletions
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 @@
<?php
+/**
+ * Elgg Walled Garden
+ *
+ * @package WalledGarden
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @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 <info@elgg.com>
- * @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. <br />
+ 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 @@
-<?php
-
- /**
- * Elgg login form
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
- global $CONFIG;
-
- $form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
- $form_body .= "<br />";
- $form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
- $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";
- $form_body .= "<p class=\"loginbox\">";
- $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}pg/register.php\">" . elgg_echo('register') . "</a> | " : "";
-
- //<input name=\"username\" type=\"text\" class="general-textarea" /></label>
-?>
-
- <div id="login-box">
- <h2><?php echo elgg_echo('login'); ?></h2>
- <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/login")); ?>
-
- </div>
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 @@
-<?php
-
- /**
- * Elgg basic frontpage for the walled garden
- *
- * @package Elgg
- * @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.org/
- */
-
-?>
-
-<div id="custom_index">
-
- <!-- left column content -->
- <div id="index_left">
- <?php
- //this displays some content when the user is logged out
- if (!isloggedin()){
- //display the login form
- echo $vars['area1'];
- echo "<div class=\"clearfloat\"></div>";
- }
- ?>
- </div>
-
- <div class="clearfloat"></div>
-</div> \ 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;
-}
+<?php
+/**
+ * Elgg WalledGarden CSS
+ *
+ * @package WalledGarden
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+?> \ No newline at end of file