From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 25 Apr 2010 00:56:53 +0000 (+0000)
Subject: a minor integration of categories plugin
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c940ce7ad01482798205a5d2e2b7336aef83bb05;p=lorea%2Felgg.git

a minor integration of categories plugin
---

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 31e46d46d..60015d2b1 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -135,9 +135,22 @@
 ?>
 		<?php echo elgg_echo('album:by');?> <b><a href="<?php echo $vars['url'] ;?>pg/profile/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b>  <?php echo $friendlytime; ?><br>
 		<?php echo elgg_echo('image:total');?> <b><?php echo $num_images; ?></b><br>
+<?php
+		$categories = elgg_view('categories/view',$vars);
+		if (!empty($categories)) {
+?>
+		<br />
+<b><?php echo elgg_echo('categories'); ?>:</b> 
+			<?php
+
+				echo $categories;
+
+		}
+?>
 	</div>
 
 <?php
+
 		if ($vars['full']) {
 			echo elgg_view_comments($album);
 		}
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 342ac8822..1758d14f4 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -94,6 +94,16 @@
 			
 		} else {
 			// album so display access control
+
+			$categories = elgg_view('categories',$vars);
+			if (!empty($categories)) {
+?>
+		<p>
+			<?php echo $categories; ?>
+		</p>
+
+<?php
+		}
 ?>
 			<p>
 				<label><?php echo elgg_echo('access'); ?></label>