X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/97978ceeb9047ec6894b822ca947a466c2462988..db1e02adb5f8eea1fc47bfe4e7b116359d92eaa2:/app/views/layouts/site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index aaf4e0324..70752f5e1 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -21,11 +21,11 @@
 
   <span id="greeting">
     <% if @user %>
-      Welcome, <%= @user.email %> / 
-      <%= link_to 'Logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
+      Welcome, <%= @user.display_name %> |
+      <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
     <% else %>
-      <%= link_to 'Login', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> /
-      <%= link_to 'Sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+      <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
+      <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
     <% end %>
   </span>
   
@@ -49,20 +49,19 @@
     <div id="logo">
       <center>
         <h1>OpenStreetMap</h1>
-
         <img src="/images/osm_logo.png" width="120" height="120"/><br/>
         <nobr><h2>The Free Wiki World Map</h2></nobr>
       </center>
     </div>
-
+    <% unless @user %>
     <div id="intro">
       OpenStreetMap is a free editable map of the whole world. It is made by people like you.
       <p/>
       OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
       <p/>
       OpenStreetMap's hosting is kindly supported by the <a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a> and <a href="http://www.bytemark.co.uk">bytemark</a>.
-
     </div>
+    <% end %>
 
     <div id="left_menu">
       <a href="http://wiki.openstreetmap.org">Help & Wiki</a><br />