aboutsummaryrefslogtreecommitdiff
path: root/mod/profile
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 13:01:23 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 13:01:23 +0000
commit90cb880ec6b629376df97c89bc4a0b3e2db32c8e (patch)
treea1b70455ccde297d90a3b52986f28b0dfc5c8ec4 /mod/profile
parent7f879bd88d1dd5da6d87ee852891b9eccba50c6c (diff)
downloadelgg-90cb880ec6b629376df97c89bc4a0b3e2db32c8e.tar.gz
elgg-90cb880ec6b629376df97c89bc4a0b3e2db32c8e.tar.bz2
profile feeds moved from top tabs
git-svn-id: http://code.elgg.org/elgg/trunk@5641 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/profile')
-rw-r--r--mod/profile/views/default/profile/profile_contents/feeds.php20
-rwxr-xr-xmod/profile/views/default/profile/profile_navigation.php10
-rwxr-xr-xmod/profile/views/default/profile/profile_ownerblock.php18
3 files changed, 12 insertions, 36 deletions
diff --git a/mod/profile/views/default/profile/profile_contents/feeds.php b/mod/profile/views/default/profile/profile_contents/feeds.php
deleted file mode 100644
index fcc35608b..000000000
--- a/mod/profile/views/default/profile/profile_contents/feeds.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Elgg profile feeds page
- */
-
-//$twitter_username = $vars['entity']->twitter;
-$page_owner = page_owner();
-$feeds = elgg_get_entities(array('types' => 'object', 'subtypes' => 'aggregator_feed_url', 'owner_guids' => $page_owner, 'count' => true));
-
-// if the twitter username is empty, then do not show
-?>
-<div id="profile_content">
-<?php
-if($feeds){
- echo elgg_view('aggregator/profile',array('feeds'=>$feeds));
-}else{
- echo "This user has not added any feeds.";
-}
-?>
-</div> \ No newline at end of file
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php
index a08cd847d..e4627d37a 100755
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/profile_navigation.php
@@ -30,10 +30,6 @@ switch($section){
case 'commentwall':
$commentwall = 'class="selected"';
break;
- case 'feeds':
- $feeds = 'class="selected"';
- break;
-
case 'activity':
default:
$activity = 'class="selected"';
@@ -48,12 +44,6 @@ switch($section){
<li <?php echo $friends; ?>><a href="<?php echo $url . 'friends'; ?>">Friends</a></li>
<li <?php echo $commentwall; ?>><a href="<?php echo $url . 'commentwall'; ?>">Comment Wall</a></li>
<?php
- //check to see if the aggregator plugin is enabled
- if(is_plugin_enabled('aggregator')){
- ?>
- <li <?php echo $feeds; ?>><a href="<?php echo $url . 'feeds'; ?>">Feeds</a></li>
- <?php
- }
//check to see if the twitter username is set
if($vars['entity']->twitter){
?>
diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php
index 4a6622fc8..eeffffe02 100755
--- a/mod/profile/views/default/profile/profile_ownerblock.php
+++ b/mod/profile/views/default/profile/profile_ownerblock.php
@@ -71,27 +71,32 @@ if(isadminloggedin()){
//check tools are enabled
if(is_plugin_enabled('file')){
- $file_link = "<li {$file_highlight}><a href=\"{$vars['url']}pg/file/{$username}\">Files</a></li>";
+ $file_link = "<li><a href=\"{$vars['url']}pg/file/{$username}\">Files</a></li>";
}else{
$file_link = "";
}
if(is_plugin_enabled('blog')){
- $blog_link = "<li {$blog_highlight}><a href=\"{$vars['url']}pg/blog/{$username}\">Blog</a></li>";
+ $blog_link = "<li><a href=\"{$vars['url']}pg/blog/{$username}\">Blog</a></li>";
}else{
$blog_link = "";
}
-if(is_plugin_enabled('video')){
- $video_link = "<li {$video_highlight}><a href=\"{$vars['url']}pg/video/{$username}\">Videos</a></li>";
+if(is_plugin_enabled('videolist')){
+ $video_link = "<li><a href=\"{$vars['url']}pg/videolist/{$username}\">Videos</a></li>";
}else{
$video_link = "";
}
+if(is_plugin_enabled('feeds')){
+ $feeds_link = "<li><a href=\"{$vars['url']}pg/feeds/{$username}\">Feeds</a></li>";
+}else{
+ $feeds_link = "";
+}
if(is_plugin_enabled('pages')){
- $pages_link = "<li {$pages_highlight}><a href=\"{$vars['url']}pg/pages/owned/{$username}\">Pages</a></li>";
+ $pages_link = "<li><a href=\"{$vars['url']}pg/pages/owned/{$username}\">Pages</a></li>";
}else{
$pages_link = "";
}
if(is_plugin_enabled('bookmarks')){
- $bookmark_link = "<li {$bookmarks_highlight}><a href=\"{$vars['url']}pg/bookmarks/{$username}\">Bookmarks</a></li>";
+ $bookmark_link = "<li><a href=\"{$vars['url']}pg/bookmarks/{$username}\">Bookmarks</a></li>";
}else{
$bookmark_link = "";
}
@@ -112,6 +117,7 @@ $display = <<<EOT
{$file_link}
{$blog_link}
{$video_link}
+ {$feeds_link}
{$bookmark_link}
{$pages_link}
</ul>