diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index 46d107907..160637b16 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -19,7 +19,7 @@ <%= t 'diary_entry.edit.location' -%> - +
<%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %> <%= t 'diary_entry.edit.use_map_link' -%>

@@ -28,8 +28,8 @@ - <%= submit_tag t('diary_entry.edit.save_button') %> - <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> + <%= submit_tag t('diary_entry.edit.save_button') %> + <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> @@ -71,8 +71,8 @@ var lonlat = getEventPosition(e); - document.getElementById('latitude').value = lonlat.lat; - document.getElementById('longitude').value = lonlat.lon; + $("latitude").value = lonlat.lat; + $("longitude").value = lonlat.lon; if (marker) { removeMarkerFromMap(marker); diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index e3dac5989..a78b41a4f 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,42 +1,40 @@ -
- <% if @this_user %> - <%= user_image @this_user %> - <% end %> +<% if @this_user %> + <%= user_image @this_user %> +<% end %> -

<%= h(@title) %>

+

<%= 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')} %> + <% end %> +<% end %> + +<% if @entries.empty? %> +

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

+<% else %> +

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

+ +
<% 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 %> + <%= render :partial => 'diary_entry', :collection => @entries %> <% 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')} %> - <% end %> + <%= render :partial => 'diary_list_entry', :collection => @entries %> <% end %> - <% if @entries.empty? %> -

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

- <% else %> -

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

+ <%= 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 %> - <% 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 451d849c2..3bc9323e3 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,28 +1,26 @@ -
- <%= user_image @entry.user %> +<%= 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') %> - <% end %> + <% 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 %> - <% 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/site.html.erb b/app/views/layouts/site.html.erb index 1e00604d4..0c39cf74b 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -6,7 +6,7 @@ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>

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

-
+
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= yield %> diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index 8addd5c1c..31e4cf0b1 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -5,7 +5,7 @@ <% if trace.inserted %> <% else %> - <%= t'trace.trace.pending' %> + <%= t'trace.trace.pending' %> <% end %> <% end %> @@ -18,15 +18,7 @@ <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> / <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> / <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> - <% if trace.visibility == "public" %> - <%= t'trace.trace.public' %> - <% elsif trace.visibility == "identifiable" %> - <%= t'trace.trace.identifiable' %> - <% elsif trace.visibility == "trackable" %> - <%= t'trace.trace.trackable' %> - <% else %> - <%= t'trace.trace.private' %> - <% end %> + <%= t('trace.trace.' + trace.visibility) %>
<%= h(trace.description) %>
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index f33051c24..5de2beff7 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,127 +1,123 @@ -
- <%= user_image @this_user %> +<%= 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) %> - <% 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 %>

- -
- <% 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 %> +<% 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 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 %> + <%= 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 %> - <% 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')} %> + <% 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 %> + +
+ <% 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 %> + <% 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.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 %> +
+ +

<%= 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? %> +

<%= 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.description' %>

+ +
<%= htmlize(@this_user.description) %>
+ +<% 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.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) %>

+ <% friends = @this_user.friends.collect { |f| f.befriendee } %> + <% nearby = @this_user.nearby - friends %> - <% 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 %>

+

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

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

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

+

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

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

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

- - <% 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 %> -
- <% end %> + <% if nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> + + <%= render :partial => "contact", :collection => nearby %> +
<% end %> -
+<% end %> diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index da805616e..dd7265735 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -338,12 +338,9 @@ hr { /* Rules for OpenLayers maps */ #map { - position: absolute; border: 1px solid black; margin: 0px; padding: 0px; - top: 0px; - bottom: 0px; } .olControlAttribution { @@ -566,6 +563,26 @@ hr { margin-bottom: 5px; } +/* Rules for the home page */ + +.site_index #map { + position: absolute; + top: 0px; + bottom: 0px; + left: 0px; + right: 0px; +} + +/* Rules for the edit page */ + +.site_edit #map { + position: absolute; + top: 0px; + bottom: 0px; + left: 0px; + right: 0px; +} + /* Rules for the changeset list shown by the history tab etc */ #changeset_list_container { @@ -646,6 +663,26 @@ table.browse_details th { color: gray; } +#trace_list .trace_pending { + color: red; +} + +#trace_list .trace_public { + color: green; +} + +#trace_list .trace_identifiable { + color: green; +} + +#trace_list .trace_trackable { + color: red; +} + +#trace_list .trace_private { + color: red; +} + /* Rules for the user list */ #user_list { @@ -666,6 +703,15 @@ table.browse_details th { margin-top: 10px; } +/* Rules for the new diary entry page */ + +.diary_entry_new div#map { + position: relative; + width: 90%; + height: 400px; + display: none; +} + /* Rules for the login page */ #login_wrapper div { @@ -790,12 +836,21 @@ p#contributorGuidance { /* Rules for the user view */ -#user_details .user_map { +.user_view .user_map { position: relative; width: 400px; height: 400px; } +.user_view .user_map p { + position: absolute; + top: 0px; + bottom: 0px; + width: 90%; + height: 30%; + margin: auto 5% +} + /* Rules for the user map */ .user_map .olControlPanZoomBar { diff --git a/public/stylesheets/ltr.css b/public/stylesheets/ltr.css index 26d4f1fd8..bc3db8dc0 100644 --- a/public/stylesheets/ltr.css +++ b/public/stylesheets/ltr.css @@ -94,11 +94,6 @@ html body { /* Rules for OpenLayers maps */ -#map { - left: 0px; - right: 2px; -} - #permalink { left: 15px; text-align: left; @@ -178,17 +173,17 @@ html body { /* Rules for the diary list */ -#diary_list img.user_thumbnail { +.diary_entry_list img.user_thumbnail { float: right; } /* Rules for the diary entry view */ -#diary_entry img.user_image { +.diary_entry_view img.user_image { float: right; } -#diary_entry img.user_thumbnail { +.diary_entry_view img.user_thumbnail { float: right; } @@ -216,11 +211,11 @@ form#termsForm input#agree { /* Rules for the user view */ -#user_details img.user_image { +.user_view img.user_image { float: right; } -#user_details .user_map { +.user_view .user_map { float: right; } diff --git a/public/stylesheets/rtl.css b/public/stylesheets/rtl.css index dd4d0f51d..6547c6b4f 100644 --- a/public/stylesheets/rtl.css +++ b/public/stylesheets/rtl.css @@ -101,11 +101,6 @@ html body { /* Rules for OpenLayers maps */ -#map { - right: 0px; - left: 2px; -} - #permalink { right: 15px; text-align: right; @@ -185,17 +180,17 @@ html body { /* Rules for the diary list */ -#diary_list img.user_thumbnail { +.diary_entry_list img.user_thumbnail { float: left; } /* Rules for the diary entry view */ -#diary_entry img.user_image { +.diary_entry_view img.user_image { float: left; } -#diary_entry img.user_thumbnail { +.diary_entry_view img.user_thumbnail { float: left; } @@ -223,11 +218,11 @@ form#termsForm input#agree { /* Rules for the user view */ -#user_details img.user_image { +.user_view img.user_image { float: left; } -#user_details .user_map { +.user_view .user_map { float: left; }