Fix multiple issues with links to /history from the homepage. Thanks to Ed Avis for...

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 534003031a4d9903fc522333b32d6cf2d505632b..93abf3a5efac6ffd870e74a415f3aaaa8ea36d58 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -50,7 +50,7 @@
         %>
         <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %></li>
         <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %></li>
         %>
         <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %></li>
         <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %></li>

-        <li><%= link_to 'History', {:controller => 'history' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %></li>
+        <li><%= link_to 'History', {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %></li>

         <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
         <li><%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
         <% else %>
         <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
         <li><%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
         <% else %>

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 06b4152df9a1267cef030762145d5c2946e117c1..bf4eda9127432fa27766670677868a5d7af97012 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -72,7 +72,7 @@ function updatelinks(lon,lat,zoom,layers,extents) {
       maxlon = Math.round(maxlon * decimals) / decimals;
       maxlat = Math.round(maxlat * decimals) / decimals;
       args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       maxlon = Math.round(maxlon * decimals) / decimals;
       maxlat = Math.round(maxlat * decimals) / decimals;
       args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;

-      node.href = setArgs("history/", args);
+      node.href = setArgs("/history", args);

       node.style.fontStyle = 'normal';
     } else {
       node.href = 'javascript:alert("zoom in to see editing history");';
       node.style.fontStyle = 'normal';
     } else {
       node.href = 'javascript:alert("zoom in to see editing history");';