add flash video support with flowplayer
authorGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 31 Dec 2009 17:35:37 +0000 (18:35 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 31 Dec 2009 17:35:37 +0000 (18:35 +0100)
34 files changed:
AUTHORS
INSTALL
README
VERSION
bin/booh
bin/booh-backend
data/booh/themes/cardu/metadata/parameters.rb
data/booh/themes/cardu/root/booh.css
data/booh/themes/cardu/root/booh.js
data/booh/themes/cardu/root/play_video.png [new file with mode: 0644]
data/booh/themes/cardu/root/video.png [deleted file]
data/booh/themes/cardu/skeleton_image.html
data/booh/themes/cardu/skeleton_thumbnails.html
data/booh/themes/dark/root/booh.js
data/booh/themes/dark/root/play_video.png [new file with mode: 0644]
data/booh/themes/dark/root/video.png [deleted file]
data/booh/themes/dark/skeleton_image.html
data/booh/themes/dark/skeleton_thumbnails.html
data/booh/themes/sbs/root/booh.js
data/booh/themes/sbs/root/play_video.png [new file with mode: 0644]
data/booh/themes/sbs/root/video.png [deleted file]
data/booh/themes/sbs/skeleton_image.html
data/booh/themes/sbs/skeleton_thumbnails.html
data/booh/themes/simple/root/booh.css
data/booh/themes/simple/root/booh.js
data/booh/themes/simple/root/play_video.png [new file with mode: 0644]
data/booh/themes/simple/root/video.png [deleted file]
data/booh/themes/simple/skeleton_image.html
data/booh/themes/simple/skeleton_thumbnails.html
flowplayer/LICENSE.txt [new file with mode: 0644]
flowplayer/flowplayer-3.1.4.min.js [new file with mode: 0644]
flowplayer/flowplayer-3.1.5.swf [new file with mode: 0644]
flowplayer/flowplayer.controls-3.1.5.swf [new file with mode: 0644]
lib/booh/html-merges.rb

diff --git a/AUTHORS b/AUTHORS
index 472de6027c944b5ced0eeaab3d4acaa2a8f1f2c8..0b7196de36248851eda7caa97f32e5b1662c9604 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,8 @@ Javascript and CSS sharing contributed by Jean-Michel Schelcher
 
 album2booh contributed by Stephane Fillod.
 
+uses flowplayer (which is GPLv3) to play embedded flash videos
+
 artwork:
 Ayo73 http://www.73lab.com/
 
diff --git a/INSTALL b/INSTALL
index ee1c6a8fa8356ef5a044df5629dddbf6ce960b81..a259b813f2c88a0cb736828ff01c19df1f641b5d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -24,6 +24,8 @@ And for runtime:
 - identify (from ImageMagick) - for photos captions
 - exif - to show full formatted EXIF information from photos
 - mplayer - for videos thumbnails generation
+- ffmpeg (with mp3lame compiled in) - for generating embedded
+  .flv videos, to use with flowplayer (may not be a hard require)
 - gimp - for photos editing (may not be a hard require)
 - mozilla-firefox - for showing albums in browser, and going on the
   web for tutorials (may not be a hard require)
diff --git a/README b/README
index 2a43615ec65809a7990b3e9fb94c87e8c16cc139..2d8204e196cc0b985d0f24338cbdd957be3d992c 100644 (file)
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ Highlights:
 - immediate display of next image (preloading of next images)
 - keep position in browser between images (no page load between images)
 - multiproc support (parallelize image creations)
-- advanced videos support (thumbnail etc)
+- advanced videos support (thumbnail, embedded flash playback etc)
 - correctly handle files and directories with spaces and non
   US-ASCII characters (even if I _don't_ advice you to store
   files with these)
diff --git a/VERSION b/VERSION
index e3097aeba6cbd7b64d92c81e023a3a210df82659..38f8e886e1a6d733aa9bfa7282568f83c133ecd6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.2.2
+dev
index bb60420779fc1089edef1ff0272796bc49a0d0cf..e034207b0351ca05ba933e8262df2d16ba1a12ef 100644 (file)
--- a/bin/booh
+++ b/bin/booh
@@ -126,6 +126,8 @@ def read_config
     $config['video-viewer'] ||= '/usr/bin/mplayer %f'
     $config['image-editor'] ||= '/usr/bin/gimp-remote %f || /usr/bin/gimp %f'
     $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f || /usr/bin/firefox %f"
+    $config['use-flv'] ||= "true"
+    $config['flv-generator'] ||= "/usr/bin/ffmpeg -i %f -b 800k -ar 22050 -ab 32k %o"
     $config['comments-format'] ||= '%t'
     if !FileTest.directory?(File.expand_path('~/.booh'))
         system("mkdir ~/.booh")
@@ -144,6 +146,29 @@ def read_config
     $todelete = []
 end
 
+def check_config_preferences_dep
+    viewer_binary = $config['video-viewer'].split.first
+    if viewer_binary && !File.executable?(viewer_binary)
+        show_popup($main_window, utf8(_("The configured video viewer seems to be unavailable.
+You should fix this in Edit/Preferences so that you can view videos.
+
+Problem was: '%s' is not an executable file.
+Hint: don't forget to specify the full path to the executable,
+e.g. '/usr/bin/mplayer' is correct but 'mplayer' only is not.") % viewer_binary), { :pos_centered => true, :not_transient => true })
+    end
+
+    flv_generator_binary = $config['use-flv'] == 'true' && $config['flv-generator'].split.first
+    if flv_generator_binary && !File.executable?(flv_generator_binary)
+        show_popup($main_window, utf8(_("The configured .flv generator seems to be unavailable.
+You should fix this in Edit/Preferences so that you can have working
+embedded flash videos.
+
+Problem was: '%s' is not an executable file.
+Hint: don't forget to specify the full path to the executable,
+e.g. '/usr/bin/ffmpeg' is correct but 'ffmpeg' only is not.") % flv_generator_binary), { :pos_centered => true, :not_transient => true })
+    end
+end
+
 def check_config
     if !system("which convert >/dev/null 2>/dev/null")
         show_popup($main_window, utf8(_("The program 'convert' is needed. Please install it.
@@ -162,15 +187,7 @@ It is generally available with the 'ImageMagick' software package.")), { :pos_ce
         show_popup($main_window, utf8(_("The following program(s) are needed to handle videos: '%s'. Videos will be ignored.") % missing.join(', ')), { :pos_centered => true })
     end
 
-    viewer_binary = $config['video-viewer'].split.first
-    if viewer_binary && !File.executable?(viewer_binary)
-        show_popup($main_window, utf8(_("The configured video viewer seems to be unavailable.
-You should fix this in Edit/Preferences so that you can view videos.
-
-Problem was: '%s' is not an executable file.
-Hint: don't forget to specify the full path to the executable,
-e.g. '/usr/bin/mplayer' is correct but 'mplayer' only is not.") % viewer_binary), { :pos_centered => true, :not_transient => true })
-    end
+    check_config_preferences_dep
 end
 
 def check_image_editor
@@ -3112,6 +3129,9 @@ def additional_booh_options
     if $config['transcode-videos']
         options += "--transcode-videos '#{$config['transcode-videos']}' "
     end
+    if $config['use-flv'] == 'true'
+        options += "--flv-generator '#{$config['flv-generator']}' "
+    end
     return options
 end
 
@@ -3937,6 +3957,15 @@ for example: /usr/bin/gimp-remote %f")), nil)
     tooltips.set_tip(browser_entry, utf8(_("Use %f to specify the filename;
 for example: /usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f")), nil)
 
+    table_counter += 1
+    tbl.attach(Gtk::Alignment.new(1, 0.5, 0, 0).add(flv_check = Gtk::CheckButton.new(utf8(_("Use embedded flash player for videos,\nand use this .flv generator:")))),
+               0, 1, table_counter, table_counter + 1, Gtk::FILL, Gtk::SHRINK, 2, 2)
+    tbl.attach(Gtk::Alignment.new(0, 0.5, 1, 0).add(flv_generator_entry = Gtk::Entry.new.set_text($config['flv-generator']).set_sensitive(false)),
+               1, 2, table_counter, table_counter + 1, Gtk::FILL, Gtk::SHRINK, 2, 2)
+    tooltips.set_tip(flv_check, utf8(_("Flowplayer will be used for embedded video playback")), nil)
+    tooltips.set_tip(flv_generator_entry, utf8(_("Use %f to specify the input filename, %o the output filename;
+for example: /usr/bin/ffmpeg -i %f -b ${i}k -ar 22050 -ab 32k %o")), nil)
+
     table_counter += 1
     tbl.attach(Gtk::Alignment.new(1, 0.5, 0, 0).add(smp_check = Gtk::CheckButton.new(utf8(_("Use symmetric multi-processing")))),
                0, 1, table_counter, table_counter + 1, Gtk::FILL, Gtk::SHRINK, 2, 2)
@@ -3954,6 +3983,12 @@ for example: /usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/b
                0, 2, table_counter, table_counter + 1, Gtk::FILL, Gtk::SHRINK, 2, 2)
     tooltips.set_tip(deleteondisk_check, utf8(_("Normally, deleting a photo or video in booh only removes it from the web-album. If you check this option, the original file in source directory will be removed as well. Undo is possible, since actual deletion is performed only when web-album is saved.")), nil)
 
+    flv_check.signal_connect('toggled') {
+        flv_generator_entry.sensitive = flv_check.active?
+    }
+    if $config['use-flv'] == 'true'
+        flv_check.active = true
+    end
     smp_check.signal_connect('toggled') {
         smp_hbox.sensitive = smp_check.active?
     }
@@ -4140,6 +4175,12 @@ for example: avi:mencoder -nosound -ovc xvid -xvidencopts bitrate=800:me_quality
             $config['video-viewer'] = from_utf8(video_viewer_entry.text)
             $config['image-editor'] = from_utf8(image_editor_entry.text)
             $config['browser'] = from_utf8(browser_entry.text)
+            if flv_check.active?
+                $config['use-flv'] = 'true'
+                $config['flv-generator'] = from_utf8(flv_generator_entry.text)
+            else
+                $config['use-flv'] = 'false'
+            end
             if smp_check.active?
                 $config['mproc'] = smp_spin.value.to_i
             else
@@ -4159,6 +4200,8 @@ for example: avi:mencoder -nosound -ovc xvid -xvidencopts bitrate=800:me_quality
         end
     }
     dialog.destroy
+
+    check_config_preferences_dep
 end
 
 def perform_undo
@@ -4240,15 +4283,17 @@ def create_menu_and_toolbar
     $extend.signal_connect('activate') { extend_ }
     $generate.signal_connect('activate') {
         save_current_file
+        warning_flv_not_working = $config['use-flv'] == 'true' ? _("Notice: flash videos normally don't play locally.\n") : ''
         call_backend("booh-backend --config '#{$filename}' --verbose-level #{$verbose_level} #{additional_booh_options}",
                      utf8(_("Please wait while generating web-album...\nThis may take a while, please be patient.")),
                      'web-album',
                      { :successmsg => $xmldoc.root.attributes['multi-languages'] ?
                          utf8(_("Your web-album is now ready in directory '%s'.
 As multi-languages is activated, you will not be able to view it
-comfortably in your browser though.") % $xmldoc.root.attributes['destination']) :
+locally in your browser though.") % $xmldoc.root.attributes['destination']) :
                          utf8(_("Your web-album is now ready in directory '%s'.
-Click to view it in your browser:") % $xmldoc.root.attributes['destination']),
+%s
+Click to view it in your browser:") % [ $xmldoc.root.attributes['destination'], warning_flv_not_working ]),
                        :successmsg_linkurl => $xmldoc.root.attributes['multi-languages'] ? $xmldoc.root.attributes['destination'] :
                                                                                            $xmldoc.root.attributes['destination'] + '/index.html',
                        :closure_after => proc {
index 423d116ead50565dd9c85ecc793b06cfb46c0687..4c9dac85d9cc2c7aea9c044ad002d5b5a3214301 100644 (file)
@@ -64,6 +64,7 @@ $options = [
     [ '--thumbnails-per-page', '-p', GetoptLong::REQUIRED_ARGUMENT, _("Specify the amount of thumbnails per page in the thumbnails page, after which split occurs") ],
     [ '--optimize-for-32', '-o', GetoptLong::NO_ARGUMENT, _("Resize images with optimized sizes for 3/2 aspect ratio rather than 4/3 (typical aspect ratio of photos from point-and-shoot cameras - also called compact cameras - is 4/3, whereas photos from SLR cameras - also called reflex cameras - is 3/2)") ],
     [ '--transcode-videos', '-r', GetoptLong::REQUIRED_ARGUMENT, _("Transcode videos with given external program; %f is the placeholder for the input video, %o for the output video; before the external program, the output video extension should be given followed by a colon") ],
+    [ '--flv-generator', '-F', GetoptLong::REQUIRED_ARGUMENT, _("Use embedded flash player for videos (flowplayer) and use this .flv generator (%f is the placeholder for the input video, %o for the output video)") ],
     [ '--index-link',    '-l', GetoptLong::REQUIRED_ARGUMENT, _("Specify the HTML markup to use on the bottom of pages for a small link returning to wherever you see fit in your website (or somewhere else)") ],
     [ '--addthis', '-a', GetoptLong::NO_ARGUMENT, _("Include the 'addthis' bookmarking and sharing button") ],
     [ '--made-with',     '-n', GetoptLong::REQUIRED_ARGUMENT, _("Specify the HTML markup to use on the bottom of pages for a small 'made with' message") ],
@@ -228,6 +229,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") %
                 end
                 $transcode_videos = arg
 
+            when '--flv-generator'
+                if arg !~ /%f/ || arg !~ /%o/
+                    die _("--flv-generator: argument must contain %f for the input video and %o for the output video")
+                end
+                $flv_generator = arg
+
             when '--made-with'
                 $madewith = arg
 
@@ -402,6 +409,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") %
         $xmldoc.root.delete_attribute('transcode-videos')
     end
 
+    if $flv_generator
+        $xmldoc.root.add_attribute('flv-generator', $flv_generator)
+    else
+        $xmldoc.root.delete_attribute('flv-generator')
+    end
+
     if $madewith
         $madewith = $madewith.gsub('%booh', '"http://booh.org/"')
     end
@@ -487,10 +500,6 @@ def quote_caption(input, *for_attribute)
     end
 end
 
-def find_captions(xmldir, images)
-    return images.collect { |img| find_caption_value(xmldir, img) }
-end
-
 #- stolen from CVSspam
 def urlencode(text)
   text.sub(/[^a-zA-Z0-9\-,.*_\/]/) do
@@ -771,6 +780,18 @@ def save_html(html, base_filename)
     end
 end
 
+def apply_hook(name, content, *params)
+    if $hooks.nil?
+        return content
+    end
+    hook = $hooks[name]
+    if hook.nil?
+        return content
+    else
+        return hook.call(content, *params)
+    end
+end
+
 def walk_source_dir
 
     #- preprocess the path->dir, rexml is very slow with that; we seem to improve speed by 7%
@@ -966,6 +987,10 @@ def walk_source_dir
                             psys("cp '#{$themedir}/root/#{entry}' '#{dest_dir}'")
                         end
                     }
+                    #- copy flowplayer stuff if needed
+                    if $flv_generator
+                        psys("cp #{$FPATH}/flowplayer/flowplayer* '#{dest_dir}'")
+                    end
                 end
             end
             next
@@ -979,6 +1004,8 @@ def walk_source_dir
             fullscreen_images[sizeobj['name']] = []
             thumbnail_images ||= {}
             thumbnail_images[sizeobj['name']] = []
+            fullscreen_videos ||= {}
+            fullscreen_videos[sizeobj['name']] = []
             thumbnail_videos ||= {}
             thumbnail_videos[sizeobj['name']] = []
         end
@@ -986,6 +1013,7 @@ def walk_source_dir
         thumbnail_images['dont-delete-file-for-gui'] = []
         if $limit_sizes =~ /original/
             fullscreen_images['original'] = []
+            fullscreen_videos['original'] = []
         end
 
         images.size >= 1 and msg 3, _("\tcreating photos thumbnails...")
@@ -1034,19 +1062,25 @@ def walk_source_dir
 
         videos.size >= 1 and msg 3, _("\tcreating videos thumbnails...")
         transcoded_videos = {}
+        flv_videos = {}
 
         #- create thumbnails for videos
         videos.each { |video|
             info("processing element")
+            base_dest_img = dest_dir + '/' + make_dest_filename(video.sub(/\.[^\.]+$/, ''))
             elem = optelements['video|' + utf8(video)]
             if $forgui
-                thumbnail_dest_img = dest_dir + '/' + make_dest_filename(video.sub(/\.[^\.]+$/, '')) + "-#{$default_size['thumbnails']}.jpg"
+                thumbnail_dest_img = base_dest_img + "-#{$default_size['thumbnails']}.jpg"
                 gen_thumbnails_element("#{dir}/#{video}", elem, true, [ { 'filename' => thumbnail_dest_img, 'size' => $default_size['thumbnails'] } ])
             else
                 todo = []
                 for sizeobj in $images_size
+                    size_fullscreen = sizeobj['fullscreen']
                     size_thumbnails = sizeobj['thumbnails']
-                    thumbnail_dest_img = dest_dir + '/' + make_dest_filename(video.sub(/\.[^\.]+$/, '')) + "-#{size_thumbnails}.jpg"
+                    fullscreen_dest_img = base_dest_img + "-#{size_fullscreen}.jpg"
+                    fullscreen_videos[sizeobj['name']] << File.basename(fullscreen_dest_img)
+                    todo << { 'filename' => fullscreen_dest_img, 'size' => size_fullscreen }
+                    thumbnail_dest_img = base_dest_img + "-#{size_thumbnails}.jpg"
                     thumbnail_videos[sizeobj['name']] << File.basename(thumbnail_dest_img)
                     todo << { 'filename' => thumbnail_dest_img, 'size' => size_thumbnails }
                 end
@@ -1060,6 +1094,18 @@ def walk_source_dir
                     if ! File.exists?(destvideo)
                         psys(parts[1].gsub(/%f/, "'#{dir}/#{video}'").gsub(/%o/, "'#{destvideo}'"))
                     end
+
+                elsif $flv_generator
+                    basedestvideo = video.sub(/\.\w+/, '') + '.flv'
+                    flv_videos[video] = basedestvideo
+                    destvideo = "#{dest_dir}/#{basedestvideo}"
+                    if File.exists?(destvideo) && File.size(destvideo) == 0
+                        File.delete(destvideo)
+                    end
+                    if ! File.exists?(destvideo)
+                        psys($flv_generator.gsub(/%f/, "'#{dir}/#{video}'").gsub(/%o/, "'#{destvideo}'"))
+                    end
+
                 else
                     destvideo = "#{dest_dir}/#{video}"
                     if ! File.exists?(destvideo)
@@ -1080,8 +1126,9 @@ def walk_source_dir
             #- cleanup old images/videos (for when removing elements or sizes)
             all_elements = fullscreen_images.collect { |e| e[1] }.flatten.
                      concat(thumbnail_images.collect { |e| e[1] }.flatten).
+                     concat(fullscreen_videos.collect { |e| e[1] }.flatten).
                      concat(thumbnail_videos.collect { |e| e[1] }.flatten).
-                     concat($transcode_videos ? transcoded_videos.values : videos).
+                     concat($transcode_videos ? transcoded_videos.values : $flv_generator ? flv_videos.values : videos).
                      push('.htaccess')
             to_del = Dir.entries(dest_dir).find_all { |e| !File.directory?(File.join(dest_dir, e)) && !all_elements.include?(e) && e !~ /^thumbnails-\w+\.jpg/ }
             if to_del.size > 0
@@ -1107,6 +1154,10 @@ def walk_source_dir
                         psys("cp '#{$themedir}/root/#{entry}' '#{dest_dir}'")
                     end
                 }
+                #- copy flowplayer stuff if needed
+                if $flv_generator
+                    psys("cp #{$FPATH}/flowplayer/flowplayer* '#{dest_dir}'")
+                end
             end
             
             msg 3, _("\tgenerating HTML pages...")
@@ -1116,13 +1167,14 @@ def walk_source_dir
             end
 
             #- generate thumbnails*.html (page with thumbnails)
-            image2thumbnailpage4js = []
+            element2thumbnailpage4js = []
             for sizeobj in $images_size
                 info("processing size")
                 html = $html_thumbnails.collect { |l| l.clone }
                 iterations = {}
                 for i in html
                     i.sub!(/~~title~~/, quote_caption(xmldir.attributes['thumbnails-caption'] || utf8(File.basename(dir))))
+                    i.sub!(/~~flowplayer_head_code~~/, ($flv_generator && videos.size > 0) ? '<script type="text/javascript" src="~~pathtobase~~flowplayer-3.1.4.min.js"></script>' : '')
                     discover_iterations(iterations, i)
                 end
                 all_pages = []
@@ -1167,13 +1219,26 @@ def walk_source_dir
                             index = videos.index(file)
                             caption = find_caption_value(xmldir, videos[index]) || utf8(videos[index])
                             if File.exists?("#{dest_dir}/#{thumbnail_videos[sizeobj['name']][index]}")
-                                html_elem.gsub!(/~~image_iteration~~/,
-                                                '<a href="' + ( $transcode_videos ? transcoded_videos[videos[index]] : videos[index] ) + '">' +
-                                                    img_element("#{dest_dir}/#{thumbnail_videos[sizeobj['name']][index]}", caption) + '</a>')
+                                video_preview = '<div class="thumbnail_video">' + img_element("#{dest_dir}/#{thumbnail_videos[sizeobj['name']][index]}", caption) + '</div>'
+                            else
+                                video_preview = defer_translation(N_("(no preview)"))
+                            end
+                            if $flv_generator
+                                size = get_image_size("#{dest_dir}/#{thumbnail_videos[sizeobj['name']][index]}")
+                                if ! size
+                                    sizeobj['thumbnails'] =~ /(\d+)x(\d+)/
+                                    size = { :x => $1, :y => $2 }
+                                end
+                                sizespec = 'width:' + size[:x].to_s + 'px;height:' + (size[:y] + 24).to_s + 'px'
+                                image_iteration = '<a href="' + flv_videos[videos[index]] + '" style="display:block;' + sizespec + '"' +
+                                                  '   id="player' + index.to_s + '">' + video_preview +
+                                                  '<img src="~~pathtobase~~play_video.png" style="position:relative;top:-' + ((size[:y]+48)/2).to_s + 'px;border:0;background-color:transparent"/></a>' +
+                                                  '<script>flowplayer("player' + index.to_s + '", "~~pathtobase~~flowplayer-3.1.5.swf")</script>'
+                                html_elem.gsub!(/~~image_iteration~~/, apply_hook(:image_iteration, image_iteration, 'video'))
                             else
                                 html_elem.gsub!(/~~image_iteration~~/,
                                                 '<a href="' + ( $transcode_videos ? transcoded_videos[videos[index]] : videos[index] ) + '">' +
-                                                    defer_translation(N_("(no preview)")) + '</a>')
+                                                    video_preview + '</a>')
                             end
                             html_elem.gsub!(/~~caption_iteration~~/, quote_caption(caption))
                             html_elem.gsub!(/~~ifimage\?~~(.+?)~~fi~~/, '')
@@ -1182,17 +1247,17 @@ def walk_source_dir
                         html_thumbnails += html_elem
                         html_thumbnails_nojs += html_elem
                         if type == 'image'
+                            img_preview = '<div class="thumbnail_image">' + img_element("#{dest_dir}/#{thumbnail_images[sizeobj['name']][index]}", caption) + '</div>'
                             html_thumbnails.gsub!(/~~image_iteration~~/,
                                                   '<a href="image-' + size2js(sizeobj['name']) + $htmlsuffix + '#current=' + fullscreen_images[sizeobj['name']][index] +
-                                                      '" name="' + fullscreen_images[sizeobj['name']][index] + '">' +
-                                                      img_element("#{dest_dir}/#{thumbnail_images[sizeobj['name']][index]}", caption) + '</a>')
+                                                      '" name="' + fullscreen_images[sizeobj['name']][index] + '">' + img_preview + '</a>')
                             html_thumbnails_nojs.gsub!(/~~image_iteration~~/, 
                                                        '<a href="' + fullscreen_images[sizeobj['name']][index] + '" name="' + fullscreen_images[sizeobj['name']][index] + '">' +
-                                                       img_element("#{dest_dir}/#{thumbnail_images[sizeobj['name']][index]}", caption) + '</a>')
-                            #- remember in which thumbnails page is this element, for image->thumbnail link
-                            if sizeobj == $images_size[0]
-                                image2thumbnailpage4js << pagecount
-                            end
+                                                       img_preview + '</a>')
+                        end
+                        #- remember in which thumbnails page is this element, for element->thumbnail link
+                        if sizeobj == $images_size[0]
+                            element2thumbnailpage4js << pagecount
                         end
 
                         if counter == $N_per_page
@@ -1233,7 +1298,7 @@ def walk_source_dir
                              (pagecount < all_pages.size - 1 ? " <a href=\"thumbnails-#{size2js(sizeobj['name'])}%nojs-#{pagecount + 1}#{$htmlsuffix}\">" + defer_translation(N_("Next ->")) + "</a> " : '')
                     for i in final_html
                         i.sub!(/~~run_slideshow~~/,
-                               images.size <= 1 ? '' : '<a href="image-' + size2js(sizeobj['name']) + $htmlsuffix + '#run_slideshow=1">' + defer_translation(N_("Run slideshow!"))+'</a>')
+                               entries.size <= 1 ? '' : '<a href="image-' + size2js(sizeobj['name']) + $htmlsuffix + '#run_slideshow=1">' + defer_translation(N_("Run slideshow!"))+'</a>')
                         i.sub!(/~~thumbnails~~/, html_thumbnails)
                         if all_pages.size == 1
                             i.gsub!(/~~ifmultiplepages\?~~.*~~fi~~/, '')
@@ -1269,42 +1334,109 @@ def walk_source_dir
             save_html(html_reload_to_thumbnails, "#{dest_dir}/thumbnails")
 
             #- generate image.html (page with fullscreen images)
-            if images.size > 0
-                captions4js = find_captions(xmldir, images).collect { |e| e ? '"' + quote_caption(e, true) + '"' : '""' }.join(', ')
-                thumbnailspage4js = image2thumbnailpage4js.collect { |e| "\"#{e}\"" }.join(', ')
-                for sizeobj in $images_size
-                    html = $html_images.collect { |l| l.clone }
-                    images4js = fullscreen_images[sizeobj['name']].collect { |e| "\"#{e}\"" }.join(', ')
-                    hiddenimages4remotes = '<span style="display:none">' + thumbnail_images[sizeobj['name']][0..4].collect { |e| "<img src=\"#{e}\"/>" }.join('') + '</span>'
-                    otherimages4js = ''
-                    othersizes = []
-                    for sizeobj2 in all_images_sizes
-                        if sizeobj != sizeobj2
-                            otherimages4js += "var images_#{size2js(sizeobj2['name'])} = new Array(" + fullscreen_images[sizeobj2['name']].collect { |e| "\"#{e}\"" }.join(', ') + ")\n"
-                            othersizes << "\"#{size2js(sizeobj2['name'])}\""
+            captions4js = []
+            types4js = []
+            videos4js = []
+            for file in entries
+                type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
+                if type
+                    caption = find_caption_value(xmldir, file)
+                    if caption
+                        captions4js << '"' + quote_caption(caption, true) + '"'
+                    else
+                        captions4js << '""'
+                    end
+                    types4js << '"' + type + '"'
+                    if type == 'video'
+                        index = videos.index(file)
+                        if $flv_generator
+                            videos4js << '"' + flv_videos[videos[index]] + '"'
+                        else
+                            videos4js << '"' + videos[index] + '"'
                         end
+                    else
+                        videos4js << '""'
                     end
-                    for i in html
-                        i.gsub!(/~~images~~/, images4js)
-                        i.gsub!(/~~hidden_images_for_remotes~~/, hiddenimages4remotes)
-                        i.gsub!(/~~other_images~~/, otherimages4js)
-                        i.gsub!(/~~thumbnailspages~~/, thumbnailspage4js)
-                        i.gsub!(/~~other_sizes~~/, othersizes.join(', '))
-                        i.gsub!(/~~captions~~/, captions4js)
-                        i.gsub!(/~~title~~/, quote_caption(xmldir.attributes['thumbnails-caption'] || utf8(File.basename(dir))))
-                        i.gsub!(/~~thumbnails~~/, '<a href="thumbnails-' + size2js(sizeobj['name']) + $htmlsuffix + '" id="thumbnails">' + defer_translation(N_('return to thumbnails')) + '</a>')
-                        i.gsub!(/~~theme~~/, $theme)
-                        i.gsub!(/~~current_size~~/, size2js(sizeobj['name']))
-                        i.gsub!(/~~htmlsuffix~~/, $htmlsuffix)
-                        i.gsub!(/~~madewith~~/, $madewith || '')
-                        i.gsub!(/~~indexlink~~/, $indexlink || '')
-                        substitute_addthis(i)
-                        substitute_html_sizes(i, sizeobj, 'image', '')
-                        substitute_navigation(i, xmldir)
-                        substitute_pathtobase(i, xmldir)
+                end
+            end
+
+            for sizeobj in $images_size
+                elements4js = []
+                videoswidths4js = []
+                videosheights4js = []
+                for file in entries
+                    type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
+                    if type
+                        if type == 'image'
+                            index = images.index(file)
+                            elements4js << '"' + fullscreen_images[sizeobj['name']][index] + '"'
+                            videoswidths4js << "''"
+                            videosheights4js << "''"
+                        else
+                            index = videos.index(file)
+                            elements4js << '"' + fullscreen_videos[sizeobj['name']][index] + '"'
+                            size = get_image_size("#{dest_dir}/#{fullscreen_videos[sizeobj['name']][index]}")
+                            videoswidths4js << size[:x].to_s
+                            videosheights4js << size[:y].to_s
+                        end
+                    end
+                end
+
+                html = $html_images.collect { |l| l.clone }
+                hiddenimages4remotes = '<span style="display:none">' + thumbnail_images[sizeobj['name']][0..4].collect { |e| "<img src=\"#{e}\"/>" }.join('') + '</span>'
+                otherelements4js = ''
+                othersizes = []
+                for sizeobj2 in all_images_sizes
+                    if sizeobj != sizeobj2
+                        oe4js = []
+                        for file in entries
+                            type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
+                            if type
+                                if type == 'image'
+                                    index = images.index(file)
+                                    oe4js << '"' + fullscreen_images[sizeobj2['name']][index] + '"'
+                                else
+                                    index = videos.index(file)
+                                    oe4js << '"' + fullscreen_videos[sizeobj2['name']][index] + '"'
+                                end
+                            end
+                        end
+                        otherelements4js += "var elements_#{size2js(sizeobj2['name'])} = new Array(" + oe4js.join(', ') + ");\n"
+                        othersizes << "\"#{size2js(sizeobj2['name'])}\""
                     end
-                    save_html(html, "#{dest_dir}/image-#{size2js(sizeobj['name'])}")
                 end
+                for i in html
+                    i.gsub!(/~~images~~/, elements4js.join(', '))
+                    i.gsub!(/~~types~~/, types4js.join(', '))
+                    i.gsub!(/~~videos~~/, videos4js.join(', '))
+                    i.gsub!(/~~videos_widths~~/, videoswidths4js.join(', '))
+                    i.gsub!(/~~videos_heights~~/, videosheights4js.join(', '))
+                    i.gsub!(/~~hidden_images_for_remotes~~/, hiddenimages4remotes)
+                    i.gsub!(/~~other_images~~/, otherelements4js)
+                    i.gsub!(/~~thumbnailspages~~/, element2thumbnailpage4js.collect { |e| "\"#{e}\"" }.join(', '))
+                    i.gsub!(/~~other_sizes~~/, othersizes.join(', '))
+                    i.gsub!(/~~captions~~/, captions4js.join(', '))
+                    i.gsub!(/~~title~~/, quote_caption(xmldir.attributes['thumbnails-caption'] || utf8(File.basename(dir))))
+                    if $flv_generator && videos.size > 0
+                        i.sub!(/~~flowplayer_head_code~~/, '<script type="text/javascript" src="~~pathtobase~~flowplayer-3.1.4.min.js"></script>')
+                        i.sub!(/~~flowplayer_active~~/, 'true')
+                    else
+                        i.sub!(/~~flowplayer_head_code~~/, '')
+                        i.sub!(/~~flowplayer_active~~/, 'false')
+                    end
+
+                    i.gsub!(/~~thumbnails~~/, '<a href="thumbnails-' + size2js(sizeobj['name']) + $htmlsuffix + '" id="thumbnails">' + defer_translation(N_('return to thumbnails')) + '</a>')
+                    i.gsub!(/~~theme~~/, $theme)
+                    i.gsub!(/~~current_size~~/, size2js(sizeobj['name']))
+                    i.gsub!(/~~htmlsuffix~~/, $htmlsuffix)
+                    i.gsub!(/~~madewith~~/, $madewith || '')
+                    i.gsub!(/~~indexlink~~/, $indexlink || '')
+                    substitute_addthis(i)
+                    substitute_html_sizes(i, sizeobj, 'image', '')
+                    substitute_navigation(i, xmldir)
+                    substitute_pathtobase(i, xmldir)
+                end
+                save_html(html, "#{dest_dir}/image-#{size2js(sizeobj['name'])}")
             end
         end
     }
index 1b5a1223f7e4e3a7a70b2e78a61eb9131747e2f5..ce4a6a991b7f359912a6fbf373a992d83ce2e092 100644 (file)
@@ -72,3 +72,9 @@ $allowed_N_values = [ 3, 4, 5, 6, 8, 12 ]
 $default_N = 3
 
 $albums_thumbnail_size = '300x225'
+
+$hooks = {
+    :image_iteration => proc { |content, type|
+        return content.sub(/width:(\d+)px/) { "width:" + ($1.to_i + 8).to_s + "px" }
+    }
+}
index 7f8fc44637b4f36ddaf29772b1c142ec78e04fe9..cbfd363a5e1a2d40bd2b25c39ad596613a9ddaab 100644 (file)
@@ -35,20 +35,38 @@ td {
         border: solid 0px;
 }
 
-.imager {
+.thumbnail_image {
         background-color: #122;
 }
-.imager img {
+.thumbnail_image img {
+        border: 1px solid #a9a9a9;
+        margin: -3px 3px 3px -3px;
+        padding: 3px;
+}
+.thumbnail_video {
+        background-color: #122;
+}
+.thumbnail_video img {
         border: 1px solid #a9a9a9;
         margin: -3px 3px 3px -3px;
         padding: 3px;
 }
 
-.imager_fullscreen {
+.fullscreen_image {
+        float: left;
+        background-color: #122;
+}
+.fullscreen_image img {
+        background-color: #fff;
+        border: 1px solid #a9a9a9;
+        margin: -10px 10px 10px -10px;
+        padding: 9px;
+}
+.fullscreen_video {
         float: left;
         background-color: #122;
 }
-.imager_fullscreen img {
+.fullscreen_video img {
         background-color: #fff;
         border: 1px solid #a9a9a9;
         margin: -10px 10px 10px -10px;
@@ -114,6 +132,11 @@ table.image tr td {
        text-align: center;
 }
 
+a.fullscreenvideolink {
+       margin-left:auto;
+       margin-right:auto;
+}
+
 table.image tr td caption {
        font-size: 1.1em;
 }
index ded5c8dad949b1a914fc8c8d4b62b66605259133..4cf353b0d1cf136d7b37570a70ff72845246df28 100644 (file)
@@ -141,7 +141,6 @@ function get_cookie(key) {
 
 function init() {
 
-
     preferred_pause = get_cookie('booh-slideshow-pause-' + dbltilda_theme);
     if (preferred_pause != null) {
         document.getElementById('secs').value = preferred_pause;
@@ -234,9 +233,9 @@ function show_current_text() {
         document.getElementById('main_text').innerHTML = captions[current];
         for (i = 0; i < other_sizes.length; i++) { 
             if (other_sizes[i] == "original") {
-                document.getElementById('link' + other_sizes[i]).href = eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = eval("elements_" + other_sizes[i] + "[current]");
             } else {
-                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("elements_" + other_sizes[i] + "[current]");
             }
         }
         document.getElementById('thumbnails').href = 'thumbnails-' + dbltilda_current_size + '-' + thumbnailspages[current] + dbltilda_htmlsuffix + '#' + images[current];
@@ -248,7 +247,19 @@ function show_current_text() {
 }
 
 function display_current() {
-    document.main_img.src = images[current];
+    var main_img = document.getElementById('main_img');
+    if (types[current] == 'image') {
+        main_img.innerHTML = '<div class="fullscreen_image"><img src="' + images[current] + '"/></div>';
+    } else {
+        main_img.innerHTML = '<a class="fullscreenvideolink" href="' + videos[current] + '" '
+                           + '   style="display:block;width:' + videos_widths[current] + 'px;height:' + (videos_heights[current] + 24) + 'px" id="player">'
+                           + '  <div class="fullscreen_video"><img src="' + images[current] + '"/></div>'
+                           + '  <img src="' + dbltilda_pathtobase + 'play_video.png" style="position:relative;top:-' + (videos_heights[current] + 48)/2 + 'px;border:0;background-color:transparent"/>'
+                           + '</a>';
+        if (dbltilda_flowplayer_active == 'true') {
+            flowplayer("player", dbltilda_pathtobase + "flowplayer-3.1.5.swf");
+        }
+    }
     oldhref = browser_href();
     newhref = 'image-' + dbltilda_current_size + dbltilda_htmlsuffix + '#current=' + images[current];
     if (oldhref != newhref) {
diff --git a/data/booh/themes/cardu/root/play_video.png b/data/booh/themes/cardu/root/play_video.png
new file mode 100644 (file)
index 0000000..9938062
Binary files /dev/null and b/data/booh/themes/cardu/root/play_video.png differ
diff --git a/data/booh/themes/cardu/root/video.png b/data/booh/themes/cardu/root/video.png
deleted file mode 100644 (file)
index 109b259..0000000
Binary files a/data/booh/themes/cardu/root/video.png and /dev/null differ
index 7486610d74f59ed974c7d39c03418eceb9d8a2ff..bc60d6a24b9d06f86a0e979e5abbbdd0bb4bbb10 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Cardu' theme - Cornelia Luoni"/>
     ~~~image_head_code~~~
+    ~~flowplayer_head_code~~
     <script type="text/javascript" src="~~pathtobase~~booh.js"></script>
     <link rel="stylesheet" type="text/css" href="~~pathtobase~~booh.css" media="screen" />
 </head>
@@ -52,9 +53,7 @@
   <tr>
     <td align="center" colspan="9">
       <br/>
-      <div class="imager_fullscreen">
         ~~~image~~~
-      </div>
     </td>
   </tr>
 </table>
index a49d232fcc26e8b481d57ffe4238f27c10b08935..2481620240a8d644e990732e8d0022404c7e5885 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Cardu' theme - Cornelia Luoni"/>
     ~~~thumbnails_head_code~~~
+    ~~flowplayer_head_code~~
     <link rel="stylesheet" type="text/css" href="~~pathtobase~~booh.css" media="screen" />
 </head>
 
       <br/>
         <table width="1%">
           <tr>
-            <td class="imager">~~image_iteration~~</td>
+            <td align="center">~~image_iteration~~</td>
           </tr>
         </table>
-       ~~ifvideo?~~<img src="~~pathtobase~~video.png" alt="video" class="nothing"/>~~fi~~ ~~caption_iteration~~
+       ~~ifimage?~~<br/>~~fi~~ ~~caption_iteration~~
     </td>
     ~~iterate2_close~~
 </tr>
index faa3cb3a94ab3b9f76cf7ac7ae35942efce74f99..4f130be65918b56be2fcea62a1045d27638168bd 100644 (file)
@@ -141,7 +141,6 @@ function get_cookie(key) {
 
 function init() {
 
-
     preferred_pause = get_cookie('booh-slideshow-pause-' + dbltilda_theme);
     if (preferred_pause != null) {
         document.getElementById('secs').value = preferred_pause;
@@ -225,9 +224,9 @@ function show_current_text() {
         document.getElementById('main_text').innerHTML = captions[current];
         for (i = 0; i < other_sizes.length; i++) { 
             if (other_sizes[i] == "original") {
-                document.getElementById('link' + other_sizes[i]).href = eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = eval("elements_" + other_sizes[i] + "[current]");
             } else {
-                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("elements_" + other_sizes[i] + "[current]");
             }
         }
         document.getElementById('thumbnails').href = 'thumbnails-' + dbltilda_current_size + '-' + thumbnailspages[current] + dbltilda_htmlsuffix + '#' + images[current];
@@ -239,7 +238,19 @@ function show_current_text() {
 }
 
 function display_current() {
-    document.main_img.src = images[current];
+    var main_img = document.getElementById('main_img');
+    if (types[current] == 'image') {
+        main_img.innerHTML = '<img src="' + images[current] + '"/>';
+    } else {
+        main_img.innerHTML = '<a class="fullscreenvideolink" href="' + videos[current] + '" '
+                           + '   style="display:block;width:' + videos_widths[current] + 'px;height:' + (videos_heights[current] + 24) + 'px" id="player">'
+                           + '  <img src="' + images[current] + '"/>'
+                           + '  <img src="' + dbltilda_pathtobase + 'play_video.png" style="position:relative;top:-' + (videos_heights[current] + 48)/2 + 'px;border:0"/>'
+                           + '</a>';
+        if (dbltilda_flowplayer_active == 'true') {
+            flowplayer("player", dbltilda_pathtobase + "flowplayer-3.1.5.swf");
+        }
+    }
     oldhref = browser_href();
     newhref = 'image-' + dbltilda_current_size + dbltilda_htmlsuffix + '#current=' + images[current];
     if (oldhref != newhref) {
diff --git a/data/booh/themes/dark/root/play_video.png b/data/booh/themes/dark/root/play_video.png
new file mode 100644 (file)
index 0000000..9938062
Binary files /dev/null and b/data/booh/themes/dark/root/play_video.png differ
diff --git a/data/booh/themes/dark/root/video.png b/data/booh/themes/dark/root/video.png
deleted file mode 100644 (file)
index 109b259..0000000
Binary files a/data/booh/themes/dark/root/video.png and /dev/null differ
index 315c2fede73db4951b2d3e2cb98d40dbf0a7f764..9d549d414a915822ce4f540305cab4b55e90f2f2 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Dark' theme - Guillaume Cottenceau"/>
     ~~~image_head_code~~~
+    ~~flowplayer_head_code~~
     <script type="text/javascript" src="~~pathtobase~~booh.js"></script>
     <style type="text/css" media="screen">
     <!--
@@ -60,6 +61,10 @@ input:hover {
         background-color: #304149;
 }
 
+a.fullscreenvideolink {
+       margin-left:auto;
+       margin-right:auto;
+}
     -->
     </style>
 </head>
index 78dd42335f015eb8fecded10b9cdfff9907089d5..f23c092c2c4ccb42395a4a107d168703369358d0 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Dark' theme - Guillaume Cottenceau"/>
     ~~~thumbnails_head_code~~~
+    ~~flowplayer_head_code~~
     <style type="text/css" media="screen">
     <!--
 body {
@@ -72,7 +73,7 @@ img {
     ~~iterate2_open_maxN~~
     <td align="center" valign="top" ~~colspan~~ ~~homogeinize_width~~>
        ~~image_iteration~~
-       <p>~~ifvideo?~~<img src="~~pathtobase~~video.png" alt="video" class="nothing"/>~~fi~~ ~~caption_iteration~~</p>
+       ~~ifimage?~~<br/>~~fi~~ ~~caption_iteration~~
     </td>
     ~~iterate2_close~~
 </tr>
index faa3cb3a94ab3b9f76cf7ac7ae35942efce74f99..5eecd284e1e764f3b8c445fab8eafb396d97082d 100644 (file)
@@ -141,7 +141,6 @@ function get_cookie(key) {
 
 function init() {
 
-
     preferred_pause = get_cookie('booh-slideshow-pause-' + dbltilda_theme);
     if (preferred_pause != null) {
         document.getElementById('secs').value = preferred_pause;
@@ -225,9 +224,9 @@ function show_current_text() {
         document.getElementById('main_text').innerHTML = captions[current];
         for (i = 0; i < other_sizes.length; i++) { 
             if (other_sizes[i] == "original") {
-                document.getElementById('link' + other_sizes[i]).href = eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = eval("elements_" + other_sizes[i] + "[current]");
             } else {
-                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("elements_" + other_sizes[i] + "[current]");
             }
         }
         document.getElementById('thumbnails').href = 'thumbnails-' + dbltilda_current_size + '-' + thumbnailspages[current] + dbltilda_htmlsuffix + '#' + images[current];
@@ -239,7 +238,19 @@ function show_current_text() {
 }
 
 function display_current() {
-    document.main_img.src = images[current];
+    var main_img = document.getElementById('main_img');
+    if (types[current] == 'image') {
+        main_img.innerHTML = '<div class="fullscreen_image"><img src="' + images[current] + '"/></div>';
+    } else {
+        main_img.innerHTML = '<a class="fullscreenvideolink" href="' + videos[current] + '" '
+                           + '   style="display:block;width:' + videos_widths[current] + 'px;height:' + (videos_heights[current] + 24) + 'px" id="player">'
+                           + '  <div class="fullscreen_video"><img src="' + images[current] + '"/></div>'
+                           + '  <img src="' + dbltilda_pathtobase + 'play_video.png" style="position:relative;top:-' + (videos_heights[current] + 48)/2 + 'px;border:0;background-color:transparent"/>'
+                           + '</a>';
+        if (dbltilda_flowplayer_active == 'true') {
+            flowplayer("player", dbltilda_pathtobase + "flowplayer-3.1.5.swf");
+        }
+    }
     oldhref = browser_href();
     newhref = 'image-' + dbltilda_current_size + dbltilda_htmlsuffix + '#current=' + images[current];
     if (oldhref != newhref) {
diff --git a/data/booh/themes/sbs/root/play_video.png b/data/booh/themes/sbs/root/play_video.png
new file mode 100644 (file)
index 0000000..9938062
Binary files /dev/null and b/data/booh/themes/sbs/root/play_video.png differ
diff --git a/data/booh/themes/sbs/root/video.png b/data/booh/themes/sbs/root/video.png
deleted file mode 100644 (file)
index 109b259..0000000
Binary files a/data/booh/themes/sbs/root/video.png and /dev/null differ
index ebde48d37c62a4b6ffcd397865b72f1f88fdcbf0..6b056c7e0fb6e5254dbcaca041a3542de12b88e3 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="sbs theme, by Erik Ramseth -- based heavily on `Simple' theme by Guillaume Cottenceau">
     ~~~image_head_code~~~
+    ~~flowplayer_head_code~~
     <script type="text/javascript" src="~~pathtobase~~booh.js"></script>
     <style type="text/css" media="screen">
     <!--
@@ -48,19 +49,35 @@ input:hover {
 .disabled:hover {
         background-color: #DEDAD6;
 }
-.imager {
-  float: left;
+
+.fullscreen_image {
+  display: table-cell;
   background-color: lightgrey;
 }
 
-.imager img {
+.fullscreen_image img {
   background-color: #fff;
   border: 1px solid #a9a9a9;
   margin: -3px 3px 3px -3px;
-  padding: 5px;
+  padding: 3px;
 }
 
+.fullscreen_video {
+  display: table-cell;
+  background-color: lightgrey;
+}
 
+.fullscreen_video img {
+  background-color: #fff;
+  border: 1px solid #a9a9a9;
+  margin: -3px 3px 3px -3px;
+  padding: 3px;
+}
+
+a.fullscreenvideolink {
+       margin-left:auto;
+       margin-right:auto;
+}
     -->
     </style>
 </head>
@@ -86,7 +103,7 @@ input:hover {
 <!-- <p id="dbg_text">&nbsp;</p> -->
 <tr>
     <td align="center" colspan="9">
-        <div class="imager">~~~image~~~</div>
+        ~~~image~~~
     </td>
 </tr>
 </table>
index e76592e54e9b59248bee6b2f126e5a4c26b5da1d..b5b79f3bcd200d05c69931706204c2e43510b86a 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="sbs theme, by Erik Ramseth -- based heavily on 'Simple' theme by Guillaume Cottenceau">
     ~~~thumbnails_head_code~~~
+    ~~flowplayer_head_code~~
     <style type="text/css" media="screen">
     <!--
 body {
@@ -41,12 +42,24 @@ img {
         border: solid 0px;
 }
 
-.imager {
+.thumbnail_image {
   display: table-cell;
   background-color: lightgrey;
 }
 
-.imager img {
+.thumbnail_image img {
+  background-color: #fff;
+  border: 1px solid #a9a9a9;
+  margin: -3px 3px 3px -3px;
+  padding: 3px;
+}
+
+.thumbnail_video {
+  display: table-cell;
+  background-color: lightgrey;
+}
+
+.thumbnail_video img {
   background-color: #fff;
   border: 1px solid #a9a9a9;
   margin: -3px 3px 3px -3px;
@@ -80,8 +93,8 @@ img {
 <tr>
     ~~iterate2_open_maxN~~
     <td align="center" valign="top" ~~colspan~~ ~~homogeinize_width~~>
-       <div class="imager">~~image_iteration~~</div>
-       ~~ifvideo?~~<img src="~~pathtobase~~video.png" alt="video" class="nothing"/>~~fi~~ ~~caption_iteration~~
+       ~~image_iteration~~
+       ~~ifimage?~~<br/>~~fi~~ ~~caption_iteration~~
     </td>
     ~~iterate2_close~~
 </tr>
index e0a60b89f00c5aebaa17ad78185a4dbcf2d3c241..1fc0cdf69c2ee351205cdececa5a509d17f4dba2 100644 (file)
@@ -88,6 +88,11 @@ table.image tr td {
        text-align: center;
 }
 
+a.fullscreenvideolink {
+       margin-left:auto;
+       margin-right:auto;
+}
+
 table.image tr td caption {
        font-size: 1.1em;
 }
index faa3cb3a94ab3b9f76cf7ac7ae35942efce74f99..4f130be65918b56be2fcea62a1045d27638168bd 100644 (file)
@@ -141,7 +141,6 @@ function get_cookie(key) {
 
 function init() {
 
-
     preferred_pause = get_cookie('booh-slideshow-pause-' + dbltilda_theme);
     if (preferred_pause != null) {
         document.getElementById('secs').value = preferred_pause;
@@ -225,9 +224,9 @@ function show_current_text() {
         document.getElementById('main_text').innerHTML = captions[current];
         for (i = 0; i < other_sizes.length; i++) { 
             if (other_sizes[i] == "original") {
-                document.getElementById('link' + other_sizes[i]).href = eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = eval("elements_" + other_sizes[i] + "[current]");
             } else {
-                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("images_" + other_sizes[i] + "[current]");
+                document.getElementById('link' + other_sizes[i]).href = 'image-' + other_sizes[i] + dbltilda_htmlsuffix + '#current=' + eval("elements_" + other_sizes[i] + "[current]");
             }
         }
         document.getElementById('thumbnails').href = 'thumbnails-' + dbltilda_current_size + '-' + thumbnailspages[current] + dbltilda_htmlsuffix + '#' + images[current];
@@ -239,7 +238,19 @@ function show_current_text() {
 }
 
 function display_current() {
-    document.main_img.src = images[current];
+    var main_img = document.getElementById('main_img');
+    if (types[current] == 'image') {
+        main_img.innerHTML = '<img src="' + images[current] + '"/>';
+    } else {
+        main_img.innerHTML = '<a class="fullscreenvideolink" href="' + videos[current] + '" '
+                           + '   style="display:block;width:' + videos_widths[current] + 'px;height:' + (videos_heights[current] + 24) + 'px" id="player">'
+                           + '  <img src="' + images[current] + '"/>'
+                           + '  <img src="' + dbltilda_pathtobase + 'play_video.png" style="position:relative;top:-' + (videos_heights[current] + 48)/2 + 'px;border:0"/>'
+                           + '</a>';
+        if (dbltilda_flowplayer_active == 'true') {
+            flowplayer("player", dbltilda_pathtobase + "flowplayer-3.1.5.swf");
+        }
+    }
     oldhref = browser_href();
     newhref = 'image-' + dbltilda_current_size + dbltilda_htmlsuffix + '#current=' + images[current];
     if (oldhref != newhref) {
diff --git a/data/booh/themes/simple/root/play_video.png b/data/booh/themes/simple/root/play_video.png
new file mode 100644 (file)
index 0000000..9938062
Binary files /dev/null and b/data/booh/themes/simple/root/play_video.png differ
diff --git a/data/booh/themes/simple/root/video.png b/data/booh/themes/simple/root/video.png
deleted file mode 100644 (file)
index 109b259..0000000
Binary files a/data/booh/themes/simple/root/video.png and /dev/null differ
index e91e87b8c3d2b8aaceb1a9d3ad2afbef20c88caa..b5bb5f7381b20cc19189b9bf00c63fd7f5bbcf84 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Simple' theme - Guillaume Cottenceau"/>
     ~~~image_head_code~~~
+    ~~flowplayer_head_code~~
     <script type="text/javascript" src="~~pathtobase~~booh.js"></script>
     <link rel="stylesheet" type="text/css" href="~~pathtobase~~booh.css" media="screen" />
 </head>
index 24d6dd503986f5a09e1c9044e3afc531fe358e14..bc7d30e8030cf63ec5126a1f77809fb2330616cf 100644 (file)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Simple' theme - Guillaume Cottenceau"/>
     ~~~thumbnails_head_code~~~
+    ~~flowplayer_head_code~~
     <link rel="stylesheet" type="text/css" href="~~pathtobase~~booh.css" media="screen" />
 </head>
 
@@ -36,7 +37,7 @@
     ~~iterate2_open_maxN~~
     <td align="center" valign="top" ~~colspan~~ ~~homogeinize_width~~>
        ~~image_iteration~~
-       <p>~~ifvideo?~~<img src="~~pathtobase~~video.png" alt="video" class="nothing"/>~~fi~~ ~~caption_iteration~~</p>
+       ~~ifimage?~~<br/>~~fi~~ ~~caption_iteration~~
     </td>
     ~~iterate2_close~~
 </tr>
diff --git a/flowplayer/LICENSE.txt b/flowplayer/LICENSE.txt
new file mode 100644 (file)
index 0000000..2a00962
--- /dev/null
@@ -0,0 +1,721 @@
+The Flowplayer Free version is released under the
+GNU GENERAL PUBLIC LICENSE Version 3 (GPL).
+
+The GPL requires that you not remove the Flowplayer copyright notices
+from the user interface. See section 5.d below.
+
+Commercial licenses are available. The commercial player version
+does not require any Flowplayer notices or texts and also provides
+some additional features.
+
+========================================================================
+
+ADDITIONAL TERM per GPL Section 7
+If you convey this program (or any modifications of it) and assume
+contractual liability for the program to recipients of it, you agree
+to indemnify Flowplayer, Ltd. for any liability that those contractual
+assumptions impose on Flowplayer, Ltd.
+
+Except as expressly provided herein, no trademark rights are granted in
+any trademarks of Flowplayer, Ltd. Licensees are granted a limited,
+non-exclusive right to use the mark Flowplayer and the Flowplayer logos
+in connection with unmodified copies of the Program and the copyright
+notices required by section 5.d of the GPL license. For the purposes
+of this limited trademark license grant, customizing the Flowplayer
+by skinning, scripting, or including PlugIns provided by Flowplayer, Ltd.
+is not considered modifying the Program.
+
+Licensees that do modify the Program, taking advantage of the open-source
+license, may not use the Flowplayer mark or Flowplayer logos and must
+change the fullscreen notice (and the non-fullscreen notice, if that
+option is enabled), the copyright notice in the dialog box, and the
+notice on the Canvas as follows:
+
+the full screen (and non-fullscreen equivalent, if activated) notice
+should read: "Based on Flowplayer source code"; in the context menu
+(right-click menu), the link to "About Flowplayer free version #.#.#"
+can remain. The copyright notice can remain, but must be supplemented with
+an additional notice, stating that the licensee modified the Flowplayer. 
+A suitable notice might read "Flowplayer Source code modified by ModOrg 2009";
+for the canvas, the notice should read "Based on Flowplayer source code".
+In addition, licensees that modify the Program must give the modified
+Program a new name that is not confusingly similar to Flowplayer and
+may not distribute it under the name Flowplayer.
+
+========================================================================
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/flowplayer/flowplayer-3.1.4.min.js b/flowplayer/flowplayer-3.1.4.min.js
new file mode 100644 (file)
index 0000000..e8fa742
--- /dev/null
@@ -0,0 +1,24 @@
+/* 
+ * flowplayer.js 3.1.4. The Flowplayer API
+ * 
+ * Copyright 2009 Flowplayer Oy
+ * 
+ * This file is part of Flowplayer.
+ * 
+ * Flowplayer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Flowplayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Flowplayer.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Date: 2009-02-25 21:24:29 +0000 (Wed, 25 Feb 2009)
+ * Revision: 166 
+ */
+(function(){function g(o){console.log("$f.fireEvent",[].slice.call(o))}function k(q){if(!q||typeof q!="object"){return q}var o=new q.constructor();for(var p in q){if(q.hasOwnProperty(p)){o[p]=k(q[p])}}return o}function m(t,q){if(!t){return}var o,p=0,r=t.length;if(r===undefined){for(o in t){if(q.call(t[o],o,t[o])===false){break}}}else{for(var s=t[0];p<r&&q.call(s,p,s)!==false;s=t[++p]){}}return t}function c(o){return document.getElementById(o)}function i(q,p,o){if(typeof p!="object"){return q}if(q&&p){m(p,function(r,s){if(!o||typeof s!="function"){q[r]=s}})}return q}function n(s){var q=s.indexOf(".");if(q!=-1){var p=s.substring(0,q)||"*";var o=s.substring(q+1,s.length);var r=[];m(document.getElementsByTagName(p),function(){if(this.className&&this.className.indexOf(o)!=-1){r.push(this)}});return r}}function f(o){o=o||window.event;if(o.preventDefault){o.stopPropagation();o.preventDefault()}else{o.returnValue=false;o.cancelBubble=true}return false}function j(q,o,p){q[o]=q[o]||[];q[o].push(p)}function e(){return"_"+(""+Math.random()).substring(2,10)}var h=function(t,r,s){var q=this;var p={};var u={};q.index=r;if(typeof t=="string"){t={url:t}}i(this,t,true);m(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var v="on"+this;if(v.indexOf("*")!=-1){v=v.substring(0,v.length-1);var w="onBefore"+v.substring(2);q[w]=function(x){j(u,w,x);return q}}q[v]=function(x){j(u,v,x);return q};if(r==-1){if(q[w]){s[w]=q[w]}if(q[v]){s[v]=q[v]}}});i(this,{onCuepoint:function(x,w){if(arguments.length==1){p.embedded=[null,x];return q}if(typeof x=="number"){x=[x]}var v=e();p[v]=[x,w];if(s.isLoaded()){s._api().fp_addCuepoints(x,r,v)}return q},update:function(w){i(q,w);if(s.isLoaded()){s._api().fp_updateClip(w,r)}var v=s.getConfig();var x=(r==-1)?v.clip:v.playlist[r];i(x,w,true)},_fireEvent:function(v,y,w,A){if(v=="onLoad"){m(p,function(B,C){if(C[0]){s._api().fp_addCuepoints(C[0],r,B)}});return false}A=A||q;if(v=="onCuepoint"){var z=p[y];if(z){return z[1].call(s,A,w)}}if(y&&"onBeforeBegin,onMetaData,onStart,onUpdate,onResume".indexOf(v)!=-1){i(A,y);if(y.metaData){if(!A.duration){A.duration=y.metaData.duration}else{A.fullDuration=y.metaData.duration}}}var x=true;m(u[v],function(){x=this.call(s,A,y,w)});return x}});if(t.onCuepoint){var o=t.onCuepoint;q.onCuepoint.apply(q,typeof o=="function"?[o]:o);delete t.onCuepoint}m(t,function(v,w){if(typeof w=="function"){j(u,v,w);delete t[v]}});if(r==-1){s.onCuepoint=this.onCuepoint}};var l=function(p,r,q,t){var s={};var o=this;var u=false;if(t){i(s,t)}m(r,function(v,w){if(typeof w=="function"){s[v]=w;delete r[v]}});i(this,{animate:function(y,z,x){if(!y){return o}if(typeof z=="function"){x=z;z=500}if(typeof y=="string"){var w=y;y={};y[w]=z;z=500}if(x){var v=e();s[v]=x}if(z===undefined){z=500}r=q._api().fp_animate(p,y,z,v);return o},css:function(w,x){if(x!==undefined){var v={};v[w]=x;w=v}r=q._api().fp_css(p,w);i(o,r);return o},show:function(){this.display="block";q._api().fp_showPlugin(p);return o},hide:function(){this.display="none";q._api().fp_hidePlugin(p);return o},toggle:function(){this.display=q._api().fp_togglePlugin(p);return o},fadeTo:function(y,x,w){if(typeof x=="function"){w=x;x=500}if(w){var v=e();s[v]=w}this.display=q._api().fp_fadeTo(p,y,x,v);this.opacity=y;return o},fadeIn:function(w,v){return o.fadeTo(1,w,v)},fadeOut:function(w,v){return o.fadeTo(0,w,v)},getName:function(){return p},getPlayer:function(){return q},_fireEvent:function(w,v,x){if(w=="onUpdate"){var y=q._api().fp_getPlugin(p);if(!y){return}i(o,y);delete o.methods;if(!u){m(y.methods,function(){var A=""+this;o[A]=function(){var B=[].slice.call(arguments);var C=q._api().fp_invoke(p,A,B);return C==="undefined"||C===undefined?o:C}});u=true}}var z=s[w];if(z){z.apply(o,v);if(w.substring(0,1)=="_"){delete s[w]}}}})};function b(o,t,z){var E=this,y=null,x,u,p=[],s={},B={},r,v,w,D,A,q;i(E,{id:function(){return r},isLoaded:function(){return(y!==null)},getParent:function(){return o},hide:function(F){if(F){o.style.height="0px"}if(y){y.style.height="0px"}return E},show:function(){o.style.height=q+"px";if(y){y.style.height=A+"px"}return E},isHidden:function(){return y&&parseInt(y.style.height,10)===0},load:function(F){if(!y&&E._fireEvent("onBeforeLoad")!==false){m(a,function(){this.unload()});x=o.innerHTML;if(x&&!flashembed.isSupported(t.version)){o.innerHTML=""}flashembed(o,t,{config:z});if(F){F.cached=true;j(B,"onLoad",F)}}return E},unload:function(){if(x.replace(/\s/g,"")!==""){if(E._fireEvent("onBeforeUnload")===false){return E}try{if(y){y.fp_close();E._fireEvent("onUnload")}}catch(F){}y=null;o.innerHTML=x}return E},getClip:function(F){if(F===undefined){F=D}return p[F]},getCommonClip:function(){return u},getPlaylist:function(){return p},getPlugin:function(F){var H=s[F];if(!H&&E.isLoaded()){var G=E._api().fp_getPlugin(F);if(G){H=new l(F,G,E);s[F]=H}}return H},getScreen:function(){return E.getPlugin("screen")},getControls:function(){return E.getPlugin("controls")},getConfig:function(F){return F?k(z):z},getFlashParams:function(){return t},loadPlugin:function(I,H,K,J){if(typeof K=="function"){J=K;K={}}var G=J?e():"_";E._api().fp_loadPlugin(I,H,K,G);var F={};F[G]=J;var L=new l(I,null,E,F);s[I]=L;return L},getState:function(){return y?y.fp_getState():-1},play:function(G,F){function H(){if(G!==undefined){E._api().fp_play(G,F)}else{E._api().fp_play()}}if(y){H()}else{E.load(function(){H()})}return E},getVersion:function(){var G="flowplayer.js 3.1.4";if(y){var F=y.fp_getVersion();F.push(G);return F}return G},_api:function(){if(!y){throw"Flowplayer "+E.id()+" not loaded when calling an API method"}return y},setClip:function(F){E.setPlaylist([F]);return E},getIndex:function(){return w}});m(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var F="on"+this;if(F.indexOf("*")!=-1){F=F.substring(0,F.length-1);var G="onBefore"+F.substring(2);E[G]=function(H){j(B,G,H);return E}}E[F]=function(H){j(B,F,H);return E}});m(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed").split(","),function(){var F=this;E[F]=function(H,G){if(!y){return E}var I=null;if(H!==undefined&&G!==undefined){I=y["fp_"+F](H,G)}else{I=(H===undefined)?y["fp_"+F]():y["fp_"+F](H)}return I==="undefined"||I===undefined?E:I}});E._fireEvent=function(O){if(typeof O=="string"){O=[O]}var P=O[0],M=O[1],K=O[2],J=O[3],I=0;if(z.debug){g(O)}if(!y&&P=="onLoad"&&M=="player"){y=y||c(v);A=y.clientHeight;m(p,function(){this._fireEvent("onLoad")});m(s,function(Q,R){R._fireEvent("onUpdate")});u._fireEvent("onLoad")}if(P=="onLoad"&&M!="player"){return}if(P=="onError"){if(typeof M=="string"||(typeof M=="number"&&typeof K=="number")){M=K;K=J}}if(P=="onContextMenu"){m(z.contextMenu[M],function(Q,R){R.call(E)});return}if(P=="onPluginEvent"){var F=M.name||M;var G=s[F];if(G){G._fireEvent("onUpdate",M);G._fireEvent(K,O.slice(3))}return}if(P=="onPlaylistReplace"){p=[];var L=0;m(M,function(){p.push(new h(this,L++,E))})}if(P=="onClipAdd"){if(M.isInStream){return}M=new h(M,K,E);p.splice(K,0,M);for(I=K+1;I<p.length;I++){p[I].index++}}var N=true;if(typeof M=="number"&&M<p.length){D=M;var H=p[M];if(H){N=H._fireEvent(P,K,J)}if(!H||N!==false){N=u._fireEvent(P,K,J,H)}}m(B[P],function(){N=this.call(E,M,K);if(this.cached){B[P].splice(I,1)}if(N===false){return false}I++});return N};function C(){if($f(o)){$f(o).getParent().innerHTML="";w=$f(o).getIndex();a[w]=E}else{a.push(E);w=a.length-1}q=parseInt(o.style.height,10)||o.clientHeight;if(typeof t=="string"){t={src:t}}r=o.id||"fp"+e();v=t.id||r+"_api";t.id=v;z.playerId=r;if(typeof z=="string"){z={clip:{url:z}}}if(typeof z.clip=="string"){z.clip={url:z.clip}}z.clip=z.clip||{};if(o.getAttribute("href",2)&&!z.clip.url){z.clip.url=o.getAttribute("href",2)}u=new h(z.clip,-1,E);z.playlist=z.playlist||[z.clip];var F=0;m(z.playlist,function(){var H=this;if(typeof H=="object"&&H.length){H={url:""+H}}m(z.clip,function(I,J){if(J!==undefined&&H[I]===undefined&&typeof J!="function"){H[I]=J}});z.playlist[F]=H;H=new h(H,F,E);p.push(H);F++});m(z,function(H,I){if(typeof I=="function"){if(u[H]){u[H](I)}else{j(B,H,I)}delete z[H]}});m(z.plugins,function(H,I){if(I){s[H]=new l(H,I,E)}});if(!z.plugins||z.plugins.controls===undefined){s.controls=new l("controls",null,E)}s.canvas=new l("canvas",null,E);t.bgcolor=t.bgcolor||"#000000";t.version=t.version||[9,0];t.expressInstall="http://www.flowplayer.org/swf/expressinstall.swf";function G(H){if(!E.isLoaded()&&E._fireEvent("onBeforeClick")!==false){E.load()}return f(H)}x=o.innerHTML;if(x.replace(/\s/g,"")!==""){if(o.addEventListener){o.addEventListener("click",G,false)}else{if(o.attachEvent){o.attachEvent("onclick",G)}}}else{if(o.addEventListener){o.addEventListener("click",f,false)}E.load()}}if(typeof o=="string"){flashembed.domReady(function(){var F=c(o);if(!F){throw"Flowplayer cannot access element: "+o}else{o=F;C()}})}else{C()}}var a=[];function d(o){this.length=o.length;this.each=function(p){m(o,p)};this.size=function(){return o.length}}window.flowplayer=window.$f=function(){var p=null;var o=arguments[0];if(!arguments.length){m(a,function(){if(this.isLoaded()){p=this;return false}});return p||a[0]}if(arguments.length==1){if(typeof o=="number"){return a[o]}else{if(o=="*"){return new d(a)}m(a,function(){if(this.id()==o.id||this.id()==o||this.getParent()==o){p=this;return false}});return p}}if(arguments.length>1){var r=arguments[1];var q=(arguments.length==3)?arguments[2]:{};if(typeof o=="string"){if(o.indexOf(".")!=-1){var t=[];m(n(o),function(){t.push(new b(this,k(r),k(q)))});return new d(t)}else{var s=c(o);return new b(s!==null?s:o,r,q)}}else{if(o){return new b(o,r,q)}}}return null};i(window.$f,{fireEvent:function(){var o=[].slice.call(arguments);var q=$f(o[0]);return q?q._fireEvent(o.slice(1)):null},addPlugin:function(o,p){b.prototype[o]=p;return $f},each:m,extend:i});if(typeof jQuery=="function"){jQuery.prototype.flowplayer=function(q,p){if(!arguments.length||typeof arguments[0]=="number"){var o=[];this.each(function(){var r=$f(this);if(r){o.push(r)}});return arguments.length?o[arguments[0]]:new d(o)}return this.each(function(){$f(this,k(q),p?k(p):{})})}}})();(function(){var e=typeof jQuery=="function";var i={width:"100%",height:"100%",allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:null,onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(e){jQuery.tools=jQuery.tools||{};jQuery.tools.flashembed={version:"1.0.4",conf:i}}function j(){if(c.done){return false}var l=document;if(l&&l.getElementsByTagName&&l.getElementById&&l.body){clearInterval(c.timer);c.timer=null;for(var k=0;k<c.ready.length;k++){c.ready[k].call()}c.ready=null;c.done=true}}var c=e?jQuery:function(k){if(c.done){return k()}if(c.timer){c.ready.push(k)}else{c.ready=[k];c.timer=setInterval(j,13)}};function f(l,k){if(k){for(key in k){if(k.hasOwnProperty(key)){l[key]=k[key]}}}return l}function g(k){switch(h(k)){case"string":k=k.replace(new RegExp('(["\\\\])',"g"),"\\$1");k=k.replace(/^\s?(\d+)%/,"$1pct");return'"'+k+'"';case"array":return"["+b(k,function(n){return g(n)}).join(",")+"]";case"function":return'"function()"';case"object":var l=[];for(var m in k){if(k.hasOwnProperty(m)){l.push('"'+m+'":'+g(k[m]))}}return"{"+l.join(",")+"}"}return String(k).replace(/\s/g," ").replace(/\'/g,'"')}function h(l){if(l===null||l===undefined){return false}var k=typeof l;return(k=="object"&&l.push)?"array":k}if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function b(k,n){var m=[];for(var l in k){if(k.hasOwnProperty(l)){m[l]=n(k[l])}}return m}function a(r,t){var q=f({},r);var s=document.all;var n='<object width="'+q.width+'" height="'+q.height+'"';if(s&&!q.id){q.id="_"+(""+Math.random()).substring(9)}if(q.id){n+=' id="'+q.id+'"'}if(q.cachebusting){q.src+=((q.src.indexOf("?")!=-1?"&":"?")+Math.random())}if(q.w3c||!s){n+=' data="'+q.src+'" type="application/x-shockwave-flash"'}else{n+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'}n+=">";if(q.w3c||s){n+='<param name="movie" value="'+q.src+'" />'}q.width=q.height=q.id=q.w3c=q.src=null;for(var l in q){if(q[l]!==null){n+='<param name="'+l+'" value="'+q[l]+'" />'}}var o="";if(t){for(var m in t){if(t[m]!==null){o+=m+"="+(typeof t[m]=="object"?g(t[m]):t[m])+"&"}}o=o.substring(0,o.length-1);n+='<param name="flashvars" value=\''+o+"' />"}n+="</object>";return n}function d(m,p,l){var k=flashembed.getVersion();f(this,{getContainer:function(){return m},getConf:function(){return p},getVersion:function(){return k},getFlashvars:function(){return l},getApi:function(){return m.firstChild},getHTML:function(){return a(p,l)}});var q=p.version;var r=p.expressInstall;var o=!q||flashembed.isSupported(q);if(o){p.onFail=p.version=p.expressInstall=null;m.innerHTML=a(p,l)}else{if(q&&r&&flashembed.isSupported([6,65])){f(p,{src:r});l={MMredirectURL:location.href,MMplayerType:"PlugIn",MMdoctitle:document.title};m.innerHTML=a(p,l)}else{if(m.innerHTML.replace(/\s/g,"")!==""){}else{m.innerHTML="<h2>Flash version "+q+" or greater is required</h2><h3>"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"</h3>"+(m.tagName=="A"?"<p>Click here to download latest version</p>":"<p>Download latest version from <a href='http://www.adobe.com/go/getflashplayer'>here</a></p>");if(m.tagName=="A"){m.onclick=function(){location.href="http://www.adobe.com/go/getflashplayer"}}}}}if(!o&&p.onFail){var n=p.onFail.call(this);if(typeof n=="string"){m.innerHTML=n}}if(document.all){window[p.id]=document.getElementById(p.id)}}window.flashembed=function(l,m,k){if(typeof l=="string"){var n=document.getElementById(l);if(n){l=n}else{c(function(){flashembed(l,m,k)});return}}if(!l){return}if(typeof m=="string"){m={src:m}}var o=f({},i);f(o,m);return new d(l,o,k)};f(window.flashembed,{getVersion:function(){var m=[0,0];if(navigator.plugins&&typeof navigator.plugins["Shockwave Flash"]=="object"){var l=navigator.plugins["Shockwave Flash"].description;if(typeof l!="undefined"){l=l.replace(/^.*\s+(\S+\s+\S+$)/,"$1");var n=parseInt(l.replace(/^(.*)\..*$/,"$1"),10);var r=/r/.test(l)?parseInt(l.replace(/^.*r(.*)$/,"$1"),10):0;m=[n,r]}}else{if(window.ActiveXObject){try{var p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7")}catch(q){try{p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");m=[6,0];p.AllowScriptAccess="always"}catch(k){if(m[0]==6){return m}}try{p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(o){}}if(typeof p=="object"){l=p.GetVariable("$version");if(typeof l!="undefined"){l=l.replace(/^\S+\s+(.*)$/,"$1").split(",");m=[parseInt(l[0],10),parseInt(l[2],10)]}}}}return m},isSupported:function(k){var m=flashembed.getVersion();var l=(m[0]>k[0])||(m[0]==k[0]&&m[1]>=k[1]);return l},domReady:c,asString:g,getHTML:a});if(e){jQuery.fn.flashembed=function(l,k){var m=null;this.each(function(){m=flashembed(this,l,k)});return l.api===false?this:m}}})();
\ No newline at end of file
diff --git a/flowplayer/flowplayer-3.1.5.swf b/flowplayer/flowplayer-3.1.5.swf
new file mode 100644 (file)
index 0000000..63f3934
Binary files /dev/null and b/flowplayer/flowplayer-3.1.5.swf differ
diff --git a/flowplayer/flowplayer.controls-3.1.5.swf b/flowplayer/flowplayer.controls-3.1.5.swf
new file mode 100644 (file)
index 0000000..aacdcd3
Binary files /dev/null and b/flowplayer/flowplayer.controls-3.1.5.swf differ
index 9ea013d38963742d93e3caf24505fa499e5e193f..0835033fca68a41c37e9b635bc7a82c4bd816dfd 100644 (file)
@@ -31,17 +31,23 @@ $image_head_code = '<meta name="generator" content="Booh-' + $VERSION + <<'EOF'
  http://booh.org/"/>
 
 <script language="JavaScript1.1" type="text/JavaScript">
-images = new Array(~~images~~);
+var images = new Array(~~images~~);
+var types = new Array(~~types~~);
+var videos = new Array(~~videos~~);
+var videos_widths = new Array(~~videos_widths~~);
+var videos_heights = new Array(~~videos_heights~~);
 ~~other_images~~
-thumbnailspages = new Array(~~thumbnailspages~~);
-other_sizes = new Array(~~other_sizes~~);
-captions = new Array(~~captions~~);
+var thumbnailspages = new Array(~~thumbnailspages~~);
+var other_sizes = new Array(~~other_sizes~~);
+var captions = new Array(~~captions~~);
 
 dbltilda_current_size = '~~current_size~~';
 dbltilda_theme = '~~theme~~';
 dbltilda_stop_slideshow = '~~stop_slideshow~~';
 dbltilda_run_slideshow = '~~run_slideshow~~';
 dbltilda_htmlsuffix = '~~htmlsuffix~~';
+dbltilda_pathtobase = '~~pathtobase~~';
+dbltilda_flowplayer_active = '~~flowplayer_active~~';
 </script>
 EOF
 
@@ -87,7 +93,7 @@ $pause_slideshow = '
 
 
 $image = <<'EOF'
-  <img name="main_img" src="fake" alt="Loading image, please wait..."/>
+  <span id="main_img">Loading image, please wait...</span>
 EOF
 
 $image_counter_additions = <<'EOF'