X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3259bc7edecbcfc54eb70e3c0a1e07d6b582a46c..22594361d5abd2a6ee18e290058d9d39d7d761ec:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9da2edf47..db3b4c6e3 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -14,7 +14,7 @@
<% if @user and @user.id %>
- <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %>
+ <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %>
<%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
<%= yield :greeting %>
<%= render :partial => "layouts/inbox" %> |
@@ -44,11 +44,7 @@
- <%= 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')) %> + <%= 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'))) %>
<% end %> @@ -123,10 +119,6 @@ -