a minor integration of categories plugin

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 31e46d46da390b2a6de701f502ad4fe9ed692485..60015d2b1414ee1e22e86357f2b318f70366f5cb 100644 (file)
--- 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 342ac8822a813455854a5caa2765a9228f984be4..1758d14f4b9579518a07729cf13f92be9be1f74b 100644 (file)
--- 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>