From d7878dd44304a55fe3b35a786b47abafc56d2ffe Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 6 Mar 2011 12:30:25 +0000 Subject: Refs #2693 pulled walled garden css out as separate view git-svn-id: http://code.elgg.org/elgg/trunk@8613 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 1 + languages/en.php | 3 ++ views/default/css/walled_garden.php | 30 +++++++++++++++++++ views/default/page/walled_garden.php | 57 ++++++++---------------------------- 4 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 views/default/css/walled_garden.php diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 3511be0ca..69c56275d 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1761,6 +1761,7 @@ function elgg_is_valid_options_for_batch_operation($options, $type) { * @return void */ function elgg_walled_garden_index() { + elgg_register_css('/pg/css/walled_garden.css'); $login = elgg_view('core/account/login_walled_garden'); echo elgg_view_page('', $login, 'walled_garden'); diff --git a/languages/en.php b/languages/en.php index 0044a7b0f..fa4eccf01 100644 --- a/languages/en.php +++ b/languages/en.php @@ -505,6 +505,9 @@ $english = array( 'user:password:text' => 'To request a new password, enter your username below and click the Request button.', 'user:persistent' => 'Remember me', + + 'walled_garden:welcome' => 'Welcome to', + /** * Administration */ diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php new file mode 100644 index 000000000..7ba6141d4 --- /dev/null +++ b/views/default/css/walled_garden.php @@ -0,0 +1,30 @@ + +.elgg-grid-walledgarden { + margin:100px auto 0 auto; + padding:0; + width:600px; + text-align: left; + word-wrap:break-word; + background: gray; +} + +.elgg-grid-walledgarden > .elgg-col { + background: white; +} + +.elgg-heading-walledgarden { + color:#666666; + margin-top:80px; + line-height: 1.1em; +} + +.walledgardenlogin h2 { + color:#666666; + border-bottom:1px solid #CCCCCC; + margin-bottom:5px; + padding-bottom:5px; +} \ No newline at end of file diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 74b4f3029..0dcc8a9d7 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -1,59 +1,20 @@ name; -// @todo - move the css below into it's own style-sheet -// that is called when running as a private network ?> -

@@ -64,7 +25,13 @@ if (empty($vars['title'])) {

Welcome to:

+ '; + echo $title; + ?> +

-- cgit v1.2.3