cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs

Browse source
This commit is contained in:
Kai Krueger 2010-05-02 11:42:58 +01:00
commit 5898b494df
92 changed files with 3651 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/views/browse/_map.html.erb
View file

@ -1,22 +1,20 @@
<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
<%= javascript_include_tag 'map.js' %>
<td>
<div style="width: 250px; margin: auto; text-align: right"">
<% if map.instance_of? Changeset or map.visible %>
<div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
</div>
<span id="loading"><%= t 'browse.map.loading' %></span>
<a id="area_larger_map" href=""></a>
<% unless map.instance_of? Changeset %>
<br />
<a id="object_larger_map" href=""></a>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
<% end %>
<div id="browse_map">
<% if map.instance_of? Changeset or map.visible %>
<div id="small_map">
</div>
</td>
<span id="loading"><%= t 'browse.map.loading' %></span>
<a id="area_larger_map" href=""></a>
<% unless map.instance_of? Changeset %>
<br />
<a id="object_larger_map" href=""></a>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
<% end %>
</div>
<% if map.instance_of? Changeset or map.visible %>
<script type="text/javascript">
OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");

22
app/views/browse/_navigation.html.erb
View file

@ -1,40 +1,42 @@
<div style="float:right; text-align:center; width: 100%;">
<% type = (@next || @prev).class.name.downcase %>
<% margin = @next_by_user || @prev_by_user ? 9 : 18 %>
<div id="browse_navigation" style="margin-top: <%= margin %>px">
<% if @next_by_user or @prev_by_user %>
<span class="nowrap">
<% if @prev_by_user %>
<%= link_to t('browse.changeset_navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
<%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
{ :id => @prev_by_user.id },
{ :title => t('browse.changeset_navigation.user.prev_tooltip', :user => @prev_by_user.user.display_name) } %>
{ :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
|
<% end %>
<%=
user = (@prev_by_user || @next_by_user).user.display_name
link_to h(user),
{ :controller => "changeset", :action => "list", :display_name => user },
{ :title => t('browse.changeset_navigation.user.name_tooltip', :user => h(user)) }
{ :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
%>
<% if @next_by_user %>
|
<%= link_to t('browse.changeset_navigation.paging.user.next', :id => @next_by_user.id.to_s),
<%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
{ :id => @next_by_user.id },
{ :title => t('browse.changeset_navigation.user.next_tooltip', :user => @next_by_user.user.display_name) } %>
{ :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
<% end %>
</span>
<br/>
<% end %>
<span class="nowrap">
<% if @prev %>
<%= link_to t('browse.changeset_navigation.paging.all.prev', :id => @prev.id.to_s),
<%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
{ :id => @prev.id },
{ :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
{ :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
<% end %>
<% if @prev and @next %>
|
<% end %>
<% if @next %>
<%= link_to t('browse.changeset_navigation.paging.all.next', :id => @next.id.to_s),
<%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
{ :id => @next.id },
{ :title => t('browse.changeset_navigation.all.next_tooltip') } %>
{ :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
<% end %>
</span>
</div>

2
app/views/browse/_tag.html.erb
View file

@ -1,3 +1,3 @@
<tr>
<td><%= h(tag[0]) %> = <%= linkify(h(tag[1])) %></td>
<td><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></td>
</tr>

30
app/views/browse/changeset.html.erb
View file

@ -1,21 +1,9 @@
<table width="100%">
<tr>
<td>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "changeset_details", :object => @changeset %>
<hr />
<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"),
:osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
</td>
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
<%= render :partial => "changeset_details", :object => @changeset %>
<hr />
<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"),
:osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

30
app/views/browse/node.html.erb
View file

@ -2,24 +2,12 @@
@name = printable_name @node
@title = t('browse.node.node') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "node_details", :object => @node %>
<hr />
<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
:view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
:edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
%>
</td>
<%= render :partial => "map", :object => @node %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
<%= render :partial => "map", :object => @node %>
<%= render :partial => "node_details", :object => @node %>
<hr />
<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
:view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
:edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
%>

21
app/views/browse/node_history.html.erb
View file

@ -3,17 +3,10 @@
@title = t('browse.node_history.node_history') + ' | ' + @name
%>
<h2><%= t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<hr />
<% end %>
<%= t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"),
:view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %>
</td>
<%= render :partial => "map", :object => @node %>
</tr>
</table>
<%= render :partial => "map", :object => @node %>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<hr />
<% end %>
<%= t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"),
:view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %>

26
app/views/browse/relation.html.erb
View file

@ -2,22 +2,10 @@
@name = printable_name @relation
@title = t('browse.relation.relation') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "relation_details", :object => @relation %>
<hr />
<%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
:view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
</td>
<%= render :partial => "map", :object => @relation %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
<%= render :partial => "map", :object => @relation %>
<%= render :partial => "relation_details", :object => @relation %>
<hr />
<%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
:view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>

21
app/views/browse/relation_history.html.erb
View file

@ -3,17 +3,10 @@
@title = t('browse.relation_history.relation_history') + ' | ' + @name
%>
<h2><%= t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<hr />
<% end %>
<%= t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"),
:view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>
</td>
<%= render :partial => "map", :object => @relation %>
</tr>
</table>
<%= render :partial => "map", :object => @relation %>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<hr />
<% end %>
<%= t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"),
:view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>

32
app/views/browse/way.html.erb
View file

@ -2,25 +2,13 @@
@name = printable_name @way
@title = t('browse.way.way') + ' | ' + @name
%>
<table width="100%">
<tr>
<td>
<h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
</tr>
<tr valign="top">
<td>
<%= render :partial => "way_details", :object => @way %>
<hr />
<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<% unless @midnode.nil? %>
| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
<% end %>
</td>
<%= render :partial => "map", :object => @way %>
</tr>
</table>
<%= render :partial => "navigation" %>
<h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
<%= render :partial => "map", :object => @way %>
<%= render :partial => "way_details", :object => @way %>
<hr />
<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<% unless @midnode.nil? %>
| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
<% end %>

21
app/views/browse/way_history.html.erb
View file

@ -3,17 +3,10 @@
@title = t('browse.way_history.way_history') + ' | ' + @name
%>
<h2><%= t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
<table width="100%">
<tr valign="top">
<td>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<hr />
<% end %>
<%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"),
:view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>
</td>
<%= render :partial => "map", :object => @way %>
</tr>
</table>
<%= render :partial => "map", :object => @way %>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<hr />
<% end %>
<%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"),
:view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>

13
app/views/layouts/site.html.erb
View file

@ -117,6 +117,7 @@
<div id="left_menu" class="left_menu">
<a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
<%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %><br />
<a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
<a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
<%= yield :left_menu %>
@ -128,18 +129,6 @@
<div class="donate">
<a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
</div>
<div id="cclogo" style="width: 88px">
<%= link_to(
image_tag("cc_button.png",
:alt => t('layouts.license.alt'),
:border => 0,
:width => 88,
:height => 31,
:title => t('layouts.license.title')),
"http://creativecommons.org/licenses/by-sa/2.0/",
{ :rel => "license" }) %>
</div>
</center>
</div>
</body>

45
app/views/site/copyright.html.erb Normal file
View file

@ -0,0 +1,45 @@
<p style="float: right">
<%= link_to(
image_tag("cc_button.png",
:alt => t('layouts.license.alt'),
:border => 0,
:width => 88,
:height => 31,
:title => t('layouts.license.title')),
"http://creativecommons.org/licenses/by-sa/2.0/",
{ :rel => "license" }) %>
</p>
<% if I18n.locale == 'en' or params[:copyright_locale] == 'en' %>
<!-- Maybe ease foreigners back to their native page -->
<% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
<h2><%= t 'license_page.native.title' %></h2>
<p>
<%= t 'license_page.native.text',
:native_link => link_to(t('license_page.native.native_link'),
:controller => 'site',
:action => 'copyright'),
:mapping_link => link_to(t('license_page.native.mapping_link'),
:controller => 'site',
:action => 'index') %>
</p>
<hr />
<% end %>
<%= t('license_page.legal_babble', :locale => :en) %>
<% else %>
<!-- Maybe note that this page has been translated -->
<% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
<h2><%= t 'license_page.foreign.title' %></h2>
<p>
<%= t 'license_page.foreign.text',
:english_original_link => link_to(t('license_page.foreign.english_link'),
:controller => 'site',
:action => 'copyright',
:copyright_locale => 'en') %>
</p>
<hr />
<% end %>
<%= t('license_page.legal_babble') %>
<% end %>

2
app/views/site/edit.html.erb
View file

@ -20,7 +20,7 @@
<%= render :partial => 'search' %>
<%
session[:token] = @user.tokens.create.token unless session[:token]
session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
# Decide on a lat lon to initialise potlatch with. Various ways of doing this
if params['lon'] and params['lat']

4
app/views/user/no_such_user.html.erb
View file

@ -1,2 +1,2 @@
<h2><%= t 'user.no_such_user.heading', :user => @not_found_user %></h2>
<p><%= t 'user.no_such_user.body', :user => @not_found_user %></p>
<h2><%= t 'user.no_such_user.heading', :user => h(@not_found_user) %></h2>
<p><%= t 'user.no_such_user.body', :user => h(@not_found_user) %></p>