From a1b5cf2e8daa2b0205d58c5355bf57edcdd3821f Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Tue, 12 Mar 2013 15:00:59 +0100
Subject: #2051 - Revise how Gallery_View returns combined JS and CSS. Changed
 Gallery_View's JS and CSS combining to: - have get_combined() combine all
 groups if called without arguments. - ensure the "core" group is combined
 first. - always put links where get_combined() is called, even if combining
 is disabled (otherwise the order isn't preserved). - add key as cache buster
 when combining is disabled. - make "LOOKING FOR YOUR CSS/JAVASCRIPT..."
 comments in get_combined(), not in the theme itself. Also, revised
 xss_data.txt golden file (line number changes only).

---
 themes/admin_wind/views/admin.html.php | 3 ---
 themes/wind/views/page.html.php        | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'themes')

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>
 
-- 
cgit v1.2.3