diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 3 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 4 | ||||
| -rw-r--r-- | themes/wind/views/photo.html.php | 15 |
3 files changed, 18 insertions, 4 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 81b1a896..eda79b97 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -191,7 +191,8 @@ th { .g-unavailable { border-color: #999; - opacity: 0.4; + color: black; + opacity: .6; } .g-info td { diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 4938ed60..e620d652 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -105,9 +105,9 @@ // containing that photo. For now, we just do it for // 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() ? + <a href="<?= $parent->url($parent->id == $theme->item()->parent_id ? "show={$theme->item()->id}" : null) ?>"> - <!-- limit the title length to something reasonable (defaults to 15) --> + <? // 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> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index f8b5511c..cb830e23 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -4,10 +4,23 @@ <!-- Use javascript to show the full size as an overlay on the current page --> <script type="text/javascript"> $(document).ready(function() { + full_dims = [<?= $theme->item()->width ?>, <?= $theme->item()->height ?>]; $(".g-fullsize-link").click(function() { - $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>"); + $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, full_dims[0], full_dims[1]); return false; }); + + // After the image is rotated or replaced we have to reload the image dimensions + // so that the full size view isn't distorted. + gallery_image_replaced_hook = function(data, thumb) { + $.ajax({ + url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>", + dataType: "json", + success: function(data, textStatus) { + full_dims = data.full; + } + }); + } }); </script> <? endif ?> |