diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-04 11:55:23 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-04 11:55:23 -0700 |
| commit | c888ce2e7d2959c064577b46633e397a0f9fedc5 (patch) | |
| tree | 52175db0e36c4c8906a7b128d05d1abc8a19eb64 | |
| parent | bc3850525139680946633e6e44152ac6c9096002 (diff) | |
| parent | 0746e7e10dd94d005f0a45da7634dbf82eff722f (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | themes/default/images/ico-notify-add.png | bin | 0 -> 1469 bytes | |||
| -rw-r--r-- | themes/default/images/ico-notify-remove.png | bin | 0 -> 1500 bytes | |||
| -rw-r--r-- | themes/default/views/album.html.php | 9 |
3 files changed, 9 insertions, 0 deletions
diff --git a/themes/default/images/ico-notify-add.png b/themes/default/images/ico-notify-add.png Binary files differnew file mode 100644 index 00000000..937bfd4f --- /dev/null +++ b/themes/default/images/ico-notify-add.png diff --git a/themes/default/images/ico-notify-remove.png b/themes/default/images/ico-notify-remove.png Binary files differnew file mode 100644 index 00000000..8c0f29ca --- /dev/null +++ b/themes/default/images/ico-notify-remove.png diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index 7d4a6f54..b74c6d86 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -7,6 +7,7 @@ </div> <ul id="gAlbumGrid"> +<? if (count($children)): ?> <? foreach ($children as $i => $child): ?> <? $item_class = "gPhoto"; ?> <? if ($child->is_album()): ?> @@ -24,6 +25,14 @@ </ul> </li> <? endforeach ?> +<? else: ?> + <? if ($user->admin || access::can("add", $item)): ?> + <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?> + <li><?= t("There aren't any photos here yet! <a href=\"$addurl\" class=\"gDialogLink\">Add some</a>.") ?></li> + <? else: ?> + <li><?= t("There aren't any photos here yet!") ?></li> + <? endif; ?> +<? endif; ?> </ul> <?= $theme->album_bottom() ?> |
