aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2010-05-01 04:04:44 +0000
committerCash Costello <cash.costello@gmail.com>2010-05-01 04:04:44 +0000
commit521dad5267d98fc7776d75b3f44dc65ab500568d (patch)
treeee985aa394d9f448f2910a93a892272b2b176e36
parent6e330270c7c8a9edd4c57b258c6ff0920c7fed1c (diff)
downloadelgg-521dad5267d98fc7776d75b3f44dc65ab500568d.tar.gz
elgg-521dad5267d98fc7776d75b3f44dc65ab500568d.tar.bz2
better layout of photo album covers
-rw-r--r--contributions.txt5
-rw-r--r--views/default/object/album.php3
-rw-r--r--views/default/tidypics/css.php6
-rw-r--r--views/default/tidypics/gallery.php9
4 files changed, 21 insertions, 2 deletions
diff --git a/contributions.txt b/contributions.txt
index 2df8cb6c1..fac5edc6f 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,11 +3,14 @@ See individual change logs for contributors to those builds
------------------------------------------------------------------------
Version 1.6.8 Change List
-Release Date:
+Release Date: 05/01/2010
------------------------------------------------------------------------
BEGIN VERSION 1.6.8 CHANGES
------------------------------------------------------------------------
* New language strings: tidypics:nophotosingroup
+ * Fixed bug in titles of albums RSS
+ * Added a new css element: tidypics_line_break
+ * Fixed layout of album covers due to long titles or other text
------------------------------------------------------------------------
END VERSION 1.6.8 CHANGES
------------------------------------------------------------------------
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 60015d2b1..85dd69ac9 100644
--- 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 538deeb5f..9d904a7ff 100644
--- 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 b9a50bdab..74aa34500 100644
--- 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++;
}
}