diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-08-06 21:36:32 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-08-06 21:36:32 +0000 |
| commit | 691ce806dc9aefac596a692ff2ba927a81a65440 (patch) | |
| tree | 410f64288ef1d8bbc8455509af74d0e7582dc48e /themes/wind/views | |
| parent | c83650d83ad8b1f4bda30cac2ae8efa6e1c97287 (diff) | |
| parent | 8559cdb5b6bfa87864941f726521660023779fa7 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'themes/wind/views')
| -rw-r--r-- | themes/wind/views/album.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php index b9072e2b..de196be0 100644 --- a/themes/wind/views/album.html.php +++ b/themes/wind/views/album.html.php @@ -29,7 +29,7 @@ <? endforeach ?> <? else: ?> <? if ($user->admin || access::can("add", $item)): ?> - <? $addurl = url::site("flash_uploader/app/$item->id") ?> + <? $addurl = url::site("uploader/index/$item->id") ?> <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.", array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li> <? else: ?> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 16e43c63..9f94b04f 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -29,7 +29,7 @@ <?= $theme->css("themeroller/ui.base.css") ?> <?= $theme->css("gallery.common.css") ?> <?= $theme->css("screen.css") ?> - <!--[if lt IE 8]> + <!--[if lte IE 8]> <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>" media="screen,print,projection" /> <![endif]--> @@ -107,13 +107,13 @@ level you're on the right page. --> <a href="<?= $parent->url($parent == $theme->item()->parent() ? "show={$theme->item()->id}" : null) ?>"> - <?= text::limit_chars(html::purify($parent->title), 15) ?> + <?= html::purify(text::limit_chars($parent->title, 15)) ?> </a> </li> <? $i++ ?> <? endforeach ?> <li class="g-active<? if ($i == 0) print " g-first" ?>"> - <?= text::limit_chars(html::purify($theme->item()->title), 15) ?> + <?= html::purify(text::limit_chars($theme->item()->title, 15)) ?> </li> </ul> <? endif ?> |