Merge the updates from wind
This commit is contained in:
parent
9b9f46fce4
commit
70d29022e7
@ -4,5 +4,5 @@ version = 1
|
||||
author = "RLD"
|
||||
site = 1
|
||||
admin = 0
|
||||
;wind commit = 1240878df0f4a2b0ad0cdb32814717038ff2773f
|
||||
;wind date = Fri May 14 16:55:15 2010 -0700
|
||||
;wind commit = 2bbce8dddb0ab0a00aee727e2f639b793988a1d1
|
||||
;wind date = Thu Jun 17 09:10:01 2010 -0700
|
||||
|
@ -5,7 +5,9 @@
|
||||
<?= $theme->paginator() ?>
|
||||
|
||||
<div id="g-movie" class="ui-helper-clearfix">
|
||||
<?= $theme->resize_top($item) ?>
|
||||
<?= $item->movie_img(array("class" => "g-movie", "id" => "g-item-id-{$item->id}")) ?>
|
||||
<?= $theme->resize_bottom($item) ?>
|
||||
</div>
|
||||
|
||||
<div id="g-info">
|
||||
|
@ -76,7 +76,7 @@
|
||||
<?= $theme->user_menu() ?>
|
||||
<?= $theme->header_top() ?>
|
||||
|
||||
<!-- hide the menu and make it visible after the page has loaded, to minimize menu flicker -->
|
||||
<!-- hide the menu until after the page has loaded, to minimize menu flicker -->
|
||||
<div id="g-site-menu" style="visibility: hidden">
|
||||
<?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
|
||||
</div>
|
||||
@ -95,9 +95,7 @@
|
||||
the immediate parent so that when you go back up a
|
||||
level you're on the right page. -->
|
||||
<a href="<?= $parent->url($parent == $theme->item()->parent() ?
|
||||
"show={$theme->item()->id}" : null) ?>">
|
||||
<?= html::purify($parent->title) ?>
|
||||
</a>
|
||||
"show={$theme->item()->id}" : null) ?>"><?= html::purify($parent->title) ?></a>
|
||||
</li>
|
||||
<? $i++ ?>
|
||||
<? endforeach ?>
|
||||
|
Reference in New Issue
Block a user