Updates to: site nav (changed unused id's to title tags), latest wire post in admin...

git-svn-id: http://code.elgg.org/elgg/trunk@5430 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 bd7d7b5e5861bda0b0fbf81ccad7e21dbc39929c..c767d5ad7566c2501ef0cb5988d430e7d297741c 100755 (executable)
--- a/mod/profile/views/default/profile/profile_contents/activity.php
+++ b/mod/profile/views/default/profile/profile_contents/activity.php
@@ -10,6 +10,10 @@
                // users last status msg, if they posted one
                echo elgg_view("profile/status", array("entity" => $vars['entity']));
        }
+       if(is_plugin_enabled('conversations')) {
+               // users last status msg, if they posted one
+               echo elgg_view("profile/status", array("entity" => $vars['entity']));
+       }
        if(is_plugin_enabled('riverdashboard')) {
                // users last 10 activites
                echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);

diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index eabe48e5398b9f412d2f767c700263a295477fd7..d2d826ea612b13232dcf06b18d1ad7e884acdf59 100644 (file)
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -104,7 +104,7 @@ else
                        //display the comment link
                if($vars['item']->type != 'user'){
                        //for now don't display the comment link on bookmarks and wire messages
-                       if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '')
+                       if($vars['item']->subtype != 'thewire' && $vars['item']->subtype != 'conversations' && $vars['item']->subtype != 'bookmarks' && $vars['item']->subtype != '')
                                echo "<a class='comment_link' href=\"{$object_url}\">Comment</a>";
                        }
                ?>

diff --git a/views/default/css.php b/views/default/css.php
index f1bbb99f4a1b65fe99534291b9f6b8e482d81b73..42b594b5180dbc2953bd142cab55825073051ef9 100644 (file)
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1486,9 +1486,9 @@ a.action_button:focus {
 .admin_settings.users_online .profile_status {
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
-       background:#bbdaf7;
        line-height:1.2em;
-       padding:2px 4px;
+       /* background:#bbdaf7; */
+       /* padding:2px 4px; */
 }
 .admin_settings.users_online .profile_status span {
        font-size:90%;

diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index 2f167a540a12fb8e8bf8cd2229ad91b51eb24994..8431188d89d645b2ff50e49817ea76ee4619342e 100644 (file)
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -11,56 +11,56 @@ if(is_plugin_enabled('riverdashboard')){
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" title='Activity'><span>Activity</span></a></li>";
 }
 if(is_plugin_enabled('thewire') && isloggedin()){
        if(get_context() == 'thewire')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/everyone.php\" id='thewire'><span>" . elgg_echo('thewire:title') . "</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/everyone.php\" title='The Wire'><span>" . elgg_echo('thewire:title') . "</span></a></li>";
 }
 if(is_plugin_enabled('conversations') && isloggedin()){
        if(get_context() == 'conversations')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/conversations/all.php\" id='conversations'><span>" . elgg_echo('conversations') . "</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/conversations/all.php\" title='Conversations'><span>" . elgg_echo('conversations') . "</span></a></li>";
 }
 if(is_plugin_enabled('blog')){
        if(get_context() == 'blog')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" title='Blogs'><span>Blogs</span></a></li>";
 }
 if(is_plugin_enabled('pages')){
        if(get_context() == 'pages')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" title='Pages'><span>Pages</span></a></li>";
 }
 if(is_plugin_enabled('file')){
        if(get_context() == 'file')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}pg/file/world/world/\" id='files'><span>Files</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}pg/file/world/world/\" title='Files'><span>Files</span></a></li>";
 }
 if(is_plugin_enabled('bookmarks')){
        if(get_context() == 'bookmarks')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" title='Bookmarks'><span>Bookmarks</span></a></li>";
 }
 if(is_plugin_enabled('groups')){
        if(get_context() == 'groups')
                $selected = 'class="selected"';
        else
                $selected = "";
-       echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/world/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
+       echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/world/\" title='Groups'><span>". elgg_echo('groups') . "</span></a></li>";
 }
 echo "</ul>";
 echo "</div>";