diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
| commit | 6111272568a732465c330597a068a048f6705ef9 (patch) | |
| tree | f8829dfb4c4ee566a69f91d397e74e74aec56dbd /themes | |
| parent | de28b0350e5d5bf6c3e1eb5a9531298b08fd7cba (diff) | |
| parent | f56d372629df5b08a30d0182d4e1e7c97a44d79f (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/comment/helpers/comment_installer.php
modules/gallery/models/item.php
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/default/views/album.html.php | 2 | ||||
| -rw-r--r-- | themes/default/views/footer.html.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index 799d94c1..7e6913df 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -19,7 +19,7 @@ <?= $child->thumb_img(array("class" => "gThumbnail")) ?> </a> <?= $theme->thumb_bottom($child) ?> - <h2><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2> + <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2> <ul class="gMetadata"> <?= $theme->thumb_info($child) ?> </ul> diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php index d7111922..040a4062 100644 --- a/themes/default/views/footer.html.php +++ b/themes/default/views/footer.html.php @@ -2,7 +2,9 @@ <?= $theme->footer() ?> <? if ($footer_text = module::get_var("gallery", "footer_text")): ?> <?= $footer_text ?> -<? else: ?> +<? endif ?> + +<? if (module::get_var("gallery", "show_credits")): ?> <ul id="gCredits"> <?= $theme->credits() ?> </ul> |