From 90cb880ec6b629376df97c89bc4a0b3e2db32c8e Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 7 Apr 2010 13:01:23 +0000 Subject: profile feeds moved from top tabs git-svn-id: http://code.elgg.org/elgg/trunk@5641 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/profile/profile_contents/feeds.php | 20 -------------------- .../views/default/profile/profile_navigation.php | 10 ---------- .../views/default/profile/profile_ownerblock.php | 18 ++++++++++++------ 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 mod/profile/views/default/profile/profile_contents/feeds.php (limited to 'mod/profile') 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 @@ -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 -?> -
-$feeds)); -}else{ - echo "This user has not added any feeds."; -} -?> -
\ 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){
  • >Friends
  • >Comment Wall
  • -
  • >Feeds
  • - 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 = "
  • Files
  • "; + $file_link = "
  • Files
  • "; }else{ $file_link = ""; } if(is_plugin_enabled('blog')){ - $blog_link = "
  • Blog
  • "; + $blog_link = "
  • Blog
  • "; }else{ $blog_link = ""; } -if(is_plugin_enabled('video')){ - $video_link = "
  • Videos
  • "; +if(is_plugin_enabled('videolist')){ + $video_link = "
  • Videos
  • "; }else{ $video_link = ""; } +if(is_plugin_enabled('feeds')){ + $feeds_link = "
  • Feeds
  • "; +}else{ + $feeds_link = ""; +} if(is_plugin_enabled('pages')){ - $pages_link = "
  • Pages
  • "; + $pages_link = "
  • Pages
  • "; }else{ $pages_link = ""; } if(is_plugin_enabled('bookmarks')){ - $bookmark_link = "
  • Bookmarks
  • "; + $bookmark_link = "
  • Bookmarks
  • "; }else{ $bookmark_link = ""; } @@ -112,6 +117,7 @@ $display = << -- cgit v1.2.3