Merge branch 'master' of ssh://git.zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 19 May 2012 20:21:53 +0000 (22:21 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 19 May 2012 20:21:53 +0000 (22:21 +0200)
18 files changed:
bin/booh-backend
data/booh/themes/gradient/root/booh.png
data/booh/themes/gradient/root/bread_blue.png
data/booh/themes/gradient/root/bread_selected_blue.png
data/booh/themes/gradient/root/go-first-dark.png
data/booh/themes/gradient/root/go-first.png
data/booh/themes/gradient/root/go-last-dark.png
data/booh/themes/gradient/root/go-last.png
data/booh/themes/gradient/root/go-next-dark.png
data/booh/themes/gradient/root/go-next.png
data/booh/themes/gradient/root/go-previous-dark.png
data/booh/themes/gradient/root/go-previous.png
data/booh/themes/gradient/root/play_video.png
data/booh/themes/gradient/root/slideshow_32s.png
data/booh/themes/gradient/skeleton_image.html
data/booh/themes/gradient/skeleton_index.html
data/booh/themes/gradient/skeleton_thumbnails.html
www/index.html

index 1dbc88c..bd575b9 100644 (file)
@@ -943,6 +943,12 @@ def walk_source_dir
         if !$forgui
             ios = File.open("#{dest_dir}/.htaccess", "w")
             ios.write("AddCharset UTF-8 .html\n")
+            ios.write("\n")
+            ios.write("<IfModule mod_expires.c>\n")
+            ios.write(" ExpiresActive On\n")
+            ios.write(" ExpiresDefault A1800\n")
+            ios.write("</IfModule>")
+            ios.write("\n")
             if auth_user_file = xmldir.attributes['password-protect']
                 msg 3, _("\tgenerating password protection file #{dest_dir}/.htaccess")
                 ios.write("AuthType Basic\nAuthName \"protected area\"\nAuthUserFile #{auth_user_file}\nrequire valid-user\n")
index c3a3984..612d722 100644 (file)
Binary files a/data/booh/themes/gradient/root/booh.png and b/data/booh/themes/gradient/root/booh.png differ
index c784694..0c1f4eb 100644 (file)
Binary files a/data/booh/themes/gradient/root/bread_blue.png and b/data/booh/themes/gradient/root/bread_blue.png differ
index cbf49a9..898e548 100644 (file)
Binary files a/data/booh/themes/gradient/root/bread_selected_blue.png and b/data/booh/themes/gradient/root/bread_selected_blue.png differ
index ac6759c..4d347a4 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-first-dark.png and b/data/booh/themes/gradient/root/go-first-dark.png differ
index bfbea4e..d6f58be 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-first.png and b/data/booh/themes/gradient/root/go-first.png differ
index abc46cd..1bbd043 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-last-dark.png and b/data/booh/themes/gradient/root/go-last-dark.png differ
index 401ddd9..eec3608 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-last.png and b/data/booh/themes/gradient/root/go-last.png differ
index a0dcc89..322eb10 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-next-dark.png and b/data/booh/themes/gradient/root/go-next-dark.png differ
index 624e476..a72d271 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-next.png and b/data/booh/themes/gradient/root/go-next.png differ
index 018749f..a482eec 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-previous-dark.png and b/data/booh/themes/gradient/root/go-previous-dark.png differ
index 31e33f6..4b79ec2 100644 (file)
Binary files a/data/booh/themes/gradient/root/go-previous.png and b/data/booh/themes/gradient/root/go-previous.png differ
index 983b29f..79f10c5 100644 (file)
Binary files a/data/booh/themes/gradient/root/play_video.png and b/data/booh/themes/gradient/root/play_video.png differ
index 82e3a5f..b1348bb 100644 (file)
Binary files a/data/booh/themes/gradient/root/slideshow_32s.png and b/data/booh/themes/gradient/root/slideshow_32s.png differ
index 914b364..484b087 100644 (file)
@@ -5,10 +5,10 @@
     <title>~~title~~</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="author" content="'Gradient' theme - Benoit Dien"/>
+    <link rel="stylesheet" type="text/css" href="~~pathtobase~~booh.css" media="screen" />
     ~~~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>
 
 <body ~~~body_additions~~~>
@@ -84,7 +84,7 @@
   </tr>
 </table>
 
-<div id="logo"><a href="http://booh.org"><img src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
+<div id="logo"><a href="http://booh.org"><img width="91" height="44" src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
 
 </body>
 </html>
index 3d25903..b97a25c 100644 (file)
@@ -47,7 +47,7 @@
 </table>
 </div>
 
-<div id="logo"><a href="http://booh.org"><img src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
+<div id="logo"><a href="http://booh.org"><img width="91" height="44" src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
 
 </body>
 </html>
index 34e05c5..a9d4e90 100644 (file)
@@ -33,7 +33,7 @@
   <div id='titletext'>~~title~~</div> 
 
   <div id="tools">
-    <a href="~~run_slideshow_link~~"><img src="~~pathtobase~~slideshow_32s.png" alt="~~run_slideshow_text~~"/></a>
+    <a href="~~run_slideshow_link~~"><img width="40" height="32" src="~~pathtobase~~slideshow_32s.png" alt="~~run_slideshow_text~~"/></a>
     &nbsp;
     <span id="sizes">~~sizes~~ | ~~</span>
   </div> 
@@ -61,7 +61,7 @@
 
 ~~ifmultiplepages?~~<p align="center"><font size="+1">~~multiplepagesstuff~~</font></p>~~fi~~
 
-<div id="logo"><a href="http://booh.org"><img src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
+<div id="logo"><a href="http://booh.org"><img width="91" height="44" src="~~pathtobase~~booh.png" alt="Made with Booh"/></a></div>
 
 </body>
 </html>
index 227291a..b0b30f9 100644 (file)
@@ -4,34 +4,34 @@
 <head>
   <title>Booh - The Web-Album of choice for discriminating Linux users</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<script type="text/javascript">
-/* <![CDATA[ */
-    (function() {
-        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
-        
-        s.type = 'text/javascript';
-        s.async = true;
-        s.src = 'http://api.flattr.com/js/0.5.0/load.js?mode=auto';
-        
-        t.parentNode.insertBefore(s, t);
-    })();
-/* ]]> */
-</script>
+  <meta name="viewport" content="width=device-width"/>  
+<style type="text/css">
+body {
+        font-family: Verdana, Arial, Helvetica, sans-serif, monospace;
+       text-align: justify;
+}
+@media all and (orientation: landscape) {  
+    body {
+        margin-left: 15%;
+       margin-right: 15%;
+    }
+}
+</style>
 </head>
 
-<body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b" style="padding: 0em 3em; text-align: justify">
+<body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b">
 
    <table width="100%" cellspacing="0" cellpadding="0">
      <tr>
-       <td width="25%" align="left" valign="top">
+       <td width="10%" align="left" valign="top">
          <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://booh.org/"></a>
        </td>
        <td width="50%" align="center">
          <img src="images/logo.png" alt="booh logo"/>
        </td>
-       <td width="25%" align="right" valign="top">
-         <img src="images/en.png" alt="this page is in english"/>
-         <a href="index.fr.html"><img src="images/fr.png" alt="cette page en fran├žais"/></a>
+       <td width="10%" align="right" valign="top">
+        <div style="display:inline-block; margin-bottom:0.2em"><img src="images/en.png" alt="this page is in english"/></div>
+        <div style="display:inline-block"><a href="index.fr.html"><img src="images/fr.png" alt="cette page en fran├žais"/></a></div>
        </td>
      </tr>
    </table>
    - <a href="themes/cardu/">watch the results</a>.
    </p>
 
-     <table width="1%" align="center" style="border-style:solid;border-color:#C0C0C0;border-width:1px 1px 1px 1px;padding:5px" cellspacing="0" cellpadding="0">
-            <tr>
-                    <td align="center"><a href="http://booh.org/images/tutorial-classifier-2.png"><img src="images/scenario_1.jpg" alt="scenario #1" border="0"/></a></td>
-                    <td><img src="images/scenario_arrow.jpg" alt="scenario arrow"/></td>
-                    <td align="center"><a href="http://booh.org/images/tutorial-classifier-5.png"><img src="images/scenario_2.jpg" alt="scenario #2" border="0"/></a></td>
-                    <td><img src="images/scenario_arrow.jpg" alt="scenario arrow"/></td>
-                    <td align="center"><a href="http://booh.org/images/tutorial-starting-up-4.png"><img src="images/scenario_3.jpg" alt="scenario #3" border="0"/></a></td>
-                    <td><img src="images/scenario_arrow.jpg" alt="scenario arrow"/></td>                   
-                    <td align="center"><a href="http://booh.org/themes/cardu/Home/"><img src="images/scenario_4.jpg" alt="scenario #4" border="0"/></a></td>
-            </tr>
-            <tr>
-                    <td align="center"><nobr><font color="#0018ad"><b>#1:</b></font> sort your photos</nobr></td>
-                    <td>&nbsp;</td>
-                    <td align="center"><nobr><font color="#0018ad"><b>#2:</b></font> classify them</nobr></td>
-                    <td>&nbsp;</td>
-                    <td align="center"><nobr><font color="#0018ad"><b>#3:</b></font> input captions</nobr></td>
-                    <td>&nbsp;</td>
-                    <td align="center"><nobr><font color="#0018ad"><b>#4:</b></font> album completed</nobr></td>
-            </tr>
-     </table>
+   <div align="center">
+     <div style="display:inline-block; margin-right:2em; margin-bottom:1em">
+       <div align="center"><nobr><font color="#0018ad"><b>#1:</b></font> sort your photos</nobr></div>
+       <br/>
+       <a href="http://booh.org/images/tutorial-classifier-2.png"><img src="images/scenario_1.jpg" alt="scenario #1" border="0"/></a>
+     </div>
+     <div style="display:inline-block; margin-right:2em; margin-bottom:1em">
+       <div align="center"><nobr><font color="#0018ad"><b>#2:</b></font> classify them</nobr></div>
+       <br/>
+       <a href="http://booh.org/images/tutorial-classifier-5.png"><img src="images/scenario_2.jpg" alt="scenario #2" border="0"/></a>
+     </div>
+     <div style="display:inline-block; margin-right:2em; margin-bottom:1em">
+       <div align="center"><nobr><font color="#0018ad"><b>#3:</b></font> input captions</nobr></div>
+       <br/>
+       <a href="http://booh.org/images/tutorial-starting-up-4.png"><img src="images/scenario_3.jpg" alt="scenario #3" border="0"/></a>
+     </div>
+     <div style="display:inline-block; margin-bottom:1em">
+       <div align="center"><nobr><font color="#0018ad"><b>#4:</b></font> album completed!</nobr></div>
+       <br/>
+       <a href="http://booh.org/themes/gradient/Home/"><img src="images/scenario_4.jpg" alt="scenario #4" border="0"/></a>
+     </div>
+   </div>
 
    <p>There are already a lot of web-album generators available for
    Linux; Booh differentiates with its unique features set:</p>
 
 <font size="-1"><a href="http://zarb.org/~gc/"><em>Guillaume Cottenceau</em></a></font>
 
-<p align="right"><font size="-1">Wed Jan  5 14:21:53 2011</font></p>
+<p align="right"><font size="-1">Mon Mar  5 11:22:13 2012</font></p>
 
 <!-- <p align="right"><font size="-2"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0!</a></font></p> -->