Merge pull request #90 from cash/walled_garden

Fixes #3756 creates a more flexible walled garden login area

2 files changed, 59 insertions, 45 deletions

diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index 754ed3664..db0125b4b 100644
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -53,4 +53,13 @@
 
 .elgg-avatar {
 	display: inline;
+}
+
+.elgg-body-walledgarden .elgg-col-1of2 {
+	width: 255px;
+}
+
+.elgg-module-walledgarden > .elgg-head,
+.elgg-module-walledgarden > .elgg-foot {
+	width: 530px;
 }
\ No newline at end of file
diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index 47850425b..ea2543587 100644
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -6,36 +6,65 @@
 $url = elgg_get_site_url();
 
 ?>
-#elgg-walledgarden {
+.elgg-body-walledgarden {
 	margin: 100px auto 0 auto;
-	width: 563px;
-	min-height: 230px;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
-	padding: 0;
 	position: relative;
+	width: 530px;
 }
-
-#elgg-walledgarden-bottom {
-	margin:0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
-	width:563px;
-	height:54px;
+.elgg-module-walledgarden {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.elgg-module-walledgarden > .elgg-head {
+	height: 17px;
+}
+.elgg-module-walledgarden > .elgg-body {
+	padding: 0 10px;
+}
+.elgg-module-walledgarden > .elgg-foot {
+	height: 17px;
+}
+.elgg-walledgarden-double > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-double > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-double > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-single > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_bottom.png) no-repeat left top;
 }
 
-#elgg-walledgarden-intro {
-	width: 230px;
-	float: left;
-	margin: 35px 15px 15px 35px;
+.elgg-col > .elgg-inner {
+	margin: 0 0 0 5px;
+}
+.elgg-col:first-child > .elgg-inner {
+	margin: 0 5px 0 0;
+}
+.elgg-col > .elgg-inner {
+	padding: 0 8px;
 }
 
-#elgg-walledgarden-intro ul {
-	float: left;
+.elgg-walledgarden-single > .elgg-body > .elgg-inner {
+	padding: 0 8px;
 }
 
-#elgg-walledgarden-login {
-	width: 230px;
-	float: left;
-	margin: 30px 15px 45px 19px;
+.elgg-module-walledgarden-login {
+	margin: 0;
+}
+.elgg-body-walledgarden h3 {
+	font-size: 1.5em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
 }
 
 .elgg-heading-walledgarden {
@@ -43,27 +72,3 @@ $url = elgg_get_site_url();
 	margin-top: 60px;
 	line-height: 1.1em;
 }
-
-#elgg-walledgarden-lostpassword,
-#elgg-walledgarden-registration {
-	position: absolute;
-	right: 0;
-	top: 0;
-	width: 563px;
-	background-color: white;
-	padding: 0;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
-	height: auto;
-}
-
-.elgg-hiddenform-body {
-	padding: 30px 40px 0 40px;
-	height: auto;
-}
-.elgg-hiddenform-bottom {
-	margin: 0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
-	width: 563px;
-	height: 54px;
-	position: relative;
-}