Don't show "Browse Map Data" when we're not on the map view

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 14cf7b0037103c06d857beb4e3dafcf5aea2e5cc..c572b19267b9f613b78d6bd2ea4567ee2c97d4d1 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -51,6 +51,7 @@
         <% Editors::ALL_EDITORS.each do |editor| %>
           <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>
         <% Editors::ALL_EDITORS.each do |editor| %>
           <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>

+        <%= yield :editmenu %>

       </ul>
     </div>
 
       </ul>
     </div>
 


@@ -68,36 +69,36 @@
       <%= yield :optionals %>
 
       <% unless @user %>
       <%= yield :optionals %>
 
       <% unless @user %>

-      <div id="intro">
+      <div class="sidebar-copy">

         <p>
           <%= t 'layouts.intro_1' %>
         </p>
         <p>
         <p>
           <%= t 'layouts.intro_1' %>
         </p>
         <p>

-          <%= t 'layouts.intro_2' %>
-        </p>
-        <p>
-        <%= raw(t 'layouts.intro_3', 
-                  :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
-                  :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"),
-                  :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
-                  :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %>
+        <%= t 'layouts.intro_2_html',
+                :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
+                :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
+                :license => link_to(t('layouts.intro_2_license'),
+                                   url_for({:controller => 'site', :action => 'copyright'})),
+                :create_account => link_to(t('layouts.intro_2_create_account'),
+                                   url_for({:controller => 'user', :action => 'new'}))
+        %>

         </p>
       </div>
       <% end %>
 
       <% if STATUS == :database_offline or STATUS == :api_offline %>
         </p>
       </div>
       <% end %>
 
       <% if STATUS == :database_offline or STATUS == :api_offline %>

-      <div id="alert">
-        <%= t 'layouts.osm_offline' %>
+      <div class="sidebar-alert">
+        <p><%= t 'layouts.osm_offline' %></p>

       </div>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
       </div>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>

-      <div id="alert">
-        <%= t 'layouts.osm_read_only' %>
+      <div class="sidebar-alert">
+        <p><%= t 'layouts.osm_read_only' %></p>

       </div>
       <% end %>
 
       <% if false %>
       </div>
       <% end %>
 
       <% if false %>

-      <div id="donate" class="notice">
-        <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+      <div class="sidebar-notice">
+        <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>

       </div>
       <% end %>
 
       </div>
       <% end %>
 


@@ -127,18 +128,25 @@
         </ul>
       </div>
 
         </ul>
       </div>
 

-      <center>
-        <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>
-      </center>
+      <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 class='sidebar-copy'>
+          <p><%= 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>

     </div>
 
     <script type="text/javascript">
     $(document).ready(function () {
       var auth_token = $("meta[name=csrf-token]").attr("content");
     </div>
 
     <script type="text/javascript">
     $(document).ready(function () {
       var auth_token = $("meta[name=csrf-token]").attr("content");

-

       $("form input[name=authenticity_token]").val(auth_token);
       $("form input[name=authenticity_token]").val(auth_token);

+
+      $("textarea").autoGrow();

     });
     </script>
 
     });
     </script>