fix cookie

diff --git a/README b/README
index fdc586a2e8faf9b9db5d3e8f62fc2b6a4b11e4de..7a42a704ba93df9584dd83fbd480a7444806beec 100644 (file)
--- a/README
+++ b/README
@@ -10,6 +10,7 @@
   US-ASCII characters (even if I _don't_ advice you to store
   files with these)
 - clever use of the whole space of a typical browser window
+- cookie to remember the preferred size of thumbnails accross sub-albums
 - subalbums support (images in any subdirectory depth)
 
         frontend

diff --git a/bin/booh b/bin/booh
index baed8470abd9d674a61cefdf99a995ee3e90f183..5adf08713f549cb01b03c69e829b5f9a98732ae0 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -462,8 +462,6 @@ def walk_source_dir
                     type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
                     if type
                         html_thumbnails += run_iterations(iterations)
-                        html_thumbnails.gsub!(/~~theme~~/, $theme)
-                        html_thumbnails.gsub!(/~~current_size~~/, sizeobj['name'])
                         if type == 'image'
                             index = images.index(file)
                             html_thumbnails.gsub!(/~~image_iteration~~/,
@@ -492,6 +490,8 @@ def walk_source_dir
                 html_thumbnails += close_iterations(iterations)
                 for i in html
                     i.sub!(/~~thumbnails~~/, html_thumbnails)
+                    i.gsub!(/~~theme~~/, $theme)
+                    i.gsub!(/~~current_size~~/, sizeobj['name'])
                 end
                 ios = File.open("#{dest_dir}/thumbnails-#{sizeobj['name']}.html", "w")
                 ios.write(html)

diff --git a/lib/booh/html-merges.rb b/lib/booh/html-merges.rb
index 4ea0da4826db170d941c45487014f53a8763eb77..23b1d4fc4e097d1a54ff3a57e05a87649607fb46 100644 (file)
--- a/lib/booh/html-merges.rb
+++ b/lib/booh/html-merges.rb
@@ -99,6 +99,11 @@ function preload() {
 
 function init() {
 
+    var expires = new Date(new Date().getTime() + (30 * 86400000));  // 30 days
+    document.cookie = 'booh-preferred-size-~~theme~~=~~current_size~~'
+                      + '; expires=' + expires.toGMTString()
+                      + '; path=/';
+
     /* retrieve GET parameters */
     all_params = location.href.split("?")
     if (all_params.length > 1) {