diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-13 01:54:05 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-13 01:54:05 +0000 |
| commit | 36877912660290fd453d5f2374864844ce8cb37c (patch) | |
| tree | c43103e6ad1e3fde37a95b2d2de04e8e4fb1cf90 | |
| parent | dd08cd1133ea8c82acfb7624efcf83571568ee42 (diff) | |
| download | elgg-36877912660290fd453d5f2374864844ce8cb37c.tar.gz elgg-36877912660290fd453d5f2374864844ce8cb37c.tar.bz2 | |
merged [5959] from 1.7 branch into trunk for riverdashboard plugin
git-svn-id: http://code.elgg.org/elgg/trunk@6022 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/riverdashboard/start.php | 4 | ||||
| -rw-r--r-- | mod/riverdashboard/views/default/riverdashboard/menu.php | 6 | ||||
| -rw-r--r-- | mod/riverdashboard/views/default/riverdashboard/nav.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php index e30681f75..dfce15729 100644 --- a/mod/riverdashboard/start.php +++ b/mod/riverdashboard/start.php @@ -9,10 +9,10 @@ function riverdashboard_init() { global $CONFIG; // Register and optionally replace the dashboard register_page_handler('dashboard', 'riverdashboard_page_handler'); - add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "mod/riverdashboard/"); + add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "pg/activity/"); // Page handler - register_page_handler('riverdashboard', 'riverdashboard_page_handler'); + register_page_handler('activity', 'riverdashboard_page_handler'); elgg_extend_view('css', 'riverdashboard/css'); // add an activity stream ECML keyword diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php index f8e1386ee..5ab4821a8 100644 --- a/mod/riverdashboard/views/default/riverdashboard/menu.php +++ b/mod/riverdashboard/views/default/riverdashboard/menu.php @@ -18,9 +18,9 @@ switch($vars['orient']) { <?php if(isloggedin()){ ?> - <li <?php echo $allselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/"><?php echo elgg_echo('all'); ?></a></li> - <li <?php echo $friendsselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/?display=friends"><?php echo elgg_echo('friends'); ?></a></li> - <li <?php echo $mineselect; ?> ><a href="<?php echo $vars['url']; ?>mod/riverdashboard/?display=mine"><?php echo elgg_echo('mine'); ?></a></li> + <li <?php echo $allselect; ?> ><a href="<?php echo $vars['url']; ?>pg/activity/"><?php echo elgg_echo('all'); ?></a></li> + <li <?php echo $friendsselect; ?> ><a href="<?php echo $vars['url']; ?>pg/activity/?display=friends"><?php echo elgg_echo('friends'); ?></a></li> + <li <?php echo $mineselect; ?> ><a href="<?php echo $vars['url']; ?>pg/activity/?display=mine"><?php echo elgg_echo('mine'); ?></a></li> <?php } ?> diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php index 8a328c6cf..8d8d602a2 100644 --- a/mod/riverdashboard/views/default/riverdashboard/nav.php +++ b/mod/riverdashboard/views/default/riverdashboard/nav.php @@ -44,7 +44,7 @@ switch($vars['orient']) { } //set the drop down filter if ($content[0] && $content[1]) { - $location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}mod/riverdashboard/index.php?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo($label) . "</option>"; + $location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}pg/activity/?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo($label) . "</option>"; } //reset selected $selected = ''; |