diff options
| -rw-r--r-- | themes/default/css/screen.css | 31 | ||||
| -rw-r--r-- | themes/default/views/pager.html.php | 30 | ||||
| -rw-r--r-- | themes/default/views/photo.html.php | 20 |
3 files changed, 56 insertions, 25 deletions
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 18395db6..1288e7b6 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -110,8 +110,6 @@ td { vertical-align: top; } - - /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ fieldset { @@ -233,6 +231,10 @@ li.gError select { margin: 1em 0 1em 1em; } +.txtright { + text-align: right; +} + /** ******************************************************************* * 3) Reusable content blocks *********************************************************************/ @@ -460,6 +462,15 @@ form p.gError { /* Individual photo content ~~~~~~~~~~~~~~ */ +#gContent #gItem { + width: 99%; +} + +#gContent #gItem .gFullSizeLink img { + display: block; + margin: 1em auto !important; +} + #gContent #gComments { margin-top: 2em; } @@ -685,20 +696,22 @@ form p.gError { /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gPager { + #gPager { clear: both; - padding: 5px; + margin: 0; + padding: 5px 0 !important; + width: 100%; } #gPager li { float: left; - margin-right: 1em; + margin: 0; + width: 25%; } -#gPager li span { - display: inline-block; - height: 1em; - width: 16px; +#gPager .gInfo { + text-align: center; + width: 50%; } /** ******************************************************************* diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php index dd702086..de865090 100644 --- a/themes/default/views/pager.html.php +++ b/themes/default/views/pager.html.php @@ -6,25 +6,37 @@ array("from_number" => $current_first_item, "to_number" => $current_last_item, "total" => $total_items)) ?> - <li><?= $from_to_msg ?></li> + <li> <? if ($first_page): ?> - <li><span class="ui-icon ui-icon-seek-first"></span><a href="<?= str_replace('{page}', 1, $url) ?>"><?= t("first") ?></a></li> + <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a> <? else: ?> - <li class="inactive"><span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></li> + <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all"> + <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a> <? endif ?> <? if ($previous_page): ?> - <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= str_replace('{page}', $previous_page, $url) ?>"><?= t("previous") ?></a></li> + <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <? else: ?> - <li class="inactive"><span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></li> + <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all"> + <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <? endif ?> + </li> + <li class="gInfo"><?= $from_to_msg ?></li> + <li class="txtright"> <? if ($next_page): ?> - <li><a href="<?= str_replace('{page}', $next_page, $url) ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li> + <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> <? else: ?> - <li class="inactive"><?= t("next") ?><span class="ui-icon ui-icon-seek-next"></span></li> + <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all"> + <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> <? endif ?> <? if ($last_page): ?> - <li><a href="<?= str_replace('{page}', $last_page, $url) ?>"><?= t("last") ?></a><span class="ui-icon ui-icon-seek-end"></span></li> + <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a> <? else: ?> - <li class="inactive"><?= t("last") ?><span class="ui-icon ui-icon-seek-end"></span></li> + <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all"> + <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a> <? endif ?> + </li> </ul> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 666fa9ee..ec7a0576 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -3,13 +3,19 @@ <?= $theme->photo_top() ?> <ul id="gPager"> - <li><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> - <? if ($previous_item): ?> - <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= $previous_item->url() ?>"><?= t("previous") ?></a></li> - <? endif ?> - <? if ($next_item): ?> - <li><a href="<?= $next_item->url() ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li> - <? endif ?> + <li> + <? if ($previous_item): ?> + <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> + <? endif; ?> + </li> + <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> + <li class="txtright"> + <? if ($next_item): ?> + <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> + <? endif ?> + </li> </ul> <a href="#" class="gFullSizeLink" title="<?= t("View full size") ?>"><?= $item->resize_tag(array("id" => "gPhotoId-{$item->id}")) ?></a> |