@@ -22,14 +22,13 @@ <% 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}) %> | - <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %> + <%= 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')) %> | <%= yield :greeting %> - <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | - <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> - <% else %> - <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | - <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> + <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, case @user.new_messages.size when 0 then { :title => t('layouts.inbox_tooltip_0') } when 1 then { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_1') } else { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_n', :size => @user.new_messages.size) } end %> | + <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> + <% else %> + <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> + <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> <% end %> @@ -65,8 +64,8 @@

OpenStreetMap

- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
+

<%= t 'layouts.project_name.h1' %>

+ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>

<%= t('layouts.tag_line') %>

diff --git a/config/locales/be.yml b/config/locales/be.yml index 43c79ca60..731e81cc9 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -295,6 +295,7 @@ be: no_results: "ÐÑÑÐ¾Ð³Ð° Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°" layouts: welcome_user: "ÐÑÑÐ°ÐµÐ¼, {{user_link}}" + home: "Ð´Ð°Ð¼Ð¾Ñ" inbox: "ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ ({{size}})" logout: Ð²ÑÐ¹ÑÑÑ log_in: ÑÐ²Ð°Ð¹ÑÑÑ @@ -410,7 +411,6 @@ be: as_unread: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð½ÐµÑÑÑÐ°Ð½ÑÐ¼" site: index: - home: "Ð´Ð°Ð¼Ð¾Ñ" js_1: "ÐÑ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÐ°Ð¼ Ð±ÐµÐ· Ð¿Ð°Ð´ÑÑÑÐ¼ÐºÑ javascript." js_2: "OpenStreetMap Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ javascript Ð´Ð»Ñ Ð°Ð´Ð»ÑÑÑÑÐ°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ." js_3: 'ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ¿ÑÐ°Ð±Ð°Ð²Ð°ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ ÑÑÐ°ÑÑÑÐ½Ñ Ð°Ð³Ð»ÑÐ´ Tiles@Home ÐºÐ°Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐºÐ»ÑÑÑÑÑ javascript.' diff --git a/config/locales/de.yml b/config/locales/de.yml index ae02514f7..764f40f09 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -323,6 +323,7 @@ de: no_results: "Keine Ergebnisse" layouts: welcome_user: "Willkommen, {{user_link}}" + home: "home" inbox: "Posteingang ({{size}})" logout: Abmelden log_in: Anmelden @@ -487,7 +488,6 @@ de: as_unread: "Nachricht als ungelesen markiert" site: index: - home: "home" js_1: "Dein Browser unterstÃ¼tzt kein Javascript oder du hast es deaktiviert." js_2: "OpenStreetMap nutzt Javascript fÃ¼r die Kartendarstellung." js_3: 'Solltest bei dir kein Javascript mÃ¶glich sein, kannst du auf der Tiles@Home Website eine Version ohne Javascript benutzen.' diff --git a/config/locales/en.yml b/config/locales/en.yml index fee3e8629..5218bd714 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -324,11 +324,27 @@ en: type_from_source: "{{type}} from {{source_link}}" no_results: "No results found" layouts: + project_name: + # in + title: OpenStreetMap + # in <h1> + h1: OpenStreetMap + logo: + alt_text: OpenStreetMap logo welcome_user: "Welcome, {{user_link}}" + welcome_user_link_tooltip: Your user page + home: home + home_tooltip: Go to home location inbox: "inbox ({{size}})" + inbox_tooltip_0: Your inbox contains no unread messages + inbox_tooltip_1: Your inbox contians 1 unread message + inbox_tooltip_n: Your inbox contains {{size}} unread messages logout: logout + logout_tooltip: "Log out" log_in: log in + log_in_tooltip: Log in with an existing account sign_up: sign up + sign_up_tooltip: Create an account for editing view: View view_tooltip: View maps edit: Edit @@ -512,7 +528,6 @@ en: as_unread: "Message marked as unread" site: index: - home: "home" js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript." js_2: "OpenStreetMap uses javascript for its slippy map." js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.' diff --git a/config/locales/he.yml b/config/locales/he.yml index f7ea09588..9a89c04c5 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -296,6 +296,7 @@ he: no_results: "No results found" layouts: welcome_user: "Welcome, {{user_link}}" + home: "home" inbox: "inbox ({{size}})" logout: logout log_in: log in @@ -411,7 +412,6 @@ he: as_unread: "Message marked as unread" site: index: - home: "home" js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript." js_2: "OpenStreetMap uses javascript for its slippy map." js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.' diff --git a/config/locales/is.yml b/config/locales/is.yml index a21df9ed5..710437fe8 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -322,6 +322,7 @@ is: no_results: "Ekkert fannst" layouts: welcome_user: "HÃ¦ {{user_link}}" + home: "heim" inbox: "innhÃ³lf ({{size}})" logout: "ÃºtskrÃ¡" log_in: "innskrÃ¡" @@ -486,7 +487,6 @@ is: as_unread: "SkilaboÃ°in voru merkt sem Ã³lesin" site: index: - home: "heim" js_1: "ÃÃº ert annaÃ°hvort aÃ° nota vafra sem styÃ°ur ekki JavaScript eÃ°a hefur slÃ¶kkt Ã¡ JavaScript stuÃ°ning." js_2: "OpenStreetMap notar JavaScript til aÃ° ÃºtfÃ¦ra gagnvirk kort." js_3: 'ÃÃº getur einnig notaÃ° <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasÃ½nina</a> sem krefst ekki JavaScript stuÃ°nings.' diff --git a/config/locales/it.yml b/config/locales/it.yml index ea3565e3a..b2b227668 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -296,6 +296,7 @@ it: no_results: "Nessun risultato" layouts: welcome_user: "Benvenuto, {{user_link}}" + home: "posizione iniziale" inbox: "in arrivo ({{size}})" logout: esci log_in: entra @@ -411,7 +412,6 @@ it: as_unread: "Messaggio marcato come non letto" site: index: - home: "posizione iniziale" js_1: "Si sta utilizzando un browser che non supporta javascript, oppure Ã¨ stato disabilitato javascript." js_2: "OpenStreetMap utilizza javascript per le sua mappa." js_3: 'Se non si riesce ad abilitare javascript si puÃ² provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.' diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 82fee69d9..73f92c444 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -296,6 +296,7 @@ nl: no_results: "Geen resultaten gevonden" layouts: welcome_user: "Welkom, {{user_link}}" + home: "home" inbox: "Postvak IN ({{size}})" logout: uitloggen log_in: inloggen @@ -411,7 +412,6 @@ nl: as_unread: "Gemarkeerd als ongelezen" site: index: - home: "home" js_1: "Of je gebruikt een browser die JavaScript niet ondersteunt, of je hebt het uitstaan." js_2: "OpenStreetMap gebruikt JavaScript voor de slippy-kaart." js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je niet de mogelijkheid hebt om JavaScript aan te zetten.' diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 42ff565a1..da9b1626e 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -299,6 +299,7 @@ pl: no_results: "Nie znaleziono" layouts: welcome_user: "Witaj, {{user_link}}" + home: "gÅÃ³wna" inbox: "skrzynka ({{size}})" logout: wyloguj log_in: zaloguj siÄ @@ -414,7 +415,6 @@ pl: as_unread: "WiadomoÅÄ zostaÅa oznaczona jako nieprzeczytana" site: index: - home: "gÅÃ³wna" js_1: "Prawdopodobnie masz wyÅÄczone javaskrypty lub przeglÄdarka ktÃ³rej uÅ¼ywasz ich nie obsÅuguje." js_2: "OpenStreetMap uÅ¼ywa javaskryptÃ³w do wyÅwietlania mapki slippy map." js_3: 'SprÃ³buj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglÄdarki Tiles@Home</a> jeÅli nie masz moÅ¼liwoÅci wÅÄczyÄ javaskryptu.' diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f3d8e5072..9d0de5709 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -296,6 +296,7 @@ ru: no_results: "ÐÐ¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾" layouts: welcome_user: "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ, {{user_link}}" + home: "Ð´Ð¾Ð¼Ð¾Ð¹" inbox: "Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ ({{size}})" logout: Ð²ÑÐ¹ÑÐ¸ log_in: Ð²Ð¾Ð¹ÑÐ¸ @@ -411,7 +412,6 @@ ru: as_unread: "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ" site: index: - home: "Ð´Ð¾Ð¼Ð¾Ð¹" js_1: "ÐÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸Ð»Ð¸ Ð¾ÑÐºÐ»ÑÑÐµÐ½ JavaScript." js_2: "OpenStreetMap Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ JavaScript Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°ÑÑ." js_3: 'ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÐ¸ÑÐ½ÑÑ ÐºÐ°ÑÑÑ Ð¾Ñ Tiles@Home</a>, ÐµÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÐºÐ»ÑÑÐ¸ÑÑ JavaScript.' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 9bf87acc5..df023fbc0 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -325,6 +325,7 @@ sl: no_results: "Ni zadetkov" layouts: welcome_user: "DobrodoÅ¡li, {{user_link}}" + home: "domov" inbox: "prejeta poÅ¡ta ({{size}})" logout: odjava log_in: prijava @@ -512,7 +513,6 @@ sl: as_unread: "SporoÄilo oznaÄeno kot neprebrano" site: index: - home: "domov" js_1: "Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogoÄeno." js_2: "OpenStreetMap za prikaz zemljevida uporablja Javascript." js_3: 'Äe Javascripta ne morete omogoÄiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statiÄen pregledovalnik zemljevida Tiles@Home</a>.' diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 26ea27a5b..95213a6e1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -294,6 +294,7 @@ zh-CN: no_results: "No results found" layouts: welcome_user: "Welcome, {{user_link}}" + home: "home" inbox: "inbox ({{size}})" logout: logout log_in: log in @@ -401,7 +402,6 @@ zh-CN: back_to_outbox: "Back to outbox" site: index: - home: "home" js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript." js_2: "OpenStreetMap uses javascript for its slippy map." js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.' diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 54a70a611..c8b1c5441 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -63,6 +63,11 @@ body { background: url('/images/tab_bottom.gif') repeat-x bottom; } +/* An unread message (e.g. "inbox(1)") */ +.greeting-bar-unread { + font-weight: bold; +} + #intro { width: 170px; margin: 10px;