Merged interface changes to profile in.

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

5 files changed, 134 insertions, 0 deletions

diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php
new file mode 100755
index 000000000..62fc747e3
--- /dev/null
+++ b/mod/profile/views/default/profile/profile_contents/activity.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Elgg user display (details)
+ * @uses $vars['entity'] The user entity
+ */
+?>	
+<div id="profile_content">
+	<?php
+	if(is_plugin_enabled('thewire')) {
+		// 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('profile/profile_contents/profile_activity', array('entity' => $vars['entity']));
+	} else {
+		echo "Riverdashboard not loaded";
+	}
+	?>
+</div>
+
+<div id="profile_sidebar">
+<?php
+	echo elgg_view('profile/profile_ownerblock', array('smallicon' => true));
+?>
+</div>
diff --git a/mod/profile/views/default/profile/profile_contents/details.php b/mod/profile/views/default/profile/profile_contents/details.php
new file mode 100755
index 000000000..c61379974
--- /dev/null
+++ b/mod/profile/views/default/profile/profile_contents/details.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Elgg user display (details)
+ * @uses $vars['entity'] The user entity
+ */
+?>
+<div id="profile_content">
+<?php
+	// Simple XFN
+	$rel = "";
+	if (page_owner() == $vars['entity']->guid)
+		$rel = 'me';
+	else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+		$rel = 'friend';
+
+	if ($vars['full'] == true) {
+		$even_odd = null;
+		if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
+			foreach($vars['config']->profile as $shortname => $valtype) {
+				if ($shortname != "description") {
+					$value = $vars['entity']->$shortname;
+					if (!empty($value)) {
+						//This function controls the alternating class
+              				$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';					
+?>
+						<p class="<?php echo $even_odd; ?>">
+						<b><?php
+								echo elgg_echo("profile:{$shortname}");
+						?>: </b>
+						<?php
+							echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));
+						?>
+						</p>
+						<?php
+					}
+				}
+			}
+	}
+?>
+<?php 
+	if (!get_plugin_setting('user_defined_fields', 'profile')) {
+?>
+<?php 
+		if ($vars['entity']->isBanned()) {
+			echo "<div class='banned_user'>";
+			echo elgg_echo('profile:banned');
+			echo "</div>";
+		 }else{ 
+			 if($vars['entity']->description){
+				echo "<p class='aboutme_title'><b>" . elgg_echo("profile:aboutme") . "</b></p>";
+			 	echo "<div class='aboutme_contents'>" .elgg_view('output/longtext', array('value' => $vars['entity']->description))."</div>";
+			}
+	?>
+<?php } ?>
+	<?php 
+		}
+		
+	echo "</div>";
+	// profile sidebar
+	echo "<div id='profile_sidebar'>";
+	echo elgg_view('profile/profile_ownerblock');
+	echo "</div>";
+?>
diff --git a/mod/profile/views/default/profile/profile_contents/friends.php b/mod/profile/views/default/profile/profile_contents/friends.php
new file mode 100755
index 000000000..4fa290a7f
--- /dev/null
+++ b/mod/profile/views/default/profile/profile_contents/friends.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Profile friends
+ **/
+
+$friends = list_entities_from_relationship('friend',$vars['entity']->getGUID(),false,'user','',0,10,false);
+if(!$friends)
+	$friends = "<p>This user has not made any friends yet.</p>";
+
+?>
+<div id="profile_content">
+	<?php
+		echo $friends;
+	?>
+</div>
+
+<div id="profile_sidebar">
+<?php
+	echo elgg_view('profile/profile_ownerblock', array('smallicon' => true));
+?>
+</div>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/profile_contents/twitter.php b/mod/profile/views/default/profile/profile_contents/twitter.php
new file mode 100755
index 000000000..75b6d0467
--- /dev/null
+++ b/mod/profile/views/default/profile/profile_contents/twitter.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg twitter view page
+ */
+	 
+$twitter_username = $vars['entity']->twitter;
+	 
+// if the twitter username is empty, then do not show
+if($twitter_username){
+?>
+<div id="profile_content">
+	<ul id="twitter_update_list"></ul>
+	<p class="visit_twitter"><a href="http://twitter.com/<?php echo $twitter_username; ?>" target="_blank"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+	<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
+	<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $twitter_username; ?>.json?callback=twitterCallback2&count=10"></script>
+</div>
+<div id="profile_sidebar">
+<?php
+	echo elgg_view('profile/profile_ownerblock', array('smallicon' => true));
+?>
+</div>
+<?php 
+}
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/profile_contents/widgets.php b/mod/profile/views/default/profile/profile_contents/widgets.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/profile/views/default/profile/profile_contents/widgets.php