From d3d5ef824e3dafaf7165ba88712c74a4140c171c Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 15 Sep 2011 21:08:17 -0400 Subject: Fixes #3400, #3820 added additional icons to Elgg's sprite --- _graphics/elgg_sprites.png | Bin 16680 -> 19302 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '_graphics') diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png index 703ff0c81..02b452d94 100644 Binary files a/_graphics/elgg_sprites.png and b/_graphics/elgg_sprites.png differ -- cgit v1.2.3 From 29e9a542b6f9c9e7d4bc50c6341f5874126fc7d5 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 30 Oct 2011 18:15:23 -0400 Subject: basic walled garden implementation for logging in --- _graphics/walled_garden/one_column_bottom.png | Bin 0 -> 522 bytes _graphics/walled_garden/one_column_middle.png | Bin 0 -> 226 bytes _graphics/walled_garden/one_column_top.png | Bin 0 -> 517 bytes _graphics/walled_garden/two_column_bottom.png | Bin 0 -> 532 bytes _graphics/walled_garden/two_column_middle.png | Bin 0 -> 231 bytes _graphics/walled_garden/two_column_top.png | Bin 0 -> 547 bytes _graphics/walled_garden_background_bottom.gif | Bin 2940 -> 0 bytes _graphics/walled_garden_background_extend.gif | Bin 199 -> 0 bytes _graphics/walled_garden_background_top.gif | Bin 4257 -> 0 bytes _graphics/walled_garden_backgroundfull_bottom.gif | Bin 2811 -> 0 bytes _graphics/walled_garden_backgroundfull_top.gif | Bin 6786 -> 0 bytes engine/lib/elgglib.php | 4 +- views/default/core/walled_garden/body.php | 33 ++++++++++ views/default/css/walled_garden.php | 74 ++++++++-------------- views/default/page/walled_garden.php | 31 +-------- 15 files changed, 65 insertions(+), 77 deletions(-) create mode 100644 _graphics/walled_garden/one_column_bottom.png create mode 100644 _graphics/walled_garden/one_column_middle.png create mode 100644 _graphics/walled_garden/one_column_top.png create mode 100644 _graphics/walled_garden/two_column_bottom.png create mode 100644 _graphics/walled_garden/two_column_middle.png create mode 100644 _graphics/walled_garden/two_column_top.png delete mode 100644 _graphics/walled_garden_background_bottom.gif delete mode 100644 _graphics/walled_garden_background_extend.gif delete mode 100644 _graphics/walled_garden_background_top.gif delete mode 100644 _graphics/walled_garden_backgroundfull_bottom.gif delete mode 100644 _graphics/walled_garden_backgroundfull_top.gif create mode 100644 views/default/core/walled_garden/body.php (limited to '_graphics') diff --git a/_graphics/walled_garden/one_column_bottom.png b/_graphics/walled_garden/one_column_bottom.png new file mode 100644 index 000000000..1dfd7f8ad Binary files /dev/null and b/_graphics/walled_garden/one_column_bottom.png differ diff --git a/_graphics/walled_garden/one_column_middle.png b/_graphics/walled_garden/one_column_middle.png new file mode 100644 index 000000000..f53abc123 Binary files /dev/null and b/_graphics/walled_garden/one_column_middle.png differ diff --git a/_graphics/walled_garden/one_column_top.png b/_graphics/walled_garden/one_column_top.png new file mode 100644 index 000000000..429a88b75 Binary files /dev/null and b/_graphics/walled_garden/one_column_top.png differ diff --git a/_graphics/walled_garden/two_column_bottom.png b/_graphics/walled_garden/two_column_bottom.png new file mode 100644 index 000000000..8aeceeeee Binary files /dev/null and b/_graphics/walled_garden/two_column_bottom.png differ diff --git a/_graphics/walled_garden/two_column_middle.png b/_graphics/walled_garden/two_column_middle.png new file mode 100644 index 000000000..9a93f19a9 Binary files /dev/null and b/_graphics/walled_garden/two_column_middle.png differ diff --git a/_graphics/walled_garden/two_column_top.png b/_graphics/walled_garden/two_column_top.png new file mode 100644 index 000000000..c28b3f630 Binary files /dev/null and b/_graphics/walled_garden/two_column_top.png differ diff --git a/_graphics/walled_garden_background_bottom.gif b/_graphics/walled_garden_background_bottom.gif deleted file mode 100644 index 7e25fbedc..000000000 Binary files a/_graphics/walled_garden_background_bottom.gif and /dev/null differ diff --git a/_graphics/walled_garden_background_extend.gif b/_graphics/walled_garden_background_extend.gif deleted file mode 100644 index 09f7318e3..000000000 Binary files a/_graphics/walled_garden_background_extend.gif and /dev/null differ diff --git a/_graphics/walled_garden_background_top.gif b/_graphics/walled_garden_background_top.gif deleted file mode 100644 index 20d551e2f..000000000 Binary files a/_graphics/walled_garden_background_top.gif and /dev/null differ diff --git a/_graphics/walled_garden_backgroundfull_bottom.gif b/_graphics/walled_garden_backgroundfull_bottom.gif deleted file mode 100644 index c05447cc8..000000000 Binary files a/_graphics/walled_garden_backgroundfull_bottom.gif and /dev/null differ diff --git a/_graphics/walled_garden_backgroundfull_top.gif b/_graphics/walled_garden_backgroundfull_top.gif deleted file mode 100644 index 99b4832ec..000000000 Binary files a/_graphics/walled_garden_backgroundfull_top.gif and /dev/null differ 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 @@ +name; +$welcome = elgg_echo('walled_garden:welcome'); +$welcome .= ':
' . $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 = << +
+

+ $welcome +

+ $menu +
+ +
+
+ $login_box +
+
+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(_graphics/walled_garden_background_top.gif) no-repeat left top; - padding: 0; position: relative; + width: 530px; } - -#elgg-walledgarden-bottom { - margin:0 auto; - background: url(_graphics/walled_garden_background_bottom.gif) no-repeat left bottom; - width:563px; - height:54px; +.elgg-module-walledgarden > .elgg-head { + background: 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(_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(_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(_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(_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; - ?> - + + @@ -21,29 +18,7 @@ $title = $site->name;
$vars['sysmessages'])); ?>
-
-
-
-

- '; - echo $title; - ?> -

- 'priority', - 'class' => 'elgg-menu-general elgg-menu-hz', - )); - ?> -
-
- -
-
-
-
+ -- cgit v1.2.3