Ensure homepage source validates.

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 76b5a43373e0f018cd0d5b27472f16e9d035adc0..7e224b4c6a9f61c1949979c0a3e31982f625e86c 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -68,11 +68,11 @@
 
       <% unless @user %>
       <div id="intro">
 
       <% unless @user %>
       <div id="intro">

-        OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-        <p/>
-        OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-        <p/>
-        OpenStreetMap's hosting is kindly supported by the <a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a> and <a href="http://www.bytemark.co.uk">bytemark</a>.
+        <p>OpenStreetMap is a free editable map of the whole world. It is made by people like you.</p>
+        <p>OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.</p>
+        <p>
+          OpenStreetMap's hosting is kindly supported by the <a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a> and <a href="http://www.bytemark.co.uk">bytemark</a>.
+        </p>

       </div>
       <% end %>
 
       </div>
       <% end %>
 

diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.rhtml
index 64309949815eadc0f80922876e3f8d304d800bfb..c632f16617c6cb2662bacef45a3a80309096f466 100644 (file)
--- a/app/views/site/_key.rhtml
+++ b/app/views/site/_key.rhtml
@@ -11,7 +11,7 @@
     else if (zoomlevel<13) { var imgname = 'keymapnik'+zoomlevel+'.png'; }
     else                   { var imgname = 'keymapnik13.png'; }
 
     else if (zoomlevel<13) { var imgname = 'keymapnik'+zoomlevel+'.png'; }
     else                   { var imgname = 'keymapnik13.png'; }
 

-    updateSidebar("Map key", "<p><img src='images/"+imgname+"' /></p>");
+    updateSidebar("Map key", "<p><img src='images/"+imgname+"' /><\/p>");

     openSidebar({ width: "210px" });
   }
 
     openSidebar({ width: "210px" });
   }
 

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index 5b4e74b34f4b130c072b3f6754155c773a47db0c..6ddcc851cd640bab7ac4495d3d18f45013f49e81 100644 (file)
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 <!--
   function startSearch() {
 <script type="text/javascript">
 <!--
   function startSearch() {

-    updateSidebar("Search Results", "<p class='search_results_entry'>Searching...</p>");
+    updateSidebar("Search Results", "<p class='search_results_entry'>Searching...<\/p>");

 
     $("search_field").style.display = "none";
     $("search_active").style.display = "inline";
 
     $("search_field").style.display = "none";
     $("search_active").style.display = "inline";


@@ -34,14 +34,14 @@
     <span class="oboxheader">Search</span>
     <span class="whereami"><a href="javascript:describeLocation()">Where am I?</a></span>
     <div class="search_form">
     <span class="oboxheader">Search</span>
     <span class="whereami"><a href="javascript:describeLocation()">Where am I?</a></span>
     <div class="search_form">

-    <span id="search_field">
+    <div id="search_field">

     <% form_remote_tag(:loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, h(params[:query]) %>
       <%= submit_tag "Go" %>
     <% end %>
     <% form_remote_tag(:loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, h(params[:query]) %>
       <%= submit_tag "Go" %>
     <% end %>

-    </span>
+    </div>

     <p id="search_active">Searching...</p>
     </div>
     <p class="search_help">
     <p id="search_active">Searching...</p>
     </div>
     <p class="search_help">

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 2cca4d5292317b8a3728e94ed33e3ec6e057312a..cadfc718f9fe8af7f2a60990c64ceb90c3842ce8 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -21,17 +21,15 @@
 </div> 
 
 <div id="attribution">
 </div> 
 
 <div id="attribution">

-<table width="100%">
-<tr>
-<td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
-<td align="right">http://openstreetmap.org/</td>
-</tr>
-<tr>
-<td colspan="2" align="center">
-Licensed under the Creative Commons Attribution-Share Alike 2.0 license
-by the OpenStreetMap project and its contributors.
-</td>
-</table>
+       <table width="100%">
+               <tr>
+                       <td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
+                       <td align="right">http://openstreetmap.org/</td>
+               </tr>
+               <tr>
+                       <td colspan="2" align="center">Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors.</td>
+               </tr>
+       </table>

 </div>
 
 <% if params['mlon'] and params['mlat'] %>
 </div>
 
 <% if params['mlon'] and params['mlat'] %>

diff --git a/config/database.yml b/config/database.yml
index b884f3b938fea8c5ea541e0d4af5fbbc16529dd7..5d59ed74b2cf2150c2be3a5622f57f3a4d47d54a 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -24,7 +24,7 @@ test:
   adapter: mysql
   database: osm_test
   username: root
   adapter: mysql
   database: osm_test
   username: root

-  password:
+  password: root

   host: localhost
 
 production:
   host: localhost
 
 production:

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 09a451f9a336aa17352c3421db1cc593c593155d..7a7876f28105ba3c637da58e8dd4dd3c50169c00 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -15,4 +15,6 @@ config.action_controller.perform_caching             = false
 config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
 config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send

-config.action_mailer.raise_delivery_errors = false
\ No newline at end of file
+config.action_mailer.raise_delivery_errors = false
+
+ENV['RAILS_ASSET_ID'] = '' # http://wiki.openstreetmap.org/wiki/The_Rails_Port
\ No newline at end of file

diff --git a/config/initializers/libxml.rb b/config/initializers/libxml.rb
index a1870dbab8b4aaaacfe5e5169bcb40e622f3dc11..22f429da53bdaf89f866c01cdb95f78cd0142d9c 100644 (file)
--- a/config/initializers/libxml.rb
+++ b/config/initializers/libxml.rb
@@ -2,6 +2,4 @@ require 'rubygems'
 gem 'libxml-ruby', '>= 0.8.3'
 require 'libxml'
 
 gem 'libxml-ruby', '>= 0.8.3'
 require 'libxml'
 

-LibXML::XML::Parser.register_error_handler do |message|
-  raise message
-end
+LibXML::XML::Parser.register_error_handler(proc{})