Updated activity stream on users Profile to include riverdashboard js. Added extra...

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

diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php
index a9b8cce8cbba9ae4d5ef961052a3a22e56b4f1a7..588ed89d16694e0209dde02ba92df4606d4d2cfe 100755 (executable)
--- 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 8c2112ca13681c5af98a70fa704cee03ca90229c..e782bb343b2e0552e01f02fff844c7be48327537 100644 (file)
--- 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;
 }