more translations, and this time with stuff in the locale file too

[rails.git] / app / views / changeset / list_bbox.rhtml

diff --git a/app/views/changeset/list_bbox.rhtml b/app/views/changeset/list_bbox.rhtml
index 4f90d185bec245fd469d020b91c84afdb27db535..34644e960b471ae55075c48578bd5d3acf5ff360 100644 (file)
--- a/app/views/changeset/list_bbox.rhtml
+++ b/app/views/changeset/list_bbox.rhtml
@@ -1,38 +1,41 @@
 <h1>History</h1>
 <%
 if @bbox!=nil
 <h1>History</h1>
 <%
 if @bbox!=nil

-       lon1 = @bbox[0] 
-       lat1 = @bbox[1] 
-       lon2 = @bbox[2]
-       lat2 = @bbox[3] 
+       minlon = @bbox[0] 
+       minlat = @bbox[1] 
+       maxlon = @bbox[2]
+       maxlat = @bbox[3] 

 
        %>
 <p>
 
        %>
 <p>

-Changsets within the area: 
-(<a href='/?lat=<%= lat1 %>&lon=<%= lon1 %>&zoom=14'><%= format("%0.3f",lat1) -%>,<%= format("%0.3f",lon1) -%></a>) to 
-(<a href='/?lat=<%= lat2 %>&lon=<%= lon2 %>&zoom=14'><%= format("%0.3f",lat2) -%>,<%= format("%0.3f",lon2) -%></a>)   
+Changesets within the area: 
+      (<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>) 
+

 </p>
 
 <%     if @edits.nil? or @edits.empty? %>
 <p><b>No changesets</b></p>
 <%     else %>
 
 </p>
 
 <%     if @edits.nil? or @edits.empty? %>
 <p><b>No changesets</b></p>
 <%     else %>
 

+<%= render :partial => 'changeset_paging_nav' %>
+<%= render :partial => 'changesets' %>

 <%= render :partial => 'changeset_paging_nav' %>
 
 <%= render :partial => 'changeset_paging_nav' %>
 

-<table id="keyvalue" cellpadding="3">
-  <tr>
-    <th>ID</th>
-    <th>Saved at</th>
-    <th>User</th>
-    <th>Comment</th>
-    <th>Area</th>
-    <th></th>
-  </tr>
-  <%= render :partial => 'changeset', :locals => {:showusername => true}, :collection => @edits unless @edits.nil? %>
-</table>
+<p>For all changes everywhere see <%=  link_to("Recent Changes", :controller => "browse", :action => "changesets") %> </p>

 
 

-<%= render :partial => 'changeset_paging_nav' %>
+<%
+       end

 
 

-<% end %>
-<br>
+else 
+       #bbox is nil. happens if the user surfs to this page directly.
+%>
+
+<p>No area specified</p>
+<p>First use the <a href="/" title="view the map">view tab</a> to pan and zoom to an area of interest, then click the history tab.</p>
+<p>Alternatively view all <%=  link_to("recent changes", :controller => "browse", :action => "changesets") %> </p>
+
+<%
+end
+%>

 <br>
 <br>

+