diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-27 14:03:01 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-27 14:03:01 +0000 |
| commit | a58aa6e97b0e44adf7a878db6e276b081e202192 (patch) | |
| tree | cecc68b1222cb283a021478b822952c468d64393 /modules/organize/views | |
| parent | 10e36fcf1b5acf07c5cc128105af03fb09aac89e (diff) | |
| parent | d9707ae749df2770370dc4eeeeaddda28f092d4d (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/organize/views')
| -rw-r--r-- | modules/organize/views/organize_tree.html.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php index 33d7b4c9..044b6858 100644 --- a/modules/organize/views/organize_tree.html.php +++ b/modules/organize/views/organize_tree.html.php @@ -3,24 +3,27 @@ ref="<?= $album->id ?>"> <span class="ui-icon ui-icon-minus g-left"> </span> - <span class="g-organize-album-text g-left <?= $selected && $album->id == $selected->id ? "ui-state-focus" : "" ?>" + <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "ui-state-focus" : "" ?>" ref="<?= $album->id ?>"> <?= html::clean($album->title) ?> </span> - <ul class="g-left"> - <? foreach ($album->children(null, null, array(array("type", "=", "album"))) as $child): ?> + <? $child_albums = $album->viewable()->children(null, null, array(array("type", "=", "album"))); ?> + <? if (!empty($child_albums)): ?> + <ul> + <? foreach ($child_albums as $child): ?> <? if ($selected && $child->contains($selected)): ?> <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?> <? else: ?> <li class="g-organize-album ui-icon-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>" ref="<?= $child->id ?>"> <span class="ui-icon ui-icon-plus g-left"></span> - <span class="g-organize-album-text g-left <?= $selected && $child->id == $selected->id ? "ui-state-focus" : "" ?>" ref="<?= $child->id ?>"> + <span class="g-organize-album-text <?= $selected && $child->id == $selected->id ? "ui-state-focus" : "" ?>" ref="<?= $child->id ?>"> <?= html::clean($child->title) ?> </span> </li> <? endif ?> <? endforeach ?> </ul> + <? endif ?> </li> |