]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e93913)
Refs #2693 pulled walled garden css out as separate view
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 6 Mar 2011 12:30:25 +0000 (12:30 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 6 Mar 2011 12:30:25 +0000 (12:30 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8613 36083f99-b078-4883-b0ff-0f9b5a30f544

engine/lib/elgglib.php patch | blob | history
languages/en.php patch | blob | history
views/default/css/walled_garden.php [new file with mode: 0644] patch | blob
views/default/page/walled_garden.php patch | blob | history

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 3511be0ca61b24f29c46c5d869a7b4530f419dac..69c56275dbbc1f355ac33cfbb6c42225de4b1a84 100644 (file)
--- 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 0044a7b0f19c2bb4ee1877585d144e35f1d04dd3..fa4eccf01b11b74b49152c7faa3b66b197028278 100644 (file)
--- 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 (file)
index 0000000..7ba6141
--- /dev/null
+++ b/views/default/css/walled_garden.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Walled garden CSS
+ */
+?>
+.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 74b4f30291e764a0f8ef02efebcebb8f89e09d56..0dcc8a9d76158fedf9431998c9cfc9b966e6ff62 100644 (file)
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -1,59 +1,20 @@
 <?php
 /**
- * 
+ * Walled garden page shell
+ *
+ * Used for the walled garden index page
  */
 
 // Set the content type
 header("Content-type: text/html; charset=UTF-8");
 
-// Set title
-$site_title = elgg_get_config('sitename');
-if (empty($vars['title'])) {
-       $title = $site_title;
-} else if (empty($site_title)) {
-       $title = $vars['title'];
-} else {
-       $title = $site_title . ": " . $vars['title'];
-}
+$site = elgg_get_site_entity();
+$title = $site->name;
 
-// @todo - move the css below into it's own style-sheet 
-// that is called when running as a private network
 ?>
 <html>
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
-       <style type="text/css">
-       /* ***************************************
-               WalledGarden
-       *************************************** */
-       .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;
-       }
-
-               
-       </style>
 </head>
 <body>
 <div class="elgg-page elgg-page-walledgarden">
@@ -64,7 +25,13 @@ if (empty($vars['title'])) {
                <div class="elgg-inner">
                        <div class="elgg-grid elgg-grid-walledgarden">
                                <div class="elgg-col elgg-col-1of2">
-                                       <h1 class="elgg-heading-walledgarden">Welcome to:<br /><?php echo $title; ?></h1>
+                                       <h1 class="elgg-heading-walledgarden">
+                                               <?php
+                                                       echo elgg_echo('walled_garden:welcome');
+                                                       echo ': <br/>';
+                                                       echo $title;
+                                               ?>
+                                       </h1>
                                </div>
                                <div class="elgg-col elgg-col-1of2">
                                        <?php echo $vars['body']; ?>
Social Networking Engine