From c3a55fad8f1093e00f3f3689681d1aaf283b46cd Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 3 Aug 2008 14:09:50 +0000
Subject: brief description added to the owner block and profile

git-svn-id: https://code.elgg.org/elgg/trunk@1669 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/languages/en.php                |  5 +++--
 mod/profile/start.php                       | 10 +---------
 views/default/page_elements/owner_block.php |  6 ++++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mod/profile/languages/en.php b/mod/profile/languages/en.php
index 2cec031a0..c11d0169a 100644
--- a/mod/profile/languages/en.php
+++ b/mod/profile/languages/en.php
@@ -34,7 +34,8 @@
 			'profile:editicon' => "Edit profile icon",
 	
 			'profile:aboutme' => "About me", 
-			'profile:description' => "About me", 
+			'profile:description' => "About me",
+			'profile:briefdescription' => "Brief description",
 			'profile:location' => "Location",
 			'profile:skills' => "Skills",  
 			'profile:interests' => "Interests", 
@@ -43,7 +44,7 @@
 			'profile:mobile' => "Mobile phone",
 			'profile:website' => "Website",
 
-			'profile:river:update' => "%s updated their profile",
+			'profile:river:update' => "%s updated their profile",
 			'profile:river:iconupdate' => "%s updated their profile icon",
 	
 		/**
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 116044bdf..4f967f59c 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -25,15 +25,6 @@
 			// Register a URL handler for users - this means that profile_url()
 			// will dictate the URL for all ElggUser objects
 				register_entity_url_handler('profile_url','user','all');
-			
-			// Set up menu for logged in users
-			//	if (isloggedin()) {
-			//		add_menu(elgg_echo('profile'), $CONFIG->wwwroot . "pg/profile/" . $_SESSION['user']->username,array(
-			//			menu_item(elgg_echo('profile:yours'),$CONFIG->wwwroot . "pg/profile/" . $_SESSION['user']->username),
-			//			menu_item(elgg_echo('profile:edit'),$CONFIG->wwwroot."mod/profile/edit.php"),
-			//			menu_item(elgg_echo('profile:editicon'),$CONFIG->wwwroot."mod/profile/editicon.php"),
-			//		),'profile');
-			//	}
 				
 			// For now, we'll hard code the profile items as follows:
 			// TODO make this user configurable
@@ -42,6 +33,7 @@
 					// Language short codes must be of the form "profile:key"
 					// where key is the array key below
 					'description' => 'longtext',
+					'briefdescription' => 'text',
 					'location' => 'tags',
 					'interests' => 'tags',
 					'skills' => 'tags',
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 3c2f588df..116b9890d 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -22,6 +22,12 @@
 			}
 			$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
 			$display .= "<div id=\"owner_block_content\">" . $info . "</div>";
+			
+			if ($owner->briefdescription) {
+			    $desc = $owner->briefdescription;
+			    $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
+		    }
+		    
 		}
 		echo $display;
 		
-- 
cgit v1.2.3