diff options
| -rw-r--r-- | _graphics/walled_garden/one_column_bottom.png | bin | 0 -> 522 bytes | |||
| -rw-r--r-- | _graphics/walled_garden/one_column_middle.png | bin | 0 -> 226 bytes | |||
| -rw-r--r-- | _graphics/walled_garden/one_column_top.png | bin | 0 -> 517 bytes | |||
| -rw-r--r-- | _graphics/walled_garden/two_column_bottom.png | bin | 0 -> 532 bytes | |||
| -rw-r--r-- | _graphics/walled_garden/two_column_middle.png | bin | 0 -> 231 bytes | |||
| -rw-r--r-- | _graphics/walled_garden/two_column_top.png | bin | 0 -> 547 bytes | |||
| -rw-r--r-- | _graphics/walled_garden_background_bottom.gif | bin | 2940 -> 0 bytes | |||
| -rw-r--r-- | _graphics/walled_garden_background_extend.gif | bin | 199 -> 0 bytes | |||
| -rw-r--r-- | _graphics/walled_garden_background_top.gif | bin | 4257 -> 0 bytes | |||
| -rw-r--r-- | _graphics/walled_garden_backgroundfull_bottom.gif | bin | 2811 -> 0 bytes | |||
| -rw-r--r-- | _graphics/walled_garden_backgroundfull_top.gif | bin | 6786 -> 0 bytes | |||
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | views/default/core/walled_garden/body.php | 33 | ||||
| -rw-r--r-- | views/default/css/walled_garden.php | 74 | ||||
| -rw-r--r-- | views/default/page/walled_garden.php | 31 |
15 files changed, 65 insertions, 77 deletions
diff --git a/_graphics/walled_garden/one_column_bottom.png b/_graphics/walled_garden/one_column_bottom.png Binary files differnew file mode 100644 index 000000000..1dfd7f8ad --- /dev/null +++ b/_graphics/walled_garden/one_column_bottom.png diff --git a/_graphics/walled_garden/one_column_middle.png b/_graphics/walled_garden/one_column_middle.png Binary files differnew file mode 100644 index 000000000..f53abc123 --- /dev/null +++ b/_graphics/walled_garden/one_column_middle.png diff --git a/_graphics/walled_garden/one_column_top.png b/_graphics/walled_garden/one_column_top.png Binary files differnew file mode 100644 index 000000000..429a88b75 --- /dev/null +++ b/_graphics/walled_garden/one_column_top.png diff --git a/_graphics/walled_garden/two_column_bottom.png b/_graphics/walled_garden/two_column_bottom.png Binary files differnew file mode 100644 index 000000000..8aeceeeee --- /dev/null +++ b/_graphics/walled_garden/two_column_bottom.png diff --git a/_graphics/walled_garden/two_column_middle.png b/_graphics/walled_garden/two_column_middle.png Binary files differnew file mode 100644 index 000000000..9a93f19a9 --- /dev/null +++ b/_graphics/walled_garden/two_column_middle.png diff --git a/_graphics/walled_garden/two_column_top.png b/_graphics/walled_garden/two_column_top.png Binary files differnew file mode 100644 index 000000000..c28b3f630 --- /dev/null +++ b/_graphics/walled_garden/two_column_top.png diff --git a/_graphics/walled_garden_background_bottom.gif b/_graphics/walled_garden_background_bottom.gif Binary files differdeleted file mode 100644 index 7e25fbedc..000000000 --- a/_graphics/walled_garden_background_bottom.gif +++ /dev/null diff --git a/_graphics/walled_garden_background_extend.gif b/_graphics/walled_garden_background_extend.gif Binary files differdeleted file mode 100644 index 09f7318e3..000000000 --- a/_graphics/walled_garden_background_extend.gif +++ /dev/null diff --git a/_graphics/walled_garden_background_top.gif b/_graphics/walled_garden_background_top.gif Binary files differdeleted file mode 100644 index 20d551e2f..000000000 --- a/_graphics/walled_garden_background_top.gif +++ /dev/null diff --git a/_graphics/walled_garden_backgroundfull_bottom.gif b/_graphics/walled_garden_backgroundfull_bottom.gif Binary files differdeleted file mode 100644 index c05447cc8..000000000 --- a/_graphics/walled_garden_backgroundfull_bottom.gif +++ /dev/null diff --git a/_graphics/walled_garden_backgroundfull_top.gif b/_graphics/walled_garden_backgroundfull_top.gif Binary files differdeleted file mode 100644 index 99b4832ec..000000000 --- a/_graphics/walled_garden_backgroundfull_top.gif +++ /dev/null diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 66268cc96..95e71e227 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1991,9 +1991,9 @@ function elgg_walled_garden_index() { elgg_register_css('elgg.walled_garden', '/css/walled_garden.css'); elgg_load_css('elgg.walled_garden'); - $login = elgg_view('core/account/login_walled_garden'); + $body = elgg_view('core/walled_garden/body'); - echo elgg_view_page('', $login, 'walled_garden'); + echo elgg_view_page('', $body, 'walled_garden'); // return true to prevent other plugins from adding a front page return true; diff --git a/views/default/core/walled_garden/body.php b/views/default/core/walled_garden/body.php new file mode 100644 index 000000000..bee1c9805 --- /dev/null +++ b/views/default/core/walled_garden/body.php @@ -0,0 +1,33 @@ +<?php +/** + * Walled garden body + */ + +$title = elgg_get_site_entity()->name; +$welcome = elgg_echo('walled_garden:welcome'); +$welcome .= ': <br/>' . $title; + +$menu = elgg_view_menu('walled_garden', array( + 'sort_by' => 'priority', + 'class' => 'elgg-menu-general elgg-menu-hz', +)); + +$login_box = elgg_view('core/account/login_box', array('module' => 'walledgarden-login')); + +$content = <<<HTML +<div class="elgg-col elgg-col-1of2"> + <div class="elgg-inner"> + <h1 class="elgg-heading-walledgarden"> + $welcome + </h1> + $menu + </div> +</div> +<div class="elgg-col elgg-col-1of2"> + <div class="elgg-inner"> + $login_box + </div> +</div> +HTML; + +echo elgg_view_module('walledgarden', '', $content, $vars); diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php index 47850425b..9a6b37e98 100644 --- a/views/default/css/walled_garden.php +++ b/views/default/css/walled_garden.php @@ -6,36 +6,40 @@ $url = elgg_get_site_url(); ?> -#elgg-walledgarden { +.elgg-module-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 > .elgg-head { + background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top; + height: 17px; } - -#elgg-walledgarden-intro { - width: 230px; - float: left; - margin: 35px 15px 15px 35px; +.elgg-module-walledgarden > .elgg-body { + background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top; + padding: 0 10px; } - -#elgg-walledgarden-intro ul { - float: left; +.elgg-module-walledgarden > .elgg-foot { + background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top; + height: 17px; +} +.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-login { - width: 230px; - float: left; - margin: 30px 15px 45px 19px; +.elgg-module-walledgarden-login { + margin: 0; +} +.elgg-module-walledgarden-login h3 { + font-size: 1.5em; + line-height: 1.1em; + padding-bottom: 5px; } .elgg-heading-walledgarden { @@ -43,27 +47,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; -} diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 625c63ddb..f13db709a 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -7,12 +7,9 @@ // Set the content type header("Content-type: text/html; charset=UTF-8"); - -$site = elgg_get_site_entity(); -$title = $site->name; - ?> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <?php echo elgg_view('page/elements/head', $vars); ?> </head> @@ -21,29 +18,7 @@ $title = $site->name; <div class="elgg-page-messages"> <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?> </div> - <div class="elgg-page-body"> - <div id="elgg-walledgarden"> - <div id="elgg-walledgarden-intro"> - <h1 class="elgg-heading-walledgarden"> - <?php - echo elgg_echo('walled_garden:welcome'); - echo ': <br/>'; - echo $title; - ?> - </h1> - <?php - echo elgg_view_menu('walled_garden', array( - 'sort_by' => 'priority', - 'class' => 'elgg-menu-general elgg-menu-hz', - )); - ?> - </div> - <div id="elgg-walledgarden-login"> - <?php echo $vars['body']; ?> - </div> - </div> - <div id="elgg-walledgarden-bottom"></div> - </div> + <?php echo $vars['body']; ?> </div> <?php echo elgg_view('page/elements/foot'); ?> </body> |
