From e5b3b8b9bdd999c1e4c1ac583417340eacb72269 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 20 Mar 2009 21:20:30 +0000
Subject: updated widget for Elgg 1.5

---
 languages/en.php                          |  4 ++--
 views/default/widgets/album_view/view.php | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index a4b82b6d3..21fe56f2d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -23,7 +23,7 @@
 	
 		//actions
 		
-			'album:create' => "New Album",
+			'album:create' => "Create New Album",
 			'album:add' => "Add Photo Album",
 			'album:addpix' => "Add photos",
 			'album:edit' => "Edit album",		
@@ -97,7 +97,7 @@
 			'image:notimage' => "We only accept jpeg, gif, or png images of the allowed file size.",
 			'images:notedited' => "Not all images were successfully updated",
 		 
-			'album:none' => "We could not find any albums at the moment.",
+			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted at this time.",
 			'album:blank' => "Please give this album a title and description."
diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php
index 347332971..d56e0c3fc 100644
--- a/views/default/widgets/album_view/view.php
+++ b/views/default/widgets/album_view/view.php
@@ -1,3 +1,4 @@
+<div class="contentWrapper"> 
 <?php
 	//the number of files to display
 	$number = (int) $vars['entity']->num_display;
@@ -9,7 +10,7 @@
 	$owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false);
 
 	if ($owner_albums) {
-    echo '<div id="album_widget_container">';
+		echo '<div id="album_widget_container">';
         	 
 		foreach($owner_albums as $album){
 	
@@ -40,14 +41,12 @@
         		
 	} else {
 		
-		echo '<p class="pages_add_title">'.elgg_echo("album:none").'</p>';
+		echo '<p class="pages_add_title">' . elgg_echo("album:none") . '</p>';
 
-        //check if owner has write rights. If so, let him edit the album
-		$container_guid = get_input('container_guid', $_SESSION['user']->getGUID());
-
-        if ($owner->username == get_entity($container_guid)->username){
+		if (get_loggedin_userid() == page_owner()) {
             echo '<p class="pages_add"><a class="pages add" href='.$CONFIG->url .'pg/photos/new/'.$owner->username.'>'.elgg_echo("album:create").'</a></p>';
         }
 		
 	}
-?>
\ No newline at end of file
+?>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3