Moved start conversation button

git-svn-id: http://code.elgg.org/elgg/trunk@6740 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 17be5637abfb9573c657e4b8b90d2aa42b2a02cb..c4a567a8dbd44ff2095ca49949428bcd7c97accb 100644 (file)
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -39,7 +39,8 @@ switch($orient) {
                break;
 }
 
-$title = elgg_view_title($title_wording);
+$title = "<a class='start_conversation link action_button'>New conversation</a>";
+$title .= elgg_view_title($title_wording);
 $extend = elgg_view("activity/extend");
 $river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, TRUE, FALSE);
 

diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 7465e679e90b5bdad90cd55e1312fbeaefb02610..6ffbcef0a83adb4f709c8cdfddbbf1f48018241a 100644 (file)
--- 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}pg/activity/?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo('Show') . " " . 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 = '';
@@ -54,5 +54,4 @@ switch($vars['orient']) {
        ?>
        <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
 </div>
-<a class="start_conversation link action_button">New conversation</a>
 <div id="riverdashboard_updates" class="clearfloat"></div>