From 384bc7afc86be706bf61def09afc8306cdad2443 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 2 Mar 2013 23:56:13 +0100
Subject: #2033 - Add Flowplayer 5 to play HTML5 videos. - add Flowplayer 5 to
 lib/flowplayer-html5 - move existing Flash Flowplayer to lib/flowplayer-flash
 - update page.html.php and movieplayer.html.php

--HG--
rename : lib/flowplayer.controls.swf => lib/flowplayer-flash/flowplayer.controls.swf
rename : lib/flowplayer.js => lib/flowplayer-flash/flowplayer.js
rename : lib/flowplayer.pseudostreaming-byterange.swf => lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
rename : lib/flowplayer.pseudostreaming.swf => lib/flowplayer-flash/flowplayer.pseudostreaming.swf
rename : lib/flowplayer.swf => lib/flowplayer-flash/flowplayer.swf
---
 themes/wind/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/wind/views')

diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 23021e4d..898b499d 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -56,7 +56,7 @@
     <?= $theme->script("jquery.scrollTo.js") ?>
     <?= $theme->script("gallery.show_full_size.js") ?>
     <? elseif ($theme->page_subtype == "movie"): ?>
-    <?= $theme->script("flowplayer.js") ?>
+    <?= $theme->script("flowplayer-flash/flowplayer.js") ?>
     <? endif ?>
 
     <?= $theme->head() ?>
-- 
cgit v1.2.3


From a517d9a33a47a2308cec1c9bfb1138abf181a909 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 4 Mar 2013 23:44:50 +0100
Subject: Follow-on to #2033 - Change variables and js script loading for Flash
 Flowplayer. - changed movie_img event variable names to have "flash" in them.
 - moved flowplayer.js loading from page.html.php to movieplayer-flash. -
 removed conditional loading for small, photo-specific JS files in
 page.html.php to keep combined JS consistent between page types (better for
 caching).

---
 modules/gallery/models/item.php                  | 10 +++++-----
 modules/gallery/views/movieplayer-flash.html.php |  5 +++--
 themes/wind/views/page.html.php                  |  6 ------
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'themes/wind/views')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 01da010e..e72265d3 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -762,15 +762,15 @@ class Item_Model_Core extends ORM_MPTT {
     //  - generate a view, which is used in place of the standard Flowplayer v3 player
     //    (use view variable)
     //  - alter the arguments sent to the standard player
-    //    (use fp_params and fp_config variables)
+    //    (use fp_flash_params and fp_flash_config variables)
     $movie_img = new stdClass();
     $movie_img->max_size = $max_size;
     $movie_img->width = $width;
     $movie_img->height = $height;
     $movie_img->attrs = $attrs;
     $movie_img->url = $this->file_url(true);
-    $movie_img->fp_params = array(); // additional Flowplayer params values (will be json encoded)
-    $movie_img->fp_config = array(); // additional Flowplayer config values (will be json encoded)
+    $movie_img->fp_flash_params = array(); // add'l Flowplayer params values (will be json encoded)
+    $movie_img->fp_flash_config = array(); // add'l Flowplayer config values (will be json encoded)
     $movie_img->view = array();
     module::event("movie_img", $movie_img, $this);
 
@@ -790,8 +790,8 @@ class Item_Model_Core extends ORM_MPTT {
         $view->height = $movie_img->height;
         $view->attrs = $movie_img->attrs;
         $view->url = $movie_img->url;
-        $view->fp_params = $movie_img->fp_params;
-        $view->fp_config = $movie_img->fp_config;
+        $view->fp_flash_params = $movie_img->fp_flash_params;
+        $view->fp_flash_config = $movie_img->fp_flash_config;
       } else {
         // Filetype NOT supported by Flowplayer v3 - display download link
         $attrs = array_merge($attrs, array("style" => "width: {$max_size}px;",
diff --git a/modules/gallery/views/movieplayer-flash.html.php b/modules/gallery/views/movieplayer-flash.html.php
index 6d3cee2a..12303bf4 100644
--- a/modules/gallery/views/movieplayer-flash.html.php
+++ b/modules/gallery/views/movieplayer-flash.html.php
@@ -1,4 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript" src="<?= url::file("lib/flowplayer-flash/flowplayer.js") ?>"></script>
 <?= html::anchor($url, "", $attrs) ?>
 <script type="text/javascript">
   var id = "<?= $attrs["id"] ?>";
@@ -23,7 +24,7 @@
       "src": "<?= url::abs_file("lib/flowplayer-flash/flowplayer.swf") ?>",
       "wmode": "transparent",
       "provider": "pseudostreaming"
-    }, <?= json_encode($fp_params) ?>),
+    }, <?= json_encode($fp_flash_params) ?>),
     $.extend(true, {
       "plugins": {
         "pseudostreaming": {
@@ -42,7 +43,7 @@
           set_movie_size(parseInt(clip.metaData.width), parseInt(clip.metaData.height));
         }
       }
-    }, <?= json_encode($fp_config) ?>)
+    }, <?= json_encode($fp_flash_config) ?>)
   ).ipad();
   // set movie size using width and height passed from movie_img function
   $("document").ready(set_movie_size(<?= $width ?>, <?= $height ?>));
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 898b499d..1bb329df 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -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-flash/flowplayer.js") ?>
-    <? endif ?>
 
     <?= $theme->head() ?>
 
-- 
cgit v1.2.3


From bae14a76e52524e2157948bf30cfe3340d1e9a94 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 14:42:43 +0100
Subject: Themes can set minimum thumbnail size when calculating proportions.

This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 5 +++--
 themes/wind/views/page.html.php          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'themes/wind/views')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 0a4c96e1..16c57794 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -60,9 +60,10 @@ class Theme_View_Core extends Gallery_View {
   /**
    * Proportion of the current thumb_size's to default
    * @param object Item_Model (optional) check the proportions for this item
+   * @param int               (optional) minimum thumbnail width
    * @return int
    */
-  public function thumb_proportion($item=null) {
+  public function thumb_proportion($item=null, $minimum_size=0) {
     // If the item is an album with children, grab the first item in that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
@@ -74,7 +75,7 @@ class Theme_View_Core extends Gallery_View {
     // proportion based on the global thumbnail size, but since modules can override that, we
     // return the actual proportions when we have them.
     if ($item && $item->has_thumb()) {
-      return max($item->thumb_width, $item->thumb_height) / 200;
+      return max($item->thumb_width, $item->thumb_height, $minimum_size) / 200;
     } else {
       // @TODO change the 200 to a theme supplied value when and if we come up with an
       // API to allow the theme to set defaults.
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1bb329df..1dbb31c0 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)) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
-- 
cgit v1.2.3


From 3c47deb9ef3fd35b1602c822af2b752c6733bed3 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 15:59:00 +0100
Subject: Themes can choose child thumbnail when asking for proportion.

This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 21 +++++++++++++++++----
 themes/wind/views/page.html.php          |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'themes/wind/views')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 16c57794..da1e8ce8 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -58,17 +58,30 @@ class Theme_View_Core extends Gallery_View {
   }
 
   /**
-   * Proportion of the current thumb_size's to default
+   * Proportion of the current thumb_size's to default.
+   *
+   * Themes can optionally use the $dimension parameter to choose which of the album's
+   * children will be used to determine the proportion.  If set, the proportion will be
+   * calculated based on the child item with the largest width or height.
+   *
    * @param object Item_Model (optional) check the proportions for this item
    * @param int               (optional) minimum thumbnail width
+   * @param string            (optional) "width" or "height"
    * @return int
    */
-  public function thumb_proportion($item=null, $minimum_size=0) {
-    // If the item is an album with children, grab the first item in that album instead.  We're
+  public function thumb_proportion($item=null, $minimum_size=0, $dimension=null) {
+    if (!in_array($dimension, array("height", "width"))) {
+      $dimension = null;
+    }
+
+    // If the item is an album with children, grab an item from that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
     if ($item && $item->is_album() && $item->children_count()) {
-      $item = $item->children(1)->current();
+      $orderBy = (is_null($dimension)) ? array()
+                                       : array("thumb_".$dimension => "desc");
+
+      $item = $item->children(1, null, array(), $orderBy)->current();
     }
 
     // By default we have a globally fixed thumbnail size In core code, we just return a fixed
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1dbb31c0..0ae41ea7 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)) != 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">
-- 
cgit v1.2.3


From 2e94edab5396d53b1b09b6b1415d1f66d6f16de5 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 11 Mar 2013 17:16:20 +0100
Subject: #2053 - Change all .bind() to .on() for jQuery future-proofing. -
 on/off are preferred to bind/unbind, live/die, and delegate/undelegate in
 jQuery 1.7+ - they're likely on the road toward deprecation, so let's replace
 them now.

---
 lib/gallery.common.js               | 4 ++--
 modules/server_add/js/server_add.js | 2 +-
 themes/wind/js/ui.init.js           | 2 +-
 themes/wind/views/photo.html.php    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'themes/wind/views')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 5ff6b397..f5dee958 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -212,7 +212,7 @@
       }
 
       // Attach event listeners to the input
-      input.bind("focus", function(e) {
+      input.on("focus", function(e) {
         // Empty input value if it equals it's label
         if ($(this).val() == label.html()) {
           $(this).val("");
@@ -220,7 +220,7 @@
         button.attr("disabled", false);
       });
 
-      input.bind("blur", function(e){
+      input.on("blur", function(e) {
         // Reset the input value if it's empty
         if ($(this).val() == "") {
           $(this).val(label.html());
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 02dda4c0..a2499896 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -33,7 +33,7 @@
        $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#g-dialog").bind("dialogclose", function(event, ui) {
+       $("#g-dialog").on("dialogclose", function(event, ui) {
          window.location.reload();
        });
      },
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index fd75c210..4f901778 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -83,7 +83,7 @@ $(document).ready(function() {
     );
 
     // Realign any thumbnails that change so that when we rotate a thumb it stays centered.
-    $(".g-item").bind("gallery.change", function() {
+    $(".g-item").on("gallery.change", function() {
       $(".g-item").each(function() {
         $(this).height($(this).find("img").height() + 2);
       });
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index b42ab987..1fab71e1 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",
-- 
cgit v1.2.3


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).

---
 modules/gallery/libraries/Gallery_View.php | 130 +++++++++++++++++------------
 modules/gallery/tests/xss_data.txt         |  48 +++++------
 themes/admin_wind/views/admin.html.php     |   3 -
 themes/wind/views/page.html.php            |   5 +-
 4 files changed, 101 insertions(+), 85 deletions(-)

(limited to 'themes/wind/views')

diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 8f02b53c..3f59db6a 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -82,10 +82,9 @@ class Gallery_View_Core extends View {
    * @param $types  a comma separated list of types to combine, eg "script,css"
    */
   public function start_combining($types) {
-    if (gallery::allow_css_and_js_combining()) {
-      foreach (explode(",", $types) as $type) {
-        $this->combine_queue[$type] = array();
-      }
+    foreach (explode(",", $types) as $type) {
+      // Initialize the core group so it gets included first.
+      $this->combine_queue[$type] = array("core" => array());
     }
   }
 
@@ -135,70 +134,93 @@ class Gallery_View_Core extends View {
   /**
    * Combine a series of files into a single one and cache it in the database.
    * @param $type  the data type (script or css)
-   * @param $group the group of scripts or css we want
+   * @param $group the group of scripts or css we want (null will combine all groups)
    */
-  public function get_combined($type, $group="core") {
-    $links = array();
-
-    if (empty($this->combine_queue[$type][$group])) {
-      return;
+  public function get_combined($type, $group=null) {
+    if (is_null($group)) {
+      $groups = array_keys($this->combine_queue[$type]);
+    } else {
+      $groups = array($group);
     }
 
-    // Include the url in the cache key so that if the Gallery moves, we don't use old cached
-    // entries.
-    $key = array(url::abs_file(""));
+    $buf = "";
+    foreach ($groups as $group) {
+      if (empty($this->combine_queue[$type][$group])) {
+        continue;
+      }
 
-    foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
-      $stats = stat($path);
-      // 7 == size, 9 == mtime, see http://php.net/stat
-      $key[] = "$path $stats[7] $stats[9]";
-    }
+      // Include the url in the cache key so that if the Gallery moves, we don't use old cached
+      // entries.
+      $key = array(url::abs_file(""));
+      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+        $stats = stat($path);
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key[] = "$path $stats[7] $stats[9]";
+      }
+      $key = md5(join(" ", $key));
 
-    $key = md5(join(" ", $key));
-    $cache = Cache::instance();
-    $contents = $cache->get($key);
+      if (gallery::allow_css_and_js_combining()) {
+        // Combine enabled - if we're at the start of the buffer, add a comment.
+        if (!$buf) {
+          $type_text = ($type == "css") ? "CSS" : "JS";
+          $buf .= "<!-- LOOKING FOR YOUR $type_text? It's all been combined into the link(s) below -->\n";
+        }
 
-    if (empty($contents)) {
-      $combine_data = new stdClass();
-      $combine_data->type = $type;
-      $combine_data->contents = $this->combine_queue[$type][$group];
-      module::event("before_combine", $combine_data);
+        $cache = Cache::instance();
+        $contents = $cache->get($key);
 
-      $contents = "";
-      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
-        if ($type == "css") {
-          $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
-        } else {
-          $contents .= "/* $path */\n" . file_get_contents($path) . "\n";
-        }
-      }
+        if (empty($contents)) {
+          $combine_data = new stdClass();
+          $combine_data->type = $type;
+          $combine_data->contents = $this->combine_queue[$type][$group];
+          module::event("before_combine", $combine_data);
 
-      $combine_data = new stdClass();
-      $combine_data->type = $type;
-      $combine_data->contents = $contents;
-      module::event("after_combine", $combine_data);
+          $contents = "";
+          foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+            if ($type == "css") {
+              $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
+            } else {
+              $contents .= "/* $path */\n" . file_get_contents($path) . "\n";
+            }
+          }
 
-      $cache->set($key, $combine_data->contents, array($type), 30 * 84600);
+          $combine_data = new stdClass();
+          $combine_data->type = $type;
+          $combine_data->contents = $contents;
+          module::event("after_combine", $combine_data);
 
-      $use_gzip = function_exists("gzencode") &&
-        (int) ini_get("zlib.output_compression") === 0;
-      if ($use_gzip) {
-        $cache->set("{$key}_gz", gzencode($combine_data->contents, 9, FORCE_GZIP),
-                    array($type, "gzip"), 30 * 84600);
-      }
+          $cache->set($key, $combine_data->contents, array($type), 30 * 84600);
 
-    }
+          $use_gzip = function_exists("gzencode") &&
+            (int) ini_get("zlib.output_compression") === 0;
+          if ($use_gzip) {
+            $cache->set("{$key}_gz", gzencode($combine_data->contents, 9, FORCE_GZIP),
+                        array($type, "gzip"), 30 * 84600);
+          }
+        }
 
-    unset($this->combine_queue[$type][$group]);
-    if (empty($this->combine_queue[$type])) {
-      unset($this->combine_queue[$type]);
-    }
+        if ($type == "css") {
+          $buf .= html::stylesheet("combined/css/$key", "screen,print,projection", true);
+        } else {
+          $buf .= html::script("combined/javascript/$key", true);
+        }
+      } else {
+        // Don't combine - just return the CSS and JS links (with the key as a cache buster).
+        foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+          if ($type == "css") {
+            $buf .= html::stylesheet("$path?m=$key", "screen,print,projection", false);
+          } else {
+            $buf .= html::script("$path?m=$key", false);
+          }
+        }
+      }
 
-    if ($type == "css") {
-      return html::stylesheet("combined/css/$key", "screen,print,projection", true);
-    } else {
-      return html::script("combined/javascript/$key", true);
+      unset($this->combine_queue[$type][$group]);
+      if (empty($this->combine_queue[$type])) {
+        unset($this->combine_queue[$type]);
+      }
     }
+    return $buf;
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 5daaa371..2152858a 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -388,19 +388,19 @@ modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $url
 themes/admin_wind/views/admin.html.php                       4   DIRTY    $theme->html_attributes()
 themes/admin_wind/views/admin.html.php                       34  DIRTY    $theme->admin_head()
 themes/admin_wind/views/admin.html.php                       46  DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php                       51  DIRTY    $theme->get_combined("css")
-themes/admin_wind/views/admin.html.php                       54  DIRTY    $theme->get_combined("script")
-themes/admin_wind/views/admin.html.php                       58  DIRTY    $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php                       66  DIRTY    $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php                       67  DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php                       70  DIRTY    $theme->user_menu()
-themes/admin_wind/views/admin.html.php                       73  DIRTY    $theme->admin_menu()
-themes/admin_wind/views/admin.html.php                       76  DIRTY    $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php                       83  DIRTY    $content
-themes/admin_wind/views/admin.html.php                       89  DIRTY    $sidebar
-themes/admin_wind/views/admin.html.php                       94  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       97  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       102 DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       50  DIRTY    $theme->get_combined("css")
+themes/admin_wind/views/admin.html.php                       51  DIRTY    $theme->get_combined("script")
+themes/admin_wind/views/admin.html.php                       55  DIRTY    $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php                       63  DIRTY    $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php                       64  DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php                       67  DIRTY    $theme->user_menu()
+themes/admin_wind/views/admin.html.php                       70  DIRTY    $theme->admin_menu()
+themes/admin_wind/views/admin.html.php                       73  DIRTY    $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php                       80  DIRTY    $content
+themes/admin_wind/views/admin.html.php                       86  DIRTY    $sidebar
+themes/admin_wind/views/admin.html.php                       91  DIRTY    $theme->admin_footer()
+themes/admin_wind/views/admin.html.php                       94  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       99  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id
@@ -436,17 +436,17 @@ themes/wind/views/page.html.php                              32  DIRTY    $new_w
 themes/wind/views/page.html.php                              33  DIRTY    $new_height
 themes/wind/views/page.html.php                              34  DIRTY    $thumb_proportion
 themes/wind/views/page.html.php                              68  DIRTY_JS $theme->url()
-themes/wind/views/page.html.php                              73  DIRTY    $theme->get_combined("css")
-themes/wind/views/page.html.php                              76  DIRTY    $theme->get_combined("script")
-themes/wind/views/page.html.php                              86  DIRTY    $header_text
-themes/wind/views/page.html.php                              88  DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php                              92  DIRTY    $theme->user_menu()
-themes/wind/views/page.html.php                              107 DIRTY_ATTR $breadcrumb->last?"g-active":""
-themes/wind/views/page.html.php                              108 DIRTY_ATTR $breadcrumb->first?"g-first":""
-themes/wind/views/page.html.php                              109 DIRTY_JS $breadcrumb->url
-themes/wind/views/page.html.php                              122 DIRTY    $content
-themes/wind/views/page.html.php                              128 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              135 DIRTY    $footer_text
+themes/wind/views/page.html.php                              72  DIRTY    $theme->get_combined("css")
+themes/wind/views/page.html.php                              73  DIRTY    $theme->get_combined("script")
+themes/wind/views/page.html.php                              83  DIRTY    $header_text
+themes/wind/views/page.html.php                              85  DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php                              89  DIRTY    $theme->user_menu()
+themes/wind/views/page.html.php                              104 DIRTY_ATTR $breadcrumb->last?"g-active":""
+themes/wind/views/page.html.php                              105 DIRTY_ATTR $breadcrumb->first?"g-first":""
+themes/wind/views/page.html.php                              106 DIRTY_JS $breadcrumb->url
+themes/wind/views/page.html.php                              119 DIRTY    $content
+themes/wind/views/page.html.php                              125 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              132 DIRTY    $footer_text
 themes/wind/views/paginator.html.php                         33  DIRTY_JS $first_page_url
 themes/wind/views/paginator.html.php                         42  DIRTY_JS $previous_page_url
 themes/wind/views/paginator.html.php                         70  DIRTY_JS $next_page_url
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