aboutsummaryrefslogtreecommitdiff
path: root/mod/profile/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 00:59:12 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 00:59:12 +0000
commitfea009129f49f4f8d51654ceb569aae04387077b (patch)
treeb64246b0c56c43a02b39fc5f62d53d01043e4d0a /mod/profile/views
parent1bd7be96c93688cccfb994c4ff3f5bdc5a320a37 (diff)
downloadelgg-fea009129f49f4f8d51654ceb569aae04387077b.tar.gz
elgg-fea009129f49f4f8d51654ceb569aae04387077b.tar.bz2
more profile clean up
git-svn-id: http://code.elgg.org/elgg/trunk@7675 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/profile/views')
-rw-r--r--mod/profile/views/default/profile/content_wrapper.php (renamed from mod/profile/views/default/profile/profile_content.php)0
-rw-r--r--mod/profile/views/default/profile/metatags.php9
-rwxr-xr-xmod/profile/views/default/profile/ownerblock.php (renamed from mod/profile/views/default/profile/profile_ownerblock.php)0
-rw-r--r--mod/profile/views/default/profile/sidebar.php2
-rwxr-xr-xmod/profile/views/default/profile/tab_navigation.php (renamed from mod/profile/views/default/profile/profile_navigation.php)0
-rwxr-xr-xmod/profile/views/default/profile/tabs/activity.php (renamed from mod/profile/views/default/profile/profile_contents/activity.php)0
-rw-r--r--mod/profile/views/default/profile/tabs/commentwall.php (renamed from mod/profile/views/default/profile/profile_contents/commentwall.php)5
-rwxr-xr-xmod/profile/views/default/profile/tabs/details.php (renamed from mod/profile/views/default/profile/profile_contents/details.php)0
-rwxr-xr-xmod/profile/views/default/profile/tabs/friends.php (renamed from mod/profile/views/default/profile/profile_contents/friends.php)0
-rw-r--r--mod/profile/views/default/profile/tabs/groups.php (renamed from mod/profile/views/default/profile/profile_contents/groups.php)0
-rwxr-xr-xmod/profile/views/default/profile/tabs/twitter.php (renamed from mod/profile/views/default/profile/profile_contents/twitter.php)0
11 files changed, 11 insertions, 5 deletions
diff --git a/mod/profile/views/default/profile/profile_content.php b/mod/profile/views/default/profile/content_wrapper.php
index 4fb43e7c9..4fb43e7c9 100644
--- a/mod/profile/views/default/profile/profile_content.php
+++ b/mod/profile/views/default/profile/content_wrapper.php
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php
index a90b12494..1197a2e0a 100644
--- a/mod/profile/views/default/profile/metatags.php
+++ b/mod/profile/views/default/profile/metatags.php
@@ -1,11 +1,14 @@
<?php
/**
- * Adds metatags to load Javascript required for the profile
+ * FOAF
*
* @package ElggProfile
*
*/
-if ($owner = elgg_get_page_owner()) { ?>
+if (elgg_get_page_owner()) {
+?>
<link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
-<?php } ?> \ No newline at end of file
+<?php
+
+} \ No newline at end of file
diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/ownerblock.php
index 3fb5f509e..3fb5f509e 100755
--- a/mod/profile/views/default/profile/profile_ownerblock.php
+++ b/mod/profile/views/default/profile/ownerblock.php
diff --git a/mod/profile/views/default/profile/sidebar.php b/mod/profile/views/default/profile/sidebar.php
index 96b4a1955..525a2da81 100644
--- a/mod/profile/views/default/profile/sidebar.php
+++ b/mod/profile/views/default/profile/sidebar.php
@@ -8,6 +8,6 @@
<div id="profile_sidebar">
<?php
$section = $vars['section'];
- echo elgg_view('profile/profile_ownerblock', array('section' => $section));
+ echo elgg_view('profile/ownerblock', array('section' => $section));
?>
</div> \ No newline at end of file
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/tab_navigation.php
index ca0873ebd..ca0873ebd 100755
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/tab_navigation.php
diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/tabs/activity.php
index ccd2a3915..ccd2a3915 100755
--- a/mod/profile/views/default/profile/profile_contents/activity.php
+++ b/mod/profile/views/default/profile/tabs/activity.php
diff --git a/mod/profile/views/default/profile/profile_contents/commentwall.php b/mod/profile/views/default/profile/tabs/commentwall.php
index 7e8a1d97d..bf54bd7e7 100644
--- a/mod/profile/views/default/profile/profile_contents/commentwall.php
+++ b/mod/profile/views/default/profile/tabs/commentwall.php
@@ -3,8 +3,11 @@
* Elgg profile comment wall
*/
+$user = elgg_get_page_owner();
+$comments = $user->getAnnotations('commentwall', 200, 0, 'desc');
+
if (isloggedin()) {
echo elgg_view("profile/commentwall/commentwalladd");
}
-echo elgg_view("profile/commentwall/commentwall", array('annotation' => $vars['comments']));
+echo elgg_view("profile/commentwall/commentwall", array('annotation' => $comments));
diff --git a/mod/profile/views/default/profile/profile_contents/details.php b/mod/profile/views/default/profile/tabs/details.php
index 27b0f943b..27b0f943b 100755
--- a/mod/profile/views/default/profile/profile_contents/details.php
+++ b/mod/profile/views/default/profile/tabs/details.php
diff --git a/mod/profile/views/default/profile/profile_contents/friends.php b/mod/profile/views/default/profile/tabs/friends.php
index 9195629e5..9195629e5 100755
--- a/mod/profile/views/default/profile/profile_contents/friends.php
+++ b/mod/profile/views/default/profile/tabs/friends.php
diff --git a/mod/profile/views/default/profile/profile_contents/groups.php b/mod/profile/views/default/profile/tabs/groups.php
index 323bb61f1..323bb61f1 100644
--- a/mod/profile/views/default/profile/profile_contents/groups.php
+++ b/mod/profile/views/default/profile/tabs/groups.php
diff --git a/mod/profile/views/default/profile/profile_contents/twitter.php b/mod/profile/views/default/profile/tabs/twitter.php
index 06a0551d4..06a0551d4 100755
--- a/mod/profile/views/default/profile/profile_contents/twitter.php
+++ b/mod/profile/views/default/profile/tabs/twitter.php