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 6e6613c8f0a1d0832470387b96bded1ada6fdd16..073af0053c719591a7c73fd5be3252df9adfcbc4 100644 (file)
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -1,35 +1,35 @@
 <!-- welcome -->
-<div class="header" style="text-align: left;">
+<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 style="padding: 10px; margin-left: 10px; margin-right: 10px;">
+<div class="welcome">
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=1">
- </div>
- <div>
+ <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
- </div>
+ </p>
 
- <br class="clearboth">
+ <br class="clearboth" />
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=2">
- </div>
- <div>
+ <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.
- </div>
+ </p>
 
- <br class="clearboth">
+ <br class="clearboth" />
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=3">
- </div>
- <div>
+ <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>
- </div>
+ </p>
 </div>
 <!-- /welcome -->