transitional xhtml compliant
authorgc <gc>
Sun, 6 Nov 2005 01:12:03 +0000 (01:12 +0000)
committergc <gc>
Sun, 6 Nov 2005 01:12:03 +0000 (01:12 +0000)
bin/booh
bin/booh-backend
data/booh/themes/dark/skeleton_image.html
data/booh/themes/dark/skeleton_index.html
data/booh/themes/dark/skeleton_thumbnails.html
data/booh/themes/simple/skeleton_image.html
data/booh/themes/simple/skeleton_index.html
data/booh/themes/simple/skeleton_thumbnails.html
lib/booh/html-merges.rb

index aff026b95443f1f37d1f4dad600bf291fde8e1a6..34faec732656da3cd426eebf9e9c0f07e2c15cdc 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -3390,6 +3390,8 @@ Click to view it in your browser:") % $xmldoc.root.attributes['destination']),
     one_click.image = Gtk::Image.new("#{$FPATH}/images/stock-tools-16.png")
     helpsubmenu.append(speed = Gtk::ImageMenuItem.new(utf8(_("Speedup: key shortcuts and mouse gestures"))))
     speed.image = Gtk::Image.new("#{$FPATH}/images/stock-info-16.png")
+    helpsubmenu.append(tutos = Gtk::ImageMenuItem.new(utf8(_("Online tutorials (opens a web-browser)"))))
+    tutos.image = Gtk::Image.new("#{$FPATH}/images/stock-web-16.png")
     helpsubmenu.append(        Gtk::SeparatorMenuItem.new)
     helpsubmenu.append(about = Gtk::ImageMenuItem.new(Gtk::Stock::ABOUT))
     helpmenu.set_submenu(helpsubmenu)
@@ -3425,6 +3427,9 @@ for speeding up your editions. If bothered, you can disable them from Edit/Prefe
 ")), { :pos_centered => true, :not_transient => true })
     }
 
+    tutos.signal_connect('activate') {
+        open_url('http://zarb.org/~gc/html/booh/tutorial.html')
+    }
 
     about.signal_connect('activate') {
         Gtk::AboutDialog.set_url_hook { |dialog, url| open_url(url) }
index 3e090fb3a2426041c2a18753ee4f143ba117923c..b34272e1af9786c2015f0339dc56af30896e7e0f 100755 (executable)
@@ -469,7 +469,7 @@ def img_element(fullpath)
     else
         sizespec = ''
     end
-    return '<img src="' + File.basename(fullpath) + '" ' + sizespec + ' class="image"/>'
+    return '<img src="' + File.basename(fullpath) + '" ' + sizespec + ' class="image" alt="image"/>'
 end
 
 def size2js(name)
index b4d1210e4904c1c9395303117f1b1bd48ec404c6..8887a1a2f6b2b23957ee14b5f9fff3393a9dc3f3 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Dark' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Dark' theme - Guillaume Cottenceau"/>
     ~~~image_head_code~~~
     <style type="text/css" media="screen">
     <!--
@@ -99,6 +99,7 @@ input:hover {
         ~~~pause_slideshow~~~
         <br/>
         <font size="-1">~~previous_album~~ ~~ifprevious_album?~~|~~fi~~ ~~thumbnails~~ ~~ifnext_album?~~|~~fi~~ ~~next_album~~</font>
+    </td>
 </tr>
 </table>
 
index 18493213a8d5e2f2955972e0a76fc7b2d06ed6ad..25700e029ae7e12354908496ef617a5fa25299db 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Dark' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Dark' theme - Guillaume Cottenceau"/>
     <style type="text/css" media="screen">
     <!--
 body {
index fc5a3dabc7c27aefd26752be725a17c6c75eb50e..9c4540f968d6a5b4d752380ed918feeac93bf615 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Dark' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Dark' theme - Guillaume Cottenceau"/>
     ~~~thumbnails_head_code~~~
     <style type="text/css" media="screen">
     <!--
@@ -60,7 +60,7 @@ input {
     ~~iterate2_open_maxN~~
     <td align="center" valign="top">
        ~~image_iteration~~
-       <p>~~ifvideo?~~<img src="video.png"/>~~fi~~ ~~caption_iteration~~</p>
+       <p>~~ifvideo?~~<img src="video.png" alt="video"/>~~fi~~ ~~caption_iteration~~</p>
     </td>
     ~~iterate2_close~~
 </tr>
index f1682804dbcce7fa997d3576c46912548d414a46..23df0dc1063e445ef9d1ee53f40fd5e2475a2108 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Simple' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Simple' theme - Guillaume Cottenceau"/>
     ~~~image_head_code~~~
     <style type="text/css" media="screen">
     <!--
@@ -88,6 +88,7 @@ input:hover {
         ~~~pause_slideshow~~~
         <br/>
         <font size="-1">~~previous_album~~ ~~ifprevious_album?~~|~~fi~~ ~~thumbnails~~ ~~ifnext_album?~~|~~fi~~ ~~next_album~~</font>
+    </td>
 </tr>
 </table>
 
index d280abc5b06c3cd123a360bd8d9171d324fd7013..37b19724855bab1a4efee5d9fac807011bf06822 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Simple' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Simple' theme - Guillaume Cottenceau"/>
     <style type="text/css" media="screen">
     <!--
 body {
index 33305d6b3c487906e1dd564e60eca0647d1f1f62..af789ff3ad6b0f3b373987ac38dfc55f8874f074 100644 (file)
@@ -4,7 +4,7 @@
 <head>
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="author" content="`Simple' theme - Guillaume Cottenceau">
+    <meta name="author" content="'Simple' theme - Guillaume Cottenceau"/>
     ~~~thumbnails_head_code~~~
     <style type="text/css" media="screen">
     <!--
@@ -58,7 +58,7 @@ input {
     ~~iterate2_open_maxN~~
     <td align="center" valign="top" ~~colspan~~>
        ~~image_iteration~~
-       <p>~~ifvideo?~~<img src="video.png"/>~~fi~~ ~~caption_iteration~~</p>
+       <p>~~ifvideo?~~<img src="video.png" alt="video"/>~~fi~~ ~~caption_iteration~~</p>
     </td>
     ~~iterate2_close~~
 </tr>
index c4ef279f0c5223c6d3ae7e496a4598b1e1c9f7a7..8ae534322442399f967d617dc08f899f709f2b71 100644 (file)
@@ -24,10 +24,11 @@ require 'gettext'
 bindtextdomain("booh")
 
 require 'booh/booh-lib'
+require 'booh/version.rb'
 include Booh
 
-$image_head_code = <<'EOF'
-<meta name="generator" content="Generated by Booh! http://zarb.org/~gc/html/booh.html">
+$image_head_code = '<meta name="generator" content="Booh-' + $VERSION + <<'EOF'
+ http://zarb.org/~gc/html/booh.html"/>
 
 <script language="JavaScript1.1" type="text/JavaScript">
 var images = new Array(~~images~~);
@@ -424,25 +425,25 @@ onload="init()" id="body"
 EOF
 
 $button_first = '
-    <form><input type="button"
+    <form action="fake"><input type="button"
                  onclick="first()"
                  value="' + utf8(_('<<- First')) + '"
                  id="b_first"/></form>'
 
 $button_previous = '
-    <form><input type="button"
+    <form action="fake"><input type="button"
                  onclick="previous()"
                  value="' + utf8(_('<- Previous')) + '"
                  id="b_previous"/></form>'
 
 $button_next = '
-    <form><input type="button"
+    <form action="fake"><input type="button"
                  onclick="next()"
                  value="' + utf8(_('Next ->')) + '"
                  id="b_next"/></form>'
 
 $button_last = '
-    <form><input type="button"
+    <form action="fake"><input type="button"
                  onclick="last()"
                  value="' + utf8(_('Last ->>')) + '"
                  id="b_last"/></form>'
@@ -458,7 +459,7 @@ $pause_slideshow = '
 
 
 $image = <<'EOF'
-  <img name="main_img" class="image">
+  <img name="main_img" class="image" src="fake" alt="main image"/>
 EOF
 
 $image_counter_additions = <<'EOF'
@@ -473,8 +474,8 @@ $body_code = <<'EOF'
 EOF
 
 
-$thumbnails_head_code = <<'EOF'
-<meta name="generator" content="Generated by Booh! http://zarb.org/~gc/html/booh.html">
+$thumbnails_head_code = '<meta name="generator" content="Booh-' + $VERSION + <<'EOF'
+ http://zarb.org/~gc/html/booh.html"/>
 
 <script language="JavaScript1.1" type="text/JavaScript">
     var expires = new Date(new Date().getTime() + (30 * 86400000));  // 30 days