diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-03-19 16:41:42 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-03-19 16:41:42 +0000 |
| commit | 3908e37d965fa76ea774e76ddf42365a872a5f27 (patch) | |
| tree | 457e1a1e465f83855eee96ba287cd91f1623395c /themes/wind/views | |
| parent | 711651f727e093cc7357a6bbff6bd992fd6dfd80 (diff) | |
| parent | 1eab94f6062b5f54ea5d9db01d968e7195f3de9d (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'themes/wind/views')
| -rw-r--r-- | themes/wind/views/page.html.php | 11 | ||||
| -rw-r--r-- | themes/wind/views/photo.html.php | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 23021e4d..e2fc516a 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -24,7 +24,7 @@ <link rel="apple-touch-icon-precomposed" href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" /> <? if ($theme->page_type == "collection"): ?> - <? if (($thumb_proportion = $theme->thumb_proportion($theme->item())) != 1): ?> + <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100, "width")) != 1): ?> <? $new_width = round($thumb_proportion * 213) ?> <? $new_height = round($thumb_proportion * 240) ?> <style type="text/css"> @@ -50,14 +50,8 @@ <?= $theme->script("gallery.dialog.js") ?> <?= $theme->script("superfish/js/superfish.js") ?> <?= $theme->script("jquery.localscroll.js") ?> - - <? /* These are page specific but they get combined */ ?> - <? if ($theme->page_subtype == "photo"): ?> <?= $theme->script("jquery.scrollTo.js") ?> <?= $theme->script("gallery.show_full_size.js") ?> - <? elseif ($theme->page_subtype == "movie"): ?> - <?= $theme->script("flowplayer.js") ?> - <? endif ?> <?= $theme->head() ?> @@ -75,10 +69,7 @@ media="screen,print,projection" /> <![endif]--> - <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below --> <?= $theme->get_combined("css") ?> - - <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> <?= $theme->get_combined("script") ?> </head> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index 92eb08f5..c7659b55 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -12,7 +12,7 @@ // After the image is rotated or replaced we have to reload the image dimensions // so that the full size view isn't distorted. - $("#g-photo").bind("gallery.change", function() { + $("#g-photo").on("gallery.change", function() { $.ajax({ url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>", dataType: "json", |