Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index b524b416736dcb7579bad2e43c085bab4c830d48..aac7d16b4997306d61445f7757297d1b5ce77b09 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -98,26 +98,26 @@
 
       <% if false %>
       <div id="donate" class="notice">
-        <%= t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{donate_link_text}</a>" %>
+        <%= t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
       </div>
       <% end %>
 
       <div id="left_menu" class="left_menu">
         <a href="http://wiki.openstreetmap.org"><%= t 'layouts.help_wiki' %></a><br />
         <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />
-        <a href="http://wiki.openstreetmap.org/index.php/Merchandise"><%= t 'layouts.shop' %></a><br />
+        <a href="http://wiki.openstreetmap.org/wiki/Merchandise"><%= t 'layouts.shop' %></a><br />
         <%= yield :left_menu %>
       </div>
 
       <div id="sotm" class="notice">
-        <%= t 'layouts.sotm' %>
+        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/" %>
       </div>
 
       <%= yield :optionals %>
 
       <center>
         <div class="button" style="width: 115px">
-          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="<%= t 'layouts.alt_donation' %>" /></a>
+          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="<%= t 'layouts.alt_donation' %>" title="<%= t 'layouts.alt_donation' %>" /></a>
         </div>
 
         <div id="cclogo" class="button" style="width: 88px">