From ac0e60fd90c55a3a7d4f2001eb9e4cce44a5b259 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 21 Mar 2009 16:57:57 +0000
Subject: cleaning up friends album view and individual album view

---
 views/default/object/album.php        |  8 +----
 views/default/tidypics/css.php        | 10 +++---
 views/default/tidypics/forms/edit.php | 63 +++++++++++++++++------------------
 3 files changed, 37 insertions(+), 44 deletions(-)

(limited to 'views/default')

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 9d3dc507f..464806ca1 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -1,12 +1,6 @@
 <?php
 	/**
-	 * Elgg file browser.
-	 * File renderer.
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.com/
+	 * Tidypics Album Gallery View
 	 */
 
 	global $CONFIG;
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index f9f5b09e6..a682ff677 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -35,7 +35,7 @@
 	height:160px;
 	margin:4px;
 	padding:5px;
-	border:1px solid #ccc;	
+	border:1px solid #cccccc;	
 	text-align:center;
 }
 
@@ -47,7 +47,7 @@
 }
 #image_full img{
 	padding:5px;
-	border:1px solid #ccc;
+	border:1px solid #cccccc;
 	margin:7px 0;
 }
 
@@ -55,7 +55,7 @@
 
 .album_cover{
 	padding:2px;
-	border:1px solid #ccc;
+	border:1px solid #cccccc;
 	margin:8px 0;
 }
 
@@ -96,7 +96,7 @@
 	height:160px;
 	margin:4px;
 	padding:5px;
-	border:1px solid #ccc;	
+	border:1px solid #cccccc;	
 	text-align:center;
 }
 .image_info{
@@ -108,7 +108,7 @@
 }
 .edit_image{
 	float:right;
-	border:1px solid #ccc; 
+	border:1px solid #cccccc; 
 	width:153px; 
 	height:153px;
 }
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 97170163b..bef87c64b 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	* Elgg images edit/add page
+	* Tidypics images edit/add page
 	*  This form is used to:
 	*	- create albums
 	*	- edit albums
@@ -8,39 +8,39 @@
 	*/
 	
 	//set stuff if we are editing existing album or image
-		if (isset($vars['entity'])) {
-			$title = sprintf(elgg_echo("album:edit"),$object->title);
-			$action = "tidypics/editalbum";
-			$title = $vars['entity']->title;
-			$body = $vars['entity']->description;
-			$tags = $vars['entity']->tags;
-			$access_id = $vars['entity']->access_id;
-			$subtype = $vars['subtype'];
+	if (isset($vars['entity'])) {
+		$title = sprintf(elgg_echo("album:edit"),$object->title);
+		$action = "tidypics/editalbum";
+		$title = $vars['entity']->title;
+		$body = $vars['entity']->description;
+		$tags = $vars['entity']->tags;
+		$access_id = $vars['entity']->access_id;
+		$subtype = $vars['subtype'];
 						
-		// if nothing is sent, create new, but only new albums are sent here
-		// new images are sent to upload.php
-		} else  {
-			$title = elgg_echo("album:add");
-			$action = "tidypics/addalbum";
-			$tags = "";
-			$title = "";
-			$description = "";
-			if (defined('ACCESS_DEFAULT'))
-				$access_id = ACCESS_DEFAULT;
-			else
-				$access_id = 0;
-		}
+	// if nothing is sent, create new, but only new albums are sent here
+	// new images are sent to upload.php
+	} else  {
+		$title = elgg_echo("album:add");
+		$action = "tidypics/addalbum";
+		$tags = "";
+		$title = "";
+		$description = "";
+		if (defined('ACCESS_DEFAULT'))
+			$access_id = ACCESS_DEFAULT;
+		else
+			$access_id = 0;
+	}
 			
 	//  in case we have some cached details
-		if (isset($vars['albumtitle'])) {
-			$title = $vars['albumtitle'];
-			$body = $vars['albumbody'];
-			$tags = $vars['albumtags'];
-		}
+	if (isset($vars['albumtitle'])) {
+		$title = $vars['albumtitle'];
+		$body = $vars['albumbody'];
+		$tags = $vars['albumtags'];
+	}
         
-		$container_guid = get_input('container_guid');
-        if (!$container_guid) $container_guid = page_owner();
-	
+	$container_guid = get_input('container_guid');
+	if (!$container_guid) $container_guid = page_owner();
+
 ?>
 <div class="contentWrapper">
 	<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post">
@@ -49,8 +49,7 @@
 			<?php  echo elgg_view("input/text", array("internalname" => "albumtitle", "value" => $title,));  ?>			
 		</p>
 <?php 		
-		if($vars['subtype'] == 'album' || $action == "tidypics/addalbum")
-		{
+		if ($vars['subtype'] == 'album' || $action == "tidypics/addalbum") {
 ?>
 		<p>
 			<label><?php echo elgg_echo('album:desc'); ?></label>
-- 
cgit v1.2.3