Added interface elements for inline conversation posting from activity stream

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

diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 9081dbe8dbf5936853592d72a0677ed3cb8bc1bb..9f88b8fb21088bb84f9d94ee817446df922181d7 100644 (file)
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -47,6 +47,7 @@ if (count($entity_guids) > 0) {
        $river_items .= elgg_echo('groups:no_activity');\r
 }\r
 \r
+$area1 .= "<a class='start_conversation link groups_activity action_button'>New conversation</a>";\r
 $area1 .= elgg_view_title(elgg_echo('groups:activity'));\r
 $area1 .= elgg_view("group_activity/extend");\r
 $area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";\r

diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 60b74541edd6b07516bb89c45c48bb9a63521169..17be5637abfb9573c657e4b8b90d2aa42b2a02cb 100644 (file)
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -57,8 +57,8 @@ if (isloggedin()) {
 set_context('riverdashboard');
 
 if (empty($callback)) {
-       $body .= elgg_view('riverdashboard/container', array('body' => $nav . $river . elgg_view('riverdashboard/js')));
-       page_draw($title_wording,elgg_view_layout('one_column_with_sidebar',$extend . $title . $body, $sidebar));
+       $body .= elgg_view('riverdashboard/container', array('body' => $nav . $extend . $river . elgg_view('riverdashboard/js')));
+       page_draw($title_wording,elgg_view_layout('one_column_with_sidebar', $title . $body, $sidebar));
 } else {
        header("Content-type: text/html; charset=UTF-8");
        echo $nav . $river . elgg_view('riverdashboard/js');

diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 8d8d602a2e49374671c95c1bfe7a8924b10b1604..fe694c86a24c85e247655aee88ba197f54d15887 100644 (file)
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -54,5 +54,5 @@ 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>