merge with latest Wind theme updates
This commit is contained in:
parent
8ea06ddbc0
commit
ce8b50c489
@ -11,7 +11,7 @@
|
|||||||
<?= t("Admin dashboard") ?>
|
<?= t("Admin dashboard") ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
</title>
|
</title>
|
||||||
<link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
|
<link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
|
||||||
|
|
||||||
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
||||||
<?= $theme->css("themeroller/ui.base.css") ?>
|
<?= $theme->css("themeroller/ui.base.css") ?>
|
||||||
@ -77,9 +77,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="g-footer" class="g-inline ui-helper-clearfix">
|
<div id="g-footer" class="g-inline ui-helper-clearfix">
|
||||||
<?= $theme->admin_footer() ?>
|
<?= $theme->admin_footer() ?>
|
||||||
<div>
|
<? if (module::get_var("gallery", "show_credits")): ?>
|
||||||
|
<ul id="g-credits" class="g-inline">
|
||||||
<?= $theme->admin_credits() ?>
|
<?= $theme->admin_credits() ?>
|
||||||
</div>
|
</ul>
|
||||||
|
<? endif ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?= $theme->admin_page_bottom() ?>
|
<?= $theme->admin_page_bottom() ?>
|
||||||
|
@ -16,7 +16,9 @@
|
|||||||
<li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
|
<li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
|
||||||
<?= $theme->thumb_top($child) ?>
|
<?= $theme->thumb_top($child) ?>
|
||||||
<a href="<?= $child->url() ?>">
|
<a href="<?= $child->url() ?>">
|
||||||
|
<? if ($child->has_thumb()): ?>
|
||||||
<?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
|
<?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
|
||||||
|
<? endif ?>
|
||||||
</a>
|
</a>
|
||||||
<?= $theme->thumb_bottom($child) ?>
|
<?= $theme->thumb_bottom($child) ?>
|
||||||
<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
|
<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<? endif ?>
|
<? endif ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
</title>
|
</title>
|
||||||
<link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
|
<link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
|
||||||
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
||||||
<?= $theme->css("superfish/css/superfish.css") ?>
|
<?= $theme->css("superfish/css/superfish.css") ?>
|
||||||
<?= $theme->css("themeroller/ui.base.css") ?>
|
<?= $theme->css("themeroller/ui.base.css") ?>
|
||||||
@ -101,18 +101,23 @@
|
|||||||
<? $i = 0 ?>
|
<? $i = 0 ?>
|
||||||
<? foreach ($parents as $parent): ?>
|
<? foreach ($parents as $parent): ?>
|
||||||
<li<? if ($i == 0) print " class=\"g-first\"" ?>>
|
<li<? if ($i == 0) print " class=\"g-first\"" ?>>
|
||||||
<!-- Adding ?show=<id> causes Gallery3 to display the page
|
<? // Adding ?show=<id> causes Gallery3 to display the page
|
||||||
containing that photo. For now, we just do it for
|
// containing that photo. For now, we just do it for
|
||||||
the immediate parent so that when you go back up a
|
// the immediate parent so that when you go back up a
|
||||||
level you're on the right page. -->
|
// level you're on the right page. ?>
|
||||||
<a href="<?= $parent->url($parent == $theme->item()->parent() ?
|
<a href="<?= $parent->url($parent->id == $theme->item()->parent_id ?
|
||||||
"show={$theme->item()->id}" : null) ?>">
|
"show={$theme->item()->id}" : null) ?>">
|
||||||
<?= html::purify($parent->title) ?>
|
<? // limit the title length to something reasonable (defaults to 15) ?>
|
||||||
|
<?= html::purify(text::limit_chars($parent->title,
|
||||||
|
module::get_var("gallery", "visible_title_length"))) ?>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<? $i++ ?>
|
<? $i++ ?>
|
||||||
<? endforeach ?>
|
<? endforeach ?>
|
||||||
<li class="g-active<? if ($i == 0) print " g-first" ?>"><?= html::purify($theme->item()->title) ?></li>
|
<li class="g-active<? if ($i == 0) print " g-first" ?>">
|
||||||
|
<?= html::purify(text::limit_chars($theme->item()->title,
|
||||||
|
module::get_var("gallery", "visible_title_length"))) ?>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
</div>
|
</div>
|
||||||
|
Reference in New Issue
Block a user