From 7731c49b82089c7b62cc70f84edbae0d39f54fd3 Mon Sep 17 00:00:00 2001
From: Arun Persaud <arun@nubati.net>
Date: Sat, 10 May 2008 10:02:09 -0700
Subject: [PATCH 1/1] cleanup: worked a bit on valid html

the validator still shows some errors, but most are gone

Signed-off-by: Arun Persaud <arun@nubati.net>
---
 themes/default/stylesheet.css        |  2 +-
 themes/default/templates/header.tpl  |  2 +-
 themes/default/templates/index.tpl   |  6 +++---
 themes/default/templates/search.tpl  | 10 +++++-----
 themes/default/templates/welcome.tpl | 22 +++++++++++-----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css
index 9457a80..9fe2c4e 100644
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -150,7 +150,7 @@ div.welcome {
    margin-right:           10px;
 }
 
-div.welcome div { 
+div.welcome  span { 
    float:                  left; 
    padding-right:          10px;
    width:                  150px; 
diff --git a/themes/default/templates/header.tpl b/themes/default/templates/header.tpl
index e946a5b..39b42ca 100644
--- a/themes/default/templates/header.tpl
+++ b/themes/default/templates/header.tpl
@@ -15,7 +15,7 @@
   <link rel="stylesheet" href="lightbox2/css/lightbox.css" type="text/css" media="screen" />
   { /if }
   { if $use_autocomplete }
-  <script src="autosuggest/js/bsn.AutoSuggest_2.1.3_comp.js"></script>
+  <script type="text/javascript" src="autosuggest/js/bsn.AutoSuggest_2.1.3_comp.js"></script>
   <link rel="stylesheet" href="autosuggest/css/autosuggest_inquisitor.css" type="text/css" media="screen" charset="utf-8" />
   { /if }
  </head>                                                                                                      
diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl
index 0bd7a7b..87c58b9 100644
--- a/themes/default/templates/index.tpl
+++ b/themes/default/templates/index.tpl
@@ -4,7 +4,7 @@
   <!-- loading -->
 
   <div id="HTML_AJAX_LOADING">
-   <img src="resources/loading.gif" style="vertical-align: middle;" />&nbsp;&nbsp;Loading...
+   <img src="resources/loading.gif" style="vertical-align: middle;" alt="Loading..." />&nbsp;&nbsp;Loading...
   </div>
 
   <!-- top menu -->
@@ -25,7 +25,7 @@
   </div>
   <!-- /top menu -->
 
-  <span style="clear: both;">
+  <div style="clear: both;">
   <!-- option column -->
   <div class="options" style="float: left;">
    <div>
@@ -41,6 +41,6 @@
   <div id="content" class="content">
    {include file="welcome.tpl"}
   </div>
-  </span>
+  </div>
 
 {include file="footer.tpl"}
diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index 18d1f40..77ed7ad 100644
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -12,7 +12,7 @@
    { literal }
    <script type="text/javascript">
       var options = {
-         script: "rpc.php?action=getxmltaglist&",
+         script: "rpc.php?action=getxmltaglist&amp;",
          varname: "search",
          json: false,
          maxresults: 15
@@ -41,9 +41,9 @@
   <td>Date:</td>
   <td class="nowarp">
    { if ! $date_search_enabled }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" />
    { else }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked" />
    { /if }
    consider date-range
   </td>
@@ -51,12 +51,12 @@
  </tr>
  <tr>
   <td>&nbsp;</td>
-  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="resources/date.png" id="frompic"/></a></td>
+  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="resources/date.png" id="frompic" alt="from" /></a></td>
  </tr>
  <tr>
   <td>&nbsp;</td>
   <td>
-   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="resources/date.png" id="topic" /></a>
+   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="resources/date.png" id="topic" alt="to" /></a>
   </td>
   <td>
    <input type="image" class="submit" src="resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl
index 7edda55..fbb21a1 100644
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -5,30 +5,30 @@
 <div class="welcome">
 
  <p>
- <div>
-   <img src="phpfspot_img.php?idx=rand&width=150&i=1">
- </div>
+ <span>
+   <img src="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">
+ <br class="clearboth" />
 
  <p>
- <div>
-   <img src="phpfspot_img.php?idx=rand&width=150&i=2">
- </div>
+ <span>
+   <img src="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">
+ <br class="clearboth" />
 
  <p>
- <div>
-   <img src="phpfspot_img.php?idx=rand&width=150&i=3">
- </div>
+ <span>
+   <img src="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>
-- 
2.25.1