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

Simplify layouting

Browse source
This commit is contained in:
John Firebaugh 2013-10-03 14:10:21 -07:00
parent 7481206128
commit 4557654ba6
15 changed files with 217 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/browse_controller.rb
View file

@ -1,14 +1,15 @@
class BrowseController < ApplicationController
layout 'site', :except => [ :start ]
layout 'map'
before_filter :authorize_web
before_filter :set_locale
before_filter { |c| c.check_database_readable(true) }
around_filter :web_timeout, :except => [:start]
def start
def start
render :layout => false
end
def relation
@type = "relation"
@relation = Relation.find(params[:id])

2
app/controllers/changeset_controller.rb
View file

@ -321,7 +321,7 @@ class ChangesetController < ApplicationController
@edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
render :action => :list
render :action => :list, :layout => 'map'
end
end

5
app/controllers/site_controller.rb
View file

@ -1,6 +1,6 @@
class SiteController < ApplicationController
layout 'site', :except => [:key, :permalink]
layout false, :only => [:key, :permalink]
layout 'site'
layout 'map', :only => [:index, :export]
before_filter :authorize_web
before_filter :set_locale
@ -34,6 +34,7 @@ class SiteController < ApplicationController
def key
expires_in 7.days, :public => true
render :layout => false
end
def edit

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

@ -2,70 +2,66 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
<div class='browse-section common'>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.created_at' %></h4>
<p><%= l @changeset.created_at %></p>
</div>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.closed_at' %></h4>
<p><%= l @changeset.closed_at %></p>
</div>
<% if @changeset.user.data_public? %>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.belongs_to' %></h4>
<p><%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %></p>
</div>
<% end %>
<div class='browse-section common'>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.created_at' %></h4>
<p><%= l @changeset.created_at %></p>
</div>
<%= render :partial => "tag_details", :object => @changeset %>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.closed_at' %></h4>
<p><%= l @changeset.closed_at %></p>
</div>
<% unless @nodes.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
<% if @changeset.user.data_public? %>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.belongs_to' %></h4>
<p><%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %></p>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
<% end %>
</div>
<% unless @ways.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
<% end %>
<%= render :partial => "tag_details", :object => @changeset %>
<% unless @relations.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
<li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
</ul>
<% unless @nodes.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
<% end %>
<%= render :template => 'layouts/map' %>
<% unless @ways.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
<% end %>
<% unless @relations.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
<li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
</ul>

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

@ -7,15 +7,11 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
<%= render :partial => "node_details", :object => @node %>
<%= render :partial => "node_details", :object => @node %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %></li>
<li><%= link_to(t('browse.node.view_history'), :action => "node_history") %></li>
</ul>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %></li>
<li><%= link_to(t('browse.node.view_history'), :action => "node_history") %></li>
</ul>

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

@ -7,17 +7,13 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %></li>
<li><%= link_to(t('browse.node_history.view_details'), :action => "node") %></li>
</ul>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %></li>
<li><%= link_to(t('browse.node_history.view_details'), :action => "node") %></li>
</ul>

90
app/views/browse/note.html.erb
View file

@ -2,57 +2,53 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
<% if @note.comments.find { |comment| comment.author.nil? } -%>
<div class='browse-section common'>
<p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
</div>
<% end -%>
<% if @note.comments.find { |comment| comment.author.nil? } -%>
<div class='browse-section common'>
<p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
</div>
<% end -%>
<div class='browse-section common'>
<div class='browse-field'>
<h4><%= t "browse.note.opened" %></h4>
<p><%= note_event(@note.created_at, @note.author) %></p>
</div>
<% if @note.status == "closed" %>
<div class='browse-field'>
<h4><%= t "browse.note.closed" %></h4>
<p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
</div>
<% elsif @note.comments.length > 1 %>
<div class='browse-field'>
<h4><%= t "browse.note.last_modified" %></h4>
<p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
</div>
<% end %>
<div class='browse-field' id="c<%= @note.comments.first.id %>">
<h4><%= t "browse.note.description" %></h4>
<p><%= h(@note.comments.first.body.to_html) %></p>
</div>
<div class='browse-field'>
<h4><%= t "browse.node_details.coordinates" %></h4>
<p class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
</div>
<div class='browse-section common'>
<div class='browse-field'>
<h4><%= t "browse.note.opened" %></h4>
<p><%= note_event(@note.created_at, @note.author) %></p>
</div>
<% if @note.comments.length > 1 %>
<div class='browse-section clearfix'>
<h4><%= t "browse.note.comments" %></h4>
<ul>
<% @note.comments[1..-1].each do |comment| %>
<li id="c<%= comment.id %>">
<%= comment.body.to_html %>
<small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
</li>
<% end %>
</ul>
<% if @note.status == "closed" %>
<div class='browse-field'>
<h4><%= t "browse.note.closed" %></h4>
<p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
</div>
<% elsif @note.comments.length > 1 %>
<div class='browse-field'>
<h4><%= t "browse.note.last_modified" %></h4>
<p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
</div>
<% end %>
<% end %>
<%= render :template => 'layouts/map' %>
<div class='browse-field' id="c<%= @note.comments.first.id %>">
<h4><%= t "browse.note.description" %></h4>
<p><%= h(@note.comments.first.body.to_html) %></p>
</div>
<div class='browse-field'>
<h4><%= t "browse.node_details.coordinates" %></h4>
<p class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
</div>
</div>
<% if @note.comments.length > 1 %>
<div class='browse-section clearfix'>
<h4><%= t "browse.note.comments" %></h4>
<ul>
<% @note.comments[1..-1].each do |comment| %>
<li id="c<%= comment.id %>">
<%= comment.body.to_html %>
<small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
</li>
<% end %>
</ul>
</div>
<% end %>

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

@ -7,15 +7,11 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
<%= render :partial => "relation_details", :object => @relation %>
<%= render :partial => "relation_details", :object => @relation %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
<li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
</ul>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
<li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
</ul>

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

@ -7,17 +7,13 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
<li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
</ul>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
<li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
</ul>

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

@ -7,15 +7,11 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
<%= render :partial => "way_details", :object => @way %>
<%= render :partial => "way_details", :object => @way %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
<li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
</ul>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
<li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
</ul>

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

@ -7,17 +7,13 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
<li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
</ul>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<% end %>
<%= render :template => 'layouts/map' %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
<li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
</ul>

34
app/views/changeset/list.html.erb
View file

@ -6,26 +6,22 @@
<% end -%>
<% end -%>
<% content_for :sidebar do %>
<h2><%= @heading %></h2>
<h2><%= @heading %></h2>
<% if @edits.size > 0 %>
<ol class="changesets">
<%= render :partial => 'changeset',
:collection => @edits %>
</ol>
<% if @edits.size > 0 %>
<ol class="changesets">
<%= render :partial => 'changeset',
:collection => @edits %>
</ol>
<div class="search_more">
<div class="inner12 search_results_entry">
<%= link_to t('geocoder.results.more_results'), '#', :class => "button" %>
</div>
<%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %>
<div class="search_more">
<div class="inner12 search_results_entry">
<%= link_to t('geocoder.results.more_results'), '#', :class => "button" %>
</div>
<% elsif @user and @user.display_name == params[:display_name] %>
<h4><%= t('changeset.list.empty_user_html') %></h4>
<% else %>
<h4><%= t('changeset.list.empty_anon_html') %></h4>
<% end %>
<%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %>
</div>
<% elsif @user and @user.display_name == params[:display_name] %>
<h4><%= t('changeset.list.empty_user_html') %></h4>
<% else %>
<h4><%= t('changeset.list.empty_anon_html') %></h4>
<% end %>
<%= render :template => 'layouts/map' %>

4
app/views/layouts/map.html.erb
View file

@ -22,7 +22,7 @@
<p class="alert"><%= t 'layouts.osm_read_only' %></p>
<% end %>
<%= content_for :sidebar %>
<%= yield %>
</div>
</div>
@ -51,3 +51,5 @@
</table>
</div>
<% end %>
<%= render :template => 'layouts/site' %>

79
app/views/site/export.html.erb
View file

@ -1,53 +1,50 @@
<% content_for :sidebar do %>
<h2><%= t 'export.start_rjs.export' %></h2>
<%= form_tag :controller => "export", :action => "finish" do %>
<%= hidden_field_tag 'format', 'osm' %>
<h2><%= t 'export.start_rjs.export' %></h2>
<div class="export_bounds inner22">
<div class='export_area_inputs'>
<%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
<br/>
<%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
<%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
<br/>
<%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
</div>
<a id="drag_box" class='export_hint button' href="#"><%= t'export.start.manually_select' %></a>
<%= form_tag :controller => "export", :action => "finish" do %>
<%= hidden_field_tag 'format', 'osm' %>
<div class="export_bounds inner22">
<div class='export_area_inputs'>
<%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
<br/>
<%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
<%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
<br/>
<%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
</div>
<a id="drag_box" class='export_hint button' href="#"><%= t'export.start.manually_select' %></a>
</div>
<div id="export_osm">
<h4><%= t'export.start.licence' %></h4>
<div class="export_details inner22">
<p><%= raw t'export.start.export_details' %></p>
</div>
<div id="export_osm">
<h4><%= t'export.start.licence' %></h4>
<div id="export_osm_too_large">
<h4><%= t'export.start.too_large.heading' %></h4>
<div class="export_details inner22">
<p><%= raw t'export.start.export_details' %></p>
</div>
<p><%= t'export.start.too_large.body' %></p>
<dl>
<dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
<dd><%= t'export.start.too_large.planet.description' %></dd>
<div id="export_osm_too_large">
<h4><%= t'export.start.too_large.heading' %></h4>
<dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
<dd><%= t'export.start.too_large.geofabrik.description' %></dd>
<div class="export_details inner22">
<p><%= t'export.start.too_large.body' %></p>
<dl>
<dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
<dd><%= t'export.start.too_large.planet.description' %></dd>
<dt><a href="http://metro.teczno.com/"><%= t'export.start.too_large.metro.title' %></a></dt>
<dd><%= t'export.start.too_large.metro.description' %></dd>
<dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
<dd><%= t'export.start.too_large.geofabrik.description' %></dd>
<dt><a href="http://metro.teczno.com/"><%= t'export.start.too_large.metro.title' %></a></dt>
<dd><%= t'export.start.too_large.metro.description' %></dd>
<dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
<dd><%= t'export.start.too_large.other.description' %></dd>
</dl>
</div>
<dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
<dd><%= t'export.start.too_large.other.description' %></dd>
</dl>
</div>
</div>
</div>
<div class="inner12">
<%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
</div>
<% end %>
<div class="inner12">
<%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
</div>
<% end %>
<%= render :template => 'layouts/map' %>

40
app/views/site/index.html.erb
View file

@ -1,25 +1,21 @@
<% content_for :sidebar do %>
<h2>
<%= t 'layouts.intro_header' %>
<span class="icon close"></span>
</h2>
<h2>
<%= t 'layouts.intro_header' %>
<span class="icon close"></span>
</h2>
<p class="inner22"><%= t 'layouts.intro_text' %></p>
<p class="inner22"><%= t 'layouts.intro_text' %></p>
<div class='footer'>
<a title="<%= t('layouts.make_a_donation.title') %>" href="http://donate.openstreetmap.org/" class="donate">
<span class='icon donate'></span>
<span><%= t('layouts.make_a_donation.text') %></span>
</a>
<div class='footer'>
<a title="<%= t('layouts.make_a_donation.title') %>" href="http://donate.openstreetmap.org/" class="donate">
<span class='icon donate'></span>
<span><%= t('layouts.make_a_donation.text') %></span>
</a>
<p class='credits inner22'>
<%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
:partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
</p>
</div>
<% end %>
<%= render :template => 'layouts/map' %>
<p class='credits inner22'>
<%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
:partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
</p>
</div>