Use a list for the main menu, rather than br-separated links

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 2eae3963a49f859632528dfd5f13c0b68a93327c..01dd5aee58106aaea846be0025f0901afd750bc4 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -130,14 +130,16 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
-        <%= t 'layouts.help_and_wiki',
-            :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')),
-            :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title'))
-        %><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 %>
+        <ul>
+          <li><%= t 'layouts.help_and_wiki',
+              :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')),
+              :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title'))
+          %></li>
+          <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li>
+          <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a></li>
+          <li><a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a></li>
+          <%= yield :left_menu %>
+        </ul>
       </div>
 
       <%= yield :optionals %>

diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb
index e990071c850b65dee3ba7dc2ac7cbbce7bb5497b..6fc70ef46f1b1d71092fffe40b2af5761eebc8af 100644 (file)
--- a/app/views/site/_key.html.erb
+++ b/app/views/site/_key.html.erb
@@ -29,5 +29,5 @@
 </script>
 
 <% content_for :left_menu do %>
-  <%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %>
+  <li><%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %></li>
 <% end %>

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index ceceda1c6b0d96ab87322c6290cf7867eec66c92..a04604c2e9000dfb2fe498bbdd8e721e378f6fa9 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -146,8 +146,9 @@ hr {
 }
 
 .left_menu ul {
-  padding-left: 10px;
+  padding-left: 0px;
   margin: 0px;
+  list-style-type: none;
 }
 
 .left_menu li {