aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-19 12:01:01 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-19 12:01:01 +0000
commit1dc760ced86c0ee379824cf4e2d92638dd7d4b2a (patch)
tree7d50e732aef9293380bbe1a932e11b07386f1ff6 /mod
parent01c043d3a852ed59ee8cea06128a6f02dafacdf1 (diff)
downloadelgg-1dc760ced86c0ee379824cf4e2d92638dd7d4b2a.tar.gz
elgg-1dc760ced86c0ee379824cf4e2d92638dd7d4b2a.tar.bz2
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
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/activity.php1
-rw-r--r--mod/riverdashboard/index.php4
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/nav.php2
3 files changed, 4 insertions, 3 deletions
diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 9081dbe8d..9f88b8fb2 100644
--- 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');
}
+$area1 .= "<a class='start_conversation link groups_activity action_button'>New conversation</a>";
$area1 .= elgg_view_title(elgg_echo('groups:activity'));
$area1 .= elgg_view("group_activity/extend");
$area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 60b74541e..17be5637a 100644
--- 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 8d8d602a2..fe694c86a 100644
--- 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>