diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-03-13 21:10:25 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-03-13 21:10:25 -0700 |
| commit | a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2 (patch) | |
| tree | 4e46b241a13ed0535c233dcb98d306f00d7a2a89 /themes | |
| parent | 23564554f2c81b6b72682eee1a26f0153cd55598 (diff) | |
| parent | a1b5cf2e8daa2b0205d58c5355bf57edcdd3821f (diff) | |
Merge pull request #202 from shadlaws/fix_2051
#2051 - Revise how Gallery_View returns combined JS and CSS.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 3 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 9a149149..ea7542f2 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -47,10 +47,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/page.html.php b/themes/wind/views/page.html.php index 0ae41ea7..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(), 100, "width")) != 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"> @@ -69,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> |