diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-09 06:50:19 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-09 06:50:19 -0800 |
| commit | 0dbf0d51733aa3ef7840a23aeac6dfbe92d014e2 (patch) | |
| tree | 23b3d703de834a7dd726ce11e90b47eac3b90a28 /themes/wind/views | |
| parent | 6d57d4308bb2e82d41f9a4667ab35748854d7143 (diff) | |
| parent | 6ddbef3dcd3ee34e622bc7286ebf138b7ef1ffaa (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'themes/wind/views')
| -rw-r--r-- | themes/wind/views/movie.html.php | 15 | ||||
| -rw-r--r-- | themes/wind/views/pager.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/photo.html.php | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 9254c7fe..d91ffbc5 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -2,7 +2,7 @@ <div id="g-item"> <?= $theme->photo_top() ?> - <ul class="g-pager"> + <ul class="g-pager ui-helper-clearfix"> <li> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> @@ -13,7 +13,7 @@ <? endif; ?> </li> <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> - <li class="g-txt-right"> + <li class="g-text-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a> @@ -24,14 +24,15 @@ </li> </ul> - - <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> - + <div id="g-movie" class="ui-helper-clearfix"> + <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> + <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?> + </div> + <div id="g-info"> <h1><?= html::purify($item->title) ?></h1> - <div><?= nl2br(html::purify($item->description)) ?></div> + <div><?= nl2br(html::purify($item->description)) ?></div> </div> <?= $theme->photo_bottom() ?> - <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?> </div> diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index 36b2c13f..1dfe7eac 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -25,7 +25,7 @@ <? endif ?> </li> <li class="g-info"><?= $from_to_msg ?></li> - <li class="g-txt-right"> + <li class="g-text-right"> <? if ($next_page): ?> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index cee44134..e17dcdb3 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -26,7 +26,7 @@ <? endif; ?> </li> <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> - <li class="g-txt-right"> + <li class="g-text-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> |