better layout of photo album covers

diff --git a/contributions.txt b/contributions.txt
index 2df8cb6c1f631c70bed85737dd4d8ffb740e32fb..fac5edc6f4ef817dd9622e2343013840d0c05061 100644 (file)
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,11 +3,14 @@ See individual change logs for contributors to those builds
 \r
 ------------------------------------------------------------------------\r
 Version 1.6.8 Change List\r
-Release Date: \r
+Release Date: 05/01/2010\r
 ------------------------------------------------------------------------\r
 BEGIN VERSION 1.6.8 CHANGES\r
 ------------------------------------------------------------------------\r
  * New language strings: tidypics:nophotosingroup\r
+ * Fixed bug in titles of albums RSS\r
+ * Added a new css element: tidypics_line_break\r
+ * Fixed layout of album covers due to long titles or other text\r
 ------------------------------------------------------------------------\r
 END VERSION 1.6.8 CHANGES\r
 ------------------------------------------------------------------------\r

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 60015d2b1414ee1e22e86357f2b318f70366f5cb..85dd69ac9d56cdc0e399d05d4d21e77672f854a7 100644 (file)
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -39,7 +39,8 @@
                <a href="<?php echo $album->getURL();?>"><?php echo $title;?></a>
        </div>
        <a href="<?php echo $album->getURL();?>"><?php echo $album_cover;?></a><br>
-       <small><a href="<?php echo $vars['url'];?>pg/profile/<?php echo $owner->username;?>"><?php echo $owner->name;?></a> <?php echo $friendlytime;?><br>
+       <small><a href="<?php echo $vars['url'];?>pg/profile/<?php echo $owner->username;?>"><?php echo $owner->name;?></a> 
+       <br /><?php echo $friendlytime;?><br />
 <?php
                        //get the number of comments
                        $numcomments = elgg_count_comments($album);

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 538deeb5f331a58845dbfd797554a4284ba02290..9d904a7ff6e50a2d495d8a3d95020bb167b99d86 100644 (file)
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -92,6 +92,12 @@ float:left;
 margin-bottom:20px;
 padding: 4px;
 text-align:center;
+width: 160px;
+}
+
+.tidypics_line_break {
+width: 100%;
+clear: both;
 }
 
 .tidypics_gallery_title {

diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
index b9a50bdabef1c462d288b1a22e543970e55a238d..74aa34500bb3ba1085841e56cd23c0d8076c8ee1 100644 (file)
--- a/views/default/tidypics/gallery.php
+++ b/views/default/tidypics/gallery.php
@@ -4,6 +4,9 @@
  *
  */
 
+// four albums across
+$num_wide = 4;
+
 $context = $vars['context'];
 $offset = $vars['offset'];
 $entities = $vars['entities'];
@@ -43,9 +46,15 @@ if ($pagination) {
 }
 
 $html .= $nav;
+
 if (is_array($entities) && sizeof($entities) > 0) {
+       $counter = 0;
        foreach($entities as $entity) {
+               if ($counter % $num_wide == 0) {
+                       $html .= "<div class=\"tidypics_line_break\"></div>";
+               }
                $html .= elgg_view_entity($entity, $fullview);
+               $counter++;
        }
 }