diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-02-11 08:47:35 -0500 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-02-11 08:47:35 -0500 |
| commit | 690932e832edcb8ca0178cd576737cd38a95d5b6 (patch) | |
| tree | b51e572737dad8b58f77f247c76065e909761fa8 | |
| parent | 77c2d19bc36450ce6f5bc6ddf6b2ddea510bd19b (diff) | |
| download | elgg-690932e832edcb8ca0178cd576737cd38a95d5b6.tar.gz elgg-690932e832edcb8ca0178cd576737cd38a95d5b6.tar.bz2 | |
external pages plugin uses walled garden layout when appropriate
| -rw-r--r-- | mod/externalpages/start.php | 11 | ||||
| -rw-r--r-- | mod/externalpages/views/default/expages/wrapper.php | 16 | ||||
| -rw-r--r-- | views/default/css/walled_garden.php | 13 |
3 files changed, 35 insertions, 5 deletions
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php index 152a8b4d9..74da7f828 100644 --- a/mod/externalpages/start.php +++ b/mod/externalpages/start.php @@ -77,9 +77,16 @@ function expages_page_handler($page, $handler) { } else { $content .= elgg_echo("expages:notset"); } + $content = elgg_view('expages/wrapper', array('content' => $content)); - $body = elgg_view_layout("one_sidebar", array('content' => $content)); - echo elgg_view_page($title, $body); + if (elgg_is_logged_in() || !elgg_get_config('walled_garden')) { + $body = elgg_view_layout('one_sidebar', array('content' => $content)); + echo elgg_view_page($title, $body); + } else { + elgg_load_css('elgg.walled_garden'); + $body = elgg_view_layout('walled_garden', array('content' => $content)); + echo elgg_view_page($title, $body, 'walled_garden'); + } return true; } diff --git a/mod/externalpages/views/default/expages/wrapper.php b/mod/externalpages/views/default/expages/wrapper.php new file mode 100644 index 000000000..8eb0b2f84 --- /dev/null +++ b/mod/externalpages/views/default/expages/wrapper.php @@ -0,0 +1,16 @@ +<?php +/** + * Wrapper for site pages content area + * + * @uses $vars['content'] + */ + +echo $vars['content']; + +echo '<div class="mtm">'; +echo elgg_view('output/url', array( + 'text' => 'Back', + 'href' => $_SERVER['HTTP_REFERER'], + 'class' => 'float-alt' +)); +echo '</div>'; diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php index ea2543587..f6f7f97dc 100644 --- a/views/default/css/walled_garden.php +++ b/views/default/css/walled_garden.php @@ -54,8 +54,8 @@ $url = elgg_get_site_url(); padding: 0 8px; } -.elgg-walledgarden-single > .elgg-body > .elgg-inner { - padding: 0 8px; +.elgg-walledgarden-single > .elgg-body { + padding: 0 18px; } .elgg-module-walledgarden-login { @@ -68,7 +68,14 @@ $url = elgg_get_site_url(); } .elgg-heading-walledgarden { - color: #666666; margin-top: 60px; line-height: 1.1em; } + +h1, h2, h3, h4, h5, h6 { + color: #666; +} + +a { + color: #999; +}
\ No newline at end of file |