From d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 2 Jul 2011 01:00:51 +0100 Subject: [PATCH] Lots more work on making RTL layout work --- app/views/diary_entry/_diary_comment.html.erb | 2 +- .../diary_entry/_diary_list_entry.html.erb | 2 +- app/views/diary_entry/list.html.erb | 59 ++--- app/views/diary_entry/view.html.erb | 36 +-- app/views/layouts/_head.html.erb | 1 + app/views/message/new.html.erb | 6 +- app/views/message/read.html.erb | 12 +- app/views/site/_sidebar.html.erb | 4 +- app/views/site/copyright.html.erb | 2 +- app/views/site/index.html.erb | 13 +- app/views/trace/create.html.erb | 8 +- app/views/user/_popup.html.erb | 2 +- app/views/user/account.html.erb | 2 +- app/views/user/view.html.erb | 214 ++++++++-------- config/locales/en.yml | 8 +- public/stylesheets/common.css | 133 +++------- public/stylesheets/large.css | 1 - public/stylesheets/ltr.css | 233 +++++++++++++++++ public/stylesheets/rtl.css | 240 ++++++++++++++++++ public/stylesheets/small.css | 3 + 20 files changed, 695 insertions(+), 286 deletions(-) create mode 100644 public/stylesheets/ltr.css create mode 100644 public/stylesheets/rtl.css diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb index a0e75ecce..ef5c601e8 100644 --- a/app/views/diary_entry/_diary_comment.html.erb +++ b/app/views/diary_entry/_diary_comment.html.erb @@ -1,4 +1,4 @@ -<%= user_thumbnail diary_comment.user, :style => "float: right" %> +<%= user_thumbnail diary_comment.user %>

<%= t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly)) %>

<%= htmlize(diary_comment.body) %> <% if_administrator(:span) do %> diff --git a/app/views/diary_entry/_diary_list_entry.html.erb b/app/views/diary_entry/_diary_list_entry.html.erb index 65ee73ff0..496443272 100644 --- a/app/views/diary_entry/_diary_list_entry.html.erb +++ b/app/views/diary_entry/_diary_list_entry.html.erb @@ -1,2 +1,2 @@ -<%= user_thumbnail diary_list_entry.user, :style => "float: right" %> +<%= user_thumbnail diary_list_entry.user %> <%= render :partial => "diary_entry", :object => diary_list_entry %> diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 1be32fd21..e3dac5989 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,41 +1,42 @@ -<% if @this_user %> -<%= user_image @this_user, :style => "float: right" %> -<% end %> - -

<%= h(@title) %>

- -<% if @this_user %> - <% if_user(@this_user) do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> -<% else %> - <% if_logged_in do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> +
+ <% if @this_user %> + <%= user_image @this_user %> <% end %> -<% end %> - -<% if @entries.empty? %> -

<%= t 'diary_entry.list.no_entries' %>

-<% else %> -

<%= t 'diary_entry.list.recent_entries' %>

- -
+

<%= h(@title) %>

<% if @this_user %> - <%= render :partial => 'diary_entry', :collection => @entries %> + <% if_user(@this_user) do %> + <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> + <% end %> <% else %> - <%= render :partial => 'diary_list_entry', :collection => @entries %> + <% if_logged_in do %> + <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> + <% end %> <% end %> - <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %> - <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %> - <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %> + <% if @entries.empty? %> +

<%= t 'diary_entry.list.no_entries' %>

+ <% else %> +

<%= t 'diary_entry.list.recent_entries' %>

+ +
-
-<% end %> + <% if @this_user %> + <%= render :partial => 'diary_entry', :collection => @entries %> + <% else %> + <%= render :partial => 'diary_list_entry', :collection => @entries %> + <% end %> + + <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %> + <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %> + <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %> + +
+ <% end %> -<%= rss_link_to :action => 'rss', :language => params[:language] %> + <%= rss_link_to :action => 'rss', :language => params[:language] %> +
<% content_for :head do %> <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index 1a8096d13..451d849c2 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,26 +1,28 @@ -<%= user_image @entry.user, :style => "float: right" %> +
+ <%= user_image @entry.user %> -

<%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

+

<%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

-<%= render :partial => 'diary_entry', :object => @entry %> + <%= render :partial => 'diary_entry', :object => @entry %> - + -<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> + <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> -<% if_logged_in(:div) do %> -

<%= t 'diary_entry.view.leave_a_comment' %>

+ <% if_logged_in(:div) do %> +

<%= t 'diary_entry.view.leave_a_comment' %>

- <%= error_messages_for 'diary_comment' %> + <%= error_messages_for 'diary_comment' %> - <% form_for :diary_comment, @diary_comment, :url => { :action => 'comment' } do |f| %> - <%= f.text_area :body, :cols => 80, :rows => 5 %> -
-
- <%= submit_tag t('diary_entry.view.save_button') %> + <% form_for :diary_comment, @diary_comment, :url => { :action => 'comment' } do |f| %> + <%= f.text_area :body, :cols => 80, :rows => 5 %> +
+
+ <%= submit_tag t('diary_entry.view.save_button') %> + <% end %> <% end %> -<% end %> -<% if_not_logged_in(:div) do %> -

<%= t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.request_uri)) %>

-<% end %> + <% if_not_logged_in(:div) do %> +

<%= t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.request_uri)) %>

+ <% end %> +
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 6c22a9475..206905b94 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -6,6 +6,7 @@ <%= javascript_include_tag 'menu' %> <%= stylesheet_link_tag 'common' %> + <%= stylesheet_link_tag t('html.dir') %> <%= stylesheet_link_tag 'small', :media => "only screen and (max-width:641px)" %> <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 642px)" %> diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index 151cd2759..85de1e51b 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -5,15 +5,15 @@ <% form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %> - + - + - +
<%= t'message.new.subject' %><%= t'message.new.subject' %> <%= f.text_field :title, :size => 60, :value => @subject %>
<%= t'message.new.body' %><%= t'message.new.body' %> <%= f.text_area :body, :cols => 80, :value => @body %>
<%= submit_tag t('message.new.send_button') %>
diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index 576403170..6bad015cc 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -4,17 +4,17 @@ - + - + - + @@ -41,17 +41,17 @@
<%= t'message.read.from' %><%= t'message.read.from' %> <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> <%= user_thumbnail @message.sender %>
<%= t'message.read.subject' %><%= t'message.read.subject' %> <%= h(@message.title) %>
<%= t'message.read.date' %><%= t'message.read.date' %> <%= l @message.sent_on, :format => :friendly %>
- + - + - + diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb index 2dbcef432..f7e7229c8 100644 --- a/app/views/site/_sidebar.html.erb +++ b/app/views/site/_sidebar.html.erb @@ -1,8 +1,8 @@
<%= t'message.read.to' %><%= t'message.read.to' %> <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> <%= user_thumbnail @message.recipient %>
<%= t'message.read.subject' %><%= t'message.read.subject' %> <%= h(@message.title) %>
<%= t'message.read.date' %><%= t'message.read.date' %> <%= l @message.sent_on, :format => :friendly %>
- - + +
<%= t 'site.sidebar.close' %>
diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index eaaf3f366..b5f0db418 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,4 +1,4 @@ -

+

- -
@@ -256,7 +255,11 @@ end sidebar_width = sidebar_width + 5 } + <% if t('html.dir') == "ltr" -%> $("map").style.left = (sidebar_width) + "px"; + <% else -%> + $("map").style.right = (sidebar_width) + "px"; + <% end -%> $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px"; $("map").style.height = ($("content").offsetHeight - 2) + "px"; diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb index ba8b8e700..4b168fab0 100644 --- a/app/views/trace/create.html.erb +++ b/app/views/trace/create.html.erb @@ -4,10 +4,10 @@ <% form_for :trace, @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
- - - - + + + +
<%= t'trace.trace_form.upload_gpx' %><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %>
<%= t'trace.trace_form.description' %><%= f.text_field :description, :size => 50, :maxlength => 255 %>
<%= t'trace.trace_form.tags' %><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %> (<%= t'trace.trace_form.tags_help' %>)
<%= t'trace.trace_form.visibility' %><%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.trace_form.visibility_help' %>)
<%= t'trace.trace_form.upload_gpx' %><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %>
<%= t'trace.trace_form.description' %><%= f.text_field :description, :size => 50, :maxlength => 255 %>
<%= t'trace.trace_form.tags' %><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %> (<%= t'trace.trace_form.tags_help' %>)
<%= t'trace.trace_form.visibility' %><%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.trace_form.visibility_help' %>)
<%= submit_tag t('trace.trace_form.upload_button') %> | <%= t'trace.trace_form.help' %>
<% end %> diff --git a/app/views/user/_popup.html.erb b/app/views/user/_popup.html.erb index cad5f7909..8a63fbb25 100644 --- a/app/views/user/_popup.html.erb +++ b/app/views/user/_popup.html.erb @@ -1,5 +1,5 @@
- <%= user_thumbnail popup, :style => "float :left" %> + <%= user_thumbnail popup %>

<%= t('user.popup.' + type) %>

<%= link_to popup.display_name, :controller => "user", :action => "view", :display_name => popup.display_name %>

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index d18971f0a..741737559 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -113,7 +113,7 @@

<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

-
+
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 2fe92de5b..f33051c24 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,125 +1,127 @@ -<%= user_image @this_user, :style => "float: right" %> +
+ <%= user_image @this_user %> -

<%= h(@this_user.display_name) %> +

<%= h(@this_user.display_name) %> -<% UserRole::ALL_ROLES.each do |role| %> - <% if @user and @user.administrator? %> - <% if @this_user.has_role? role %> - <%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> - <% else %> - <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> + <% UserRole::ALL_ROLES.each do |role| %> + <% if @user and @user.administrator? %> + <% if @this_user.has_role? role %> + <%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> + <% else %> + <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> + <% end %> + <% elsif @this_user.has_role? role %> + <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> <% end %> - <% elsif @this_user.has_role? role %> - <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> - <% end %> -<% end %>

+ <% end %> -
- <% if @user and @this_user.id == @user.id %> - - <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> - | - <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> - | - <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> - | - <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> - | - <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> - | - <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> - | - <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> - <% if @user and @user.moderator? %> - | <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> - <% end %> - <% else %> - - <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> - | - <% if @user and @user.is_friends_with?(@this_user) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> +
+ <% if @user and @this_user.id == @user.id %> + + <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> + | + <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + | + <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> + | + <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + | + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> + | + <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> + | + <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> + <% if @user and @user.moderator? %> + | <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <% end %> <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> - <% end %> - | - <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> - <% if @this_user.moderator? %> - | <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + + <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> + | + <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> + | + <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> + | + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> + | + <% if @user and @user.is_friends_with?(@this_user) %> + <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> + <% else %> + <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> + <% end %> + | + <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> + <% if @this_user.moderator? %> + | <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + <% end %> + <% if @user and @user.moderator? %> + | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> + <% end %> <% end %> - <% if @user and @user.moderator? %> - | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> + <% if @user and @user.administrator? %> +
+ <% if ["active", "confirmed"].include? @this_user.status %> + <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <% elsif ["pending"].include? @this_user.status %> + <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <% end %> + <% if ["active", "suspended"].include? @this_user.status %> + <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <% end %> + <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> + <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <% else %> + <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | + <% end %> + <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> <% end %> - <% end %> +
+ +

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+ <% if @user and @user.administrator? %> -
- <% if ["active", "confirmed"].include? @this_user.status %> - <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | - <% elsif ["pending"].include? @this_user.status %> - <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | - <% end %> - <% if ["active", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | - <% end %> - <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | - <% else %> - <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> | - <% end %> - <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> +

<%= t 'user.view.email address' %> <%= @this_user.email %>

+

<%= t 'user.view.created from' %> <%= @this_user.creation_ip %>

+

<%= t 'user.view.status' %> <%= @this_user.status.capitalize %>

+

<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

<% end %> -
-

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+

<%= t 'user.view.description' %>

+ +
<%= htmlize(@this_user.description) %>
-<% if @user and @user.administrator? %> -

<%= t 'user.view.email address' %> <%= @this_user.email %>

-

<%= t 'user.view.created from' %> <%= @this_user.creation_ip %>

-

<%= t 'user.view.status' %> <%= @this_user.status.capitalize %>

-

<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

-<% end %> + <% if @user and @this_user.id == @user.id %> +
+ <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> +

+ <%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %> +

+ <% else %> + <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> + <% end %> +
-

<%= t 'user.view.description' %>

+ <% friends = @this_user.friends.collect { |f| f.befriendee } %> + <% nearby = @this_user.nearby - friends %> -
<%= htmlize(@this_user.description) %>
+

<%= t 'user.view.your friends' %>

-<% if @user and @this_user.id == @user.id %> -
- <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> -

- <%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %> -

+ <% if friends.empty? %> + <%= t 'user.view.no friends' %> <% else %> - <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> + + <%= render :partial => "contact", :collection => friends %> +
<% end %> -
- - <% friends = @this_user.friends.collect { |f| f.befriendee } %> - <% nearby = @this_user.nearby - friends %> -

<%= t 'user.view.your friends' %>

+

<%= t 'user.view.nearby users' %>

- <% if friends.empty? %> - <%= t 'user.view.no friends' %> - <% else %> - - <%= render :partial => "contact", :collection => friends %> -
- <% end %> - -

<%= t 'user.view.nearby users' %>

- - <% if nearby.empty? %> - <%= t 'user.view.no nearby users' %> - <% else %> - - <%= render :partial => "contact", :collection => nearby %> -
+ <% if nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> + + <%= render :partial => "contact", :collection => nearby %> +
+ <% end %> <% end %> -<% end %> +
diff --git a/config/locales/en.yml b/config/locales/en.yml index 76d481f53..fbf650660 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1373,11 +1373,11 @@ en: heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." trace_form: - upload_gpx: "Upload GPX File" - description: "Description" - tags: "Tags" + upload_gpx: "Upload GPX File:" + description: "Description:" + tags: "Tags:" tags_help: "comma delimited" - visibility: "Visibility" + visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" upload_button: "Upload" diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index b9ee6a833..f348b21eb 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -2,14 +2,6 @@ /* Default rules for the body of every page */ -html body { - text-align: left; -} - -html[dir='rtl'] body { - text-align: right; -} - body { font-family: Arial,sans-serif; color: #000; @@ -93,7 +85,9 @@ hr { -moz-border-radius: 5px; } -#intro p { margin: 5px; } +#intro p { + margin: 5px; +} /* * Rules for alert boxes shown in the left sidebar when important @@ -108,7 +102,6 @@ hr { border: 1px solid #ccc; background: #d00; line-height: 1.2em; - text-align: left; font-size: 14px; border-radius: 5px; -moz-border-radius: 5px; @@ -127,7 +120,6 @@ hr { border: 1px solid #ccc; background: #ea0; line-height: 1.2em; - text-align: left; font-size: 14px; border-radius: 5px; -moz-border-radius: 5px; @@ -141,7 +133,6 @@ hr { margin: 5px; padding: 5px; border: 1px solid #ccc; - left: 0px; background: #ddd; line-height: 1.2em; font-size: 14px; @@ -150,42 +141,25 @@ hr { -moz-border-radius: 5px; } -html[dir='rtl'] .left_menu { - right: 0; - text-align: right; -} - .left_menu td { font-size: 12px; - padding-right: 4px; } .left_menu h1 { font-style: normal; font-size: 15px; - padding: 0em 0em 0em 1em; - text-align: left; } .left_menu ul { - padding-left: 0px; margin: 0px; list-style-type: none; } -html[dir='rtl'] .left_menu ul { - padding-right: 0px; -} - .left_menu li { margin: 0px; padding: 0px; } -.left_menu img { - margin: 2px 8px 0px 0px; -} - .left_menu a { color: #000; } @@ -213,9 +187,7 @@ html[dir='rtl'] .left_menu ul { margin: 5px; padding: 5px; border: 1px solid #ccc; - left: 0px; line-height: 1.2em; -/* text-align: left; */ font-size: 12px; background: #eee; border-radius: 5px; @@ -235,7 +207,6 @@ html[dir='rtl'] .left_menu ul { .whereami { line-height: 22px; vertical-align: bottom; - float: right; } .search_container { @@ -294,16 +265,10 @@ html[dir='rtl'] .left_menu ul { { height: 20px; margin: 0px; - padding-left: 215px; padding-top: 5px; background: url('../images/tab_bottom.gif') repeat-x bottom; } -html[dir='rtl'] #tabnav { - padding-left: 0; - padding-right: 215px; -} - #tabnav li { margin: 0px; @@ -312,19 +277,13 @@ html[dir='rtl'] #tabnav { list-style-type: none; } -html[dir='rtl'] #tabnav li { - float: right; -} - #tabnav a, #tabnav a:link, #tabnav a:visited { - float: left; background: #f3f3f3; font-size: 13px; line-height: 14px; font-weight: bold; padding: 2px 10px; - margin-right: 4px; border: 1px solid #ccc; text-decoration: none; color: #333; @@ -356,21 +315,14 @@ html[dir='rtl'] #tabnav li { /* Rules for greeting bar in the top right corner */ #greeting { - float: right; height: 20px; margin: 0px; - padding-right: 10px; padding-top: 5px; font-size: 13px; line-height: 14px; background: url('../images/tab_bottom.gif') repeat-x bottom; } -html[dir='rtl'] #greeting { - float: left; - padding-left: 10px; -} - .greeting-bar-unread { font-weight: bold; } @@ -381,7 +333,6 @@ html[dir='rtl'] #greeting { z-index: 20000000; position: absolute; top: 15px; - left: 15px } /* Rules for OpenLayers maps */ @@ -391,8 +342,6 @@ html[dir='rtl'] #greeting { border: 1px solid black; margin: 0px; padding: 0px; - left: 0px; - right: 2px; top: 0px; bottom: 0px; } @@ -405,9 +354,7 @@ html[dir='rtl'] #greeting { z-index: 10000; position: absolute; bottom: 15px; - right: 15px; font-size: smaller; - text-align: right; } /* Rules for edit menu */ @@ -446,12 +393,11 @@ html[dir='rtl'] #greeting { margin: 0px; padding: 0px; width: 30%; - left: 0px; top: 0px; bottom: 0px; } -#sidebar_content { +#sidebar #sidebar_content { overflow: auto; position: absolute; font-size: 13px; @@ -462,7 +408,7 @@ html[dir='rtl'] #greeting { right: 0px; } -.sidebar_title { +#sidebar .sidebar_title { margin: 0px; padding: 3px 6px; height: 29px; @@ -475,21 +421,21 @@ html[dir='rtl'] #greeting { /* Rules for the map key which appears in the popout sidebar */ #mapkey h3 { - font-size: 110%; - font-weight: normal; - text-align: center; + font-size: 110%; + font-weight: normal; + text-align: center; } #mapkey .mapkey-table { - padding-left: 5px; - padding-right: 5px; + padding-left: 5px; + padding-right: 5px; } #mapkey .mapkey-table-key { } #mapkey .mapkey-table-value { - font-size: 90%; + font-size: 90%; } /* Rules for search results which appear in the popout sidebar */ @@ -581,16 +527,8 @@ html[dir='rtl'] #greeting { padding: 0px; margin: 0px; position: absolute; - right: 10px; bottom: 10px; line-height: 1.2em; - text-align: left; -} - -html[dir='rtl'] #content { - margin-right: 190px; - left: 10px; - text-align: right; } #slim_container { @@ -621,7 +559,6 @@ html[dir='rtl'] #content { #slim_header img { vertical-align: middle; - margin-right: 5px; margin-bottom: 5px; } @@ -634,7 +571,6 @@ html[dir='rtl'] #content { #changeset_list { width: 50%; font-size: small; - text-align: left; border-collapse: collapse; border-width: 0px; margin-top: 1px; @@ -664,11 +600,9 @@ html[dir='rtl'] #content { } #changeset_list_map { - float: right; position: absolute; top: 0px; bottom: 0px; - right: 0px; width: 49%; min-height: 400px; border: solid 1px black; @@ -677,10 +611,8 @@ html[dir='rtl'] #content { /* Rules for the data browser */ #browse_navigation { - float: right; width: 250px; text-align: center; - margin-left: 10px; } table.browse_details th { @@ -688,10 +620,7 @@ table.browse_details th { } #browse_map { - float: right; width: 250px; - text-align: right; - margin-left: 10px; } #browse_map #small_map { @@ -704,7 +633,6 @@ table.browse_details th { #trace_list { font-size: small; - text-align: left; border-collapse: collapse; border-width: 0px; } @@ -731,7 +659,6 @@ table.browse_details th { } #user_list_actions { - float: right; margin-top: 10px; } @@ -744,10 +671,6 @@ table.browse_details th { -moz-border-radius: 15px; } -#login_wrapper input[type=submit] { - float: right; -} - #login_login { background-color: #f5f5ff; border: 1px solid #f3f3ff; @@ -821,14 +744,6 @@ div#slim_content form#termsForm { width: auto; } -form#termsForm div#buttons { - float: right; -} - -form#termsForm input#agree { - margin-left: 50px; -} - p#contributorGuidance { background-color: #f5f5ff; border: 1px solid #f3f3ff; @@ -843,6 +758,12 @@ p#contributorGuidance { padding-bottom: 10px; } +#accountForm .user_map { + position: relative; + width: 500px; + height: 400px; +} + #accountImage td { padding-bottom: 0px; } @@ -859,6 +780,14 @@ p#contributorGuidance { display: inline !important; } +/* Rules for the user view */ + +#user_details .user_map { + position: relative; + width: 400px; + height: 400px; +} + /* Rules for the user map */ .user_map .olControlPanZoomBar { @@ -880,6 +809,10 @@ p#contributorGuidance { margin-right: 2px; } +.user_popup img.user_thumbnail { + float: left; +} + /* Rules for message in/out box page */ #messages { @@ -939,9 +872,7 @@ p#contributorGuidance { } #errorExplanation h2 { - text-align: left; font-weight: bold; - padding: 5px 5px 5px 15px; font-size: 12px; margin: -7px; background-color: #c00; @@ -962,7 +893,6 @@ p#contributorGuidance { /* Rules for forms */ .fieldName { - text-align: right; font-weight: bold; } @@ -978,11 +908,6 @@ input[type="submit"] { border: 1px solid black; } -input.openid_url { - background: url('../images/openid_input.png') repeat-y left white; - padding-left: 16px; -} - /* Rules for user images */ img.user_image { diff --git a/public/stylesheets/large.css b/public/stylesheets/large.css index a1efa8583..1c4d493ec 100644 --- a/public/stylesheets/large.css +++ b/public/stylesheets/large.css @@ -9,7 +9,6 @@ /* Rules for the main content area */ #content { - left: 192px; top: 35px; } diff --git a/public/stylesheets/ltr.css b/public/stylesheets/ltr.css new file mode 100644 index 000000000..200889563 --- /dev/null +++ b/public/stylesheets/ltr.css @@ -0,0 +1,233 @@ +/* Styles for LTR languages */ + +/* Default rules for the body of every page */ + +html body { + text-align: left; +} + +/* + * Rules for alert boxes shown in the left sidebar when important + * information needs to be conveyed such as when the site is + * undergoing maintenance. + */ + +#alert { + text-align: left; +} + +/* + * Rules for notice boxes shown in the left sidebar when important, but + * non-critical information needs to be conveyed such as notices about + * donation drives. + */ + +.notice { + text-align: left; +} + +/* Rules for the menu displayed in the left sidebar */ + +.left_menu { + left: 0px; +} + +.left_menu td { + padding-right: 4px; +} + +.left_menu h1 { + text-align: left; + padding: 0em 0em 0em 1em; +} + +.left_menu ul { + padding-left: 0px; +} + +.left_menu img { + margin: 2px 8px 0px 0px; +} + +/* + * Rules for "optional boxes" which appear in the left sidebar on + * certain pages. Current users are the seach box on the main page + * and the tag cloud on the traces pages. + */ + +.optionalbox { + left: 0px; + text-align: left; +} + +/* Rules for the search box */ + +.whereami { + float: right; +} + +/* Rules for tabbed navigation bar */ + +#tabnav +{ + padding-left: 215px; +} + +#tabnav a, #tabnav a:link, #tabnav a:visited +{ + float: left; + margin-right: 4px; +} + +/* Rules for greeting bar in the top right corner */ + +#greeting { + float: right; + padding-right: 10px; +} + +/* Rules for the message shown in place of the map when javascript is disabled */ + +#noscript { + left: 15px +} + +/* Rules for OpenLayers maps */ + +#map { + left: 0px; + right: 2px; +} + +#permalink { + left: 15px; + text-align: left; +} + +/* Rules for the popout map sidebar */ + +#sidebar { + left: 0px; +} + +#sidebar #sidebar_title { + text-align: left; +} + +#sidebar #sidebar_close { + text-align: right; +} + +/* Rules for the main content area */ + +#content { + left: 192px; + right: 10px; + text-align: left; +} + +#slim_header img { + margin-right: 5px; +} + +/* Rules for the copyright page */ + +#cc_logo { + float: right; +} + +/* Rules for the changeset list shown by the history tab etc */ + +#changeset_list { + text-align: left; +} + +#changeset_list_map { + float: right; + right: 0px; +} + +/* Rules for the data browser */ + +#browse_navigation { + float: right; + margin-left: 10px; +} + +#browse_map { + float: right; + text-align: right; + margin-left: 10px; +} + +/* Rules for the trace list shown by the traces tab etc */ + +#trace_list { + text-align: right; +} + +/* Rules for the diary list */ + +#diary_list img.user_thumbnail { + float: right; +} + +/* Rules for the diary entry view */ + +#diary_entry img.user_image { + float: right; +} + +#diary_entry img.user_thumbnail { + float: right; +} + +/* Rules for the user list */ + +#user_list_actions { + float: right; +} + +/* Rules for the login page */ + +#login_wrapper input[type=submit] { + float: right; +} + +/* Rules for the account confirmation page */ + +form#termsForm div#buttons { + float: right; +} + +form#termsForm input#agree { + margin-left: 50px; +} + +/* Rules for the user view */ + +#user_details img.user_image { + float: right; +} + +#user_details .user_map { + float: right; +} + +/* Rules for rails validation error boxes */ + +#errorExplanation h2 { + text-align: left; + padding: 5px 5px 5px 15px; +} + +/* Rules for forms */ + +.fieldName { + text-align: right; +} + +input.openid_url { + background: url('../images/openid_input.png') repeat-y left white; + padding-left: 16px; +} diff --git a/public/stylesheets/rtl.css b/public/stylesheets/rtl.css new file mode 100644 index 000000000..428b63fed --- /dev/null +++ b/public/stylesheets/rtl.css @@ -0,0 +1,240 @@ +/* Styles for RTL languages */ + +/* Default rules for the body of every page */ + +html body { + text-align: right; +} + +/* + * Rules for alert boxes shown in the left sidebar when important + * information needs to be conveyed such as when the site is + * undergoing maintenance. + */ + +#alert { + text-align: right; +} + +/* + * Rules for notice boxes shown in the left sidebar when important, but + * non-critical information needs to be conveyed such as notices about + * donation drives. + */ + +.notice { + text-align: right; +} + +/* Rules for the menu displayed in the left sidebar */ + +.left_menu { + right: 0px; +} + +.left_menu td { + padding-left: 4px; +} + +.left_menu h1 { + text-align: right; + padding: 0em 1em 0em 0em; +} + +.left_menu ul { + padding-right: 0px; +} + +.left_menu img { + margin: 2px 0px 0px 8px; +} + +/* + * Rules for "optional boxes" which appear in the left sidebar on + * certain pages. Current users are the seach box on the main page + * and the tag cloud on the traces pages. + */ + +.optionalbox { + right: 0px; + text-align: right; +} + +/* Rules for the search box */ + +.whereami { + float: left; +} + +/* Rules for tabbed navigation bar */ + + +#tabnav +{ + padding-right: 215px; +} + +/* +#tabnav li { + float: right; +} +*/ + +#tabnav a, #tabnav a:link, #tabnav a:visited +{ + float: right; + margin-left: 4px; +} + +/* Rules for greeting bar in the top right corner */ + +#greeting { + float: left; + padding-left: 10px; +} + +/* Rules for the message shown in place of the map when javascript is disabled */ + +#noscript { + right: 15px +} + +/* Rules for OpenLayers maps */ + +#map { + right: 0px; + left: 2px; +} + +#permalink { + right: 15px; + text-align: right; +} + +/* Rules for the popout map sidebar */ + +#sidebar { + right: 0px; +} + +#sidebar #sidebar_title { + text-align: right; +} + +#sidebar #sidebar_close { + text-align: left; +} + +/* Rules for the main content area */ + +#content { + right: 192px; + left: 10px; + text-align: right; +} + +#slim_header img { + margin-left: 5px; +} + +/* Rules for the copyright page */ + +#cc_logo { + float: left; +} + +/* Rules for the changeset list shown by the history tab etc */ + +#changeset_list { + text-align: right; +} + +#changeset_list_map { + float: left; + left: 0px; +} + +/* Rules for the data browser */ + +#browse_navigation { + float: left; + margin-right: 10px; +} + +#browse_map { + float: left; + text-align: left; + margin-right: 10px; +} + +/* Rules for the trace list shown by the traces tab etc */ + +#trace_list { + text-align: right; +} + +/* Rules for the diary list */ + +#diary_list img.user_thumbnail { + float: left; +} + +/* Rules for the diary entry view */ + +#diary_entry img.user_image { + float: left; +} + +#diary_entry img.user_thumbnail { + float: left; +} + +/* Rules for the user list */ + +#user_list_actions { + float: left; +} + +/* Rules for the login page */ + +#login_wrapper input[type=submit] { + float: left; +} + +/* Rules for the account confirmation page */ + +form#termsForm div#buttons { + float: left; +} + +form#termsForm input#agree { + margin-right: 50px; +} + +/* Rules for the user view */ + +#user_details img.user_image { + float: left; +} + +#user_details .user_map { + float: left; +} + +/* Rules for rails validation error boxes */ + +#errorExplanation h2 { + text-align: right; + padding: 5px 15px 5px 5px; +} + +/* Rules for forms */ + +.fieldName { + text-align: left; +} + +input.openid_url { + background: url('../images/openid_input.png') repeat-y right white; + padding-right: 16px; +} diff --git a/public/stylesheets/small.css b/public/stylesheets/small.css index 353cf6fd0..d0067a618 100644 --- a/public/stylesheets/small.css +++ b/public/stylesheets/small.css @@ -95,7 +95,10 @@ h1 { #content { left: 10px; + right: 10px; top: 47px; + margin-left: 0px; + margin-right: 0px; } /* Rules for the signup form */ -- 2.43.2