diff options
Diffstat (limited to 'mod/externalpages')
| -rw-r--r-- | mod/externalpages/manifest.xml | 2 | ||||
| -rw-r--r-- | mod/externalpages/start.php | 9 | ||||
| -rw-r--r-- | mod/externalpages/views/default/admin/appearance/expages.php | 2 | ||||
| -rw-r--r-- | mod/externalpages/views/default/expages/menu.php | 31 |
4 files changed, 10 insertions, 34 deletions
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml index 389ad6960..f2aef09f3 100644 --- a/mod/externalpages/manifest.xml +++ b/mod/externalpages/manifest.xml @@ -7,7 +7,7 @@ <description>Create simple web pages for about, contact, privacy, and terms.</description> <website>http://www.elgg.org/</website> <copyright>See COPYRIGHT.txt</copyright> - <license>GNU Public License version 2</license> + <license>GNU General Public License version 2</license> <requires> <type>elgg_release</type> <version>1.8</version> diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php index 3169503be..152a8b4d9 100644 --- a/mod/externalpages/start.php +++ b/mod/externalpages/start.php @@ -43,8 +43,11 @@ function expages_setup_footer_menu() { $pages = array('about', 'terms', 'privacy'); foreach ($pages as $page) { $url = "$page"; - $item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url); - elgg_register_menu_item('walled_garden', $item); + $wg_item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url); + elgg_register_menu_item('walled_garden', $wg_item); + + $footer_item = clone $wg_item; + elgg_register_menu_item('footer', $footer_item); } } @@ -53,6 +56,7 @@ function expages_setup_footer_menu() { * * @param array $page URL segements * @param string $handler Handler identifier + * @return bool */ function expages_page_handler($page, $handler) { if ($handler == 'expages') { @@ -76,6 +80,7 @@ function expages_page_handler($page, $handler) { $body = elgg_view_layout("one_sidebar", array('content' => $content)); echo elgg_view_page($title, $body); + return true; } /** diff --git a/mod/externalpages/views/default/admin/appearance/expages.php b/mod/externalpages/views/default/admin/appearance/expages.php index b30765089..6a5a521a5 100644 --- a/mod/externalpages/views/default/admin/appearance/expages.php +++ b/mod/externalpages/views/default/admin/appearance/expages.php @@ -7,4 +7,4 @@ $type = get_input('type', 'about'); echo elgg_view('expages/menu', array('type' => $type)); -echo elgg_view_form('expages/edit', array(), array('type' => $type)); +echo elgg_view_form('expages/edit', array('class' => 'elgg-form-settings'), array('type' => $type)); diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php index 846db076f..6ed521629 100644 --- a/mod/externalpages/views/default/expages/menu.php +++ b/mod/externalpages/views/default/expages/menu.php @@ -20,33 +20,4 @@ foreach ($pages as $page) { ); } -echo elgg_view('navigation/tabs', array('tabs' => $tabs)); - -return true; - -/** - * Tab navigation - * - * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal - * @uses string $vars['class'] Additional class to add to ul - * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array( - * 'title' => string, // Title of link - * 'url' => string, // URL for the link - * 'class' => string // Class of the li element - * 'id' => string, // ID of the li element - * 'selected' => bool // if this li element is currently selected - * 'url_class' => string, // Class to pass to the link - * 'url_id' => string, // ID to pass to the link - * ) - */ - -?> - -<div id="elgg_horizontal_tabbed_nav"> -<ul> - <li <?php if($type == 'front') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>front"><?php echo elgg_echo('expages:frontpage'); ?></a></li> - <li <?php if($type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li> - <li <?php if($type == 'terms') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li> - <li <?php if($type == 'privacy') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>privacy"><?php echo elgg_echo('expages:privacy'); ?></a></li> -</ul> -</div>
\ No newline at end of file +echo elgg_view('navigation/tabs', array('tabs' => $tabs, 'class' => 'elgg-form-settings')); |