fix conflicts during merge of Arun's tree

[phpfspot.git] / themes / default / templates / welcome.tpl

diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl
index 529cbb67c20b02399e3565389af3e0b00c905fec..073af0053c719591a7c73fd5be3252df9adfcbc4 100644 (file)
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -1,33 +1,35 @@
 <!-- welcome -->
-<table>
- <tr>
-  <td class="index_header" style="text-align: left;">
-   phpfspot welcomes you to a dynamic photo gallery for <a href="http://f-spot.org" target="_blank">F-Spot</a><br />
-  </td>
- </tr>
- <tr>
-  <td>
-   <div id='single'>
-    <div style="float: left">
-     <img src="phpfspot_img.php?idx=rand&width=150&1" />
-     <img src="phpfspot_img.php?idx=rand&width=150&2" />
-    </div>
-   <table>
-    <tr>
-     <td>
-This application targets to provide an easy way, to presentate your F-Spot<br />
-pictures in the web, in a way where you do not need any of the current<br />
-web2.0 providers or setup complex apps like gallery<br />
-<br />
-You can addept this welcome page in the file "welcome.tpl" in the template<br />
-directory. ;)
-<br /><br />
-<a href="javascript:showPhotoIndex();">[ Click here to take a look at your photo index or select a tag from the list on the left ]</a>
-     </td>
-    </tr>
-   </table>
-   </div>
-  </td>
- </tr>
-</table>
+<div class="header">
+ phpfspot welcomes you to a dynamic photo gallery for <a href="http://f-spot.org" target="_blank">F-Spot</a><br />
+</div>
+<div class="welcome">
+
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=1" alt="random image" />
+ </span>
+  This application targets to provide an easy way, to presentate your F-Spot<br />
+  pictures in the web, in a way where you do not need any of the current<br />
+  web2.0 providers or setup complex apps like gallery
+ </p>
+
+ <br class="clearboth" />
+
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=2" alt="random image" />
+ </span>
+  You can adapt this welcome page in the file "welcome.tpl" in the template<br />
+  directory of your current theme.
+ </p>
+
+ <br class="clearboth" />
+
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=3" alt="random image" />
+ </span>
+ <a href="javascript:showPhotoIndex();">[ Click here to take a look at your photo index or select a tag from the list on the left ]</a>
+ </p>
+</div>
 <!-- /welcome -->