aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-28 20:10:31 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-28 20:10:31 +0000
commit830656d34e5d0cf097f310a8459f43b36bcdaaad (patch)
treea0068219b4c22b5107911594a59872aa2afbb045
parentf3b0f6c073ae143c01983968ec1a549b60face80 (diff)
downloadelgg-830656d34e5d0cf097f310a8459f43b36bcdaaad.tar.gz
elgg-830656d34e5d0cf097f310a8459f43b36bcdaaad.tar.bz2
Updated activity stream on users Profile to include riverdashboard js. Added extra css rules for inline comments and likes on profile activity.
git-svn-id: http://code.elgg.org/elgg/trunk@5912 36083f99-b078-4883-b0ff-0f9b5a30f544
-rwxr-xr-xmod/profile/views/default/profile/profile_contents/activity.php6
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/css.php6
2 files changed, 10 insertions, 2 deletions
diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php
index a9b8cce8c..588ed89d1 100755
--- a/mod/profile/views/default/profile/profile_contents/activity.php
+++ b/mod/profile/views/default/profile/profile_contents/activity.php
@@ -17,10 +17,12 @@
}
if(is_plugin_enabled('riverdashboard')) {
//select the correct river
- if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic')
+ if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic') {
echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,true);
- else
+ } else {
echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
+ echo elgg_view('riverdashboard/js');
+ }
} else {
echo "Riverdashboard not loaded";
}
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index 8c2112ca1..e782bb343 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -97,6 +97,9 @@
width:560px;
padding:3px;
}
+#profile_content .river_comment_form.hidden .input_text { /* when activity is displayed on profile page */
+ width:535px;
+}
.river_comment_form.hidden .submit_button {
margin:0 0 0 10px;
float:right;
@@ -119,6 +122,9 @@
.river_item .elgg_likes_user .entity_listing_info {
width:635px;
}
+#profile_content .river_item .elgg_likes_user .entity_listing_info { /* when likes is displayed on profile page activity stream */
+ width:600px;
+}
.river_item .elgg_likes_user .entity_metadata {
margin-top:3px;
}