From: Tom Hughes Date: Wed, 15 Sep 2021 17:44:23 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3297' X-Git-Tag: live~2042 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e91c02f2ceb2b72a77846a0c31f5eca22b9b0a65?hp=5652e9f6b95c1e44db597c0136a985aef5e28ad5 Merge remote-tracking branch 'upstream/pull/3297' --- diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 018ce0096..769fbca47 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -42,6 +42,7 @@ class Ability can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application can [:index, :destroy], :oauth2_authorized_application can [:new, :show, :create, :destroy], :oauth2_authorization + can [:show], :dashboard can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry can [:make_friend, :remove_friend], Friendship can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0023286bf..e0eec7bda 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1096,47 +1096,11 @@ tr.turn:hover { /* Rules for the user profile page */ -#userinformation { - min-height: 100px; - .userinformation-inner { - float: left; - } - .user-description { - width: 100%; - clear: both; - } -} - -.admin-user-info small { - margin-bottom: $lineheight/2; - display: inline; - margin-right: $lineheight; -} - .contact-activity { margin-top: $lineheight; width: 100%; } -.activity-details p { - margin-left: 70px; - margin-bottom: 0; -} - -.users-show { - // Silly exception; remove when user page is redesigned. - .content-inner { - max-width: none; - } - p#no_home_location { - margin: $lineheight; - } - .user_thumbnail { - margin-top: $lineheight/4; - float: left; - } -} - /* Rules for the user map */ .content_map .leaflet-popup-content { @@ -1466,6 +1430,12 @@ img.user_image { margin-right: $lineheight; } +img.user_image_no_margins { + max-width: 100px; + max-height: 100px; + border: 1px solid $grey; +} + img.user_thumbnail { max-width: 50px; max-height: 50px; @@ -1473,6 +1443,12 @@ img.user_thumbnail { margin-right: $lineheight; } +img.user_thumbnail_no_margins { + max-width: 50px; + max-height: 50px; + border: 1px solid $grey; +} + img.user_thumbnail_tiny { width: auto; height: auto; @@ -1489,28 +1465,28 @@ abbr.geo { /* General styles for action lists / subnavs / pager navs */ -ul.secondary-actions { - font-style: normal; - margin-bottom: 0; - margin-left: 0; - padding: 0; - &.pager { - display: inline-block; - margin-right: 60px; - } - > li { - display: block; - float: left; - list-style: none; - border-left: 1px solid $grey; - padding-left: $lineheight/2; - margin-right: $lineheight/2; - &:first-child { - border-left: 0; - padding-left: 0; + +nav.secondary-actions { + margin-left: -11px; + overflow: hidden; + > ul { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-bottom: 0; + margin-left: -1px; + padding: 0; + &.pager { + display: inline-block; + margin-right: 60px; } - &:last-child { - margin-right: 0px; + > li { + flex-basis: auto; + list-style: none; + border-left: 1px solid $grey; + padding-left: $lineheight/2; + margin-right: $lineheight/2; + margin-bottom: $lineheight/8; } } } @@ -1574,6 +1550,17 @@ div.secondary-actions { } } +/* Create a single-line dl */ + +dl.dl-inline { + dt, dd { + display: inline-block; + } + dd { + margin-right: 1em; + } +} + /* Customise the background colour of striped tables */ .table-striped > tbody > tr:nth-child(2n+1) > td, diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb new file mode 100644 index 000000000..540683d25 --- /dev/null +++ b/app/controllers/dashboards_controller.rb @@ -0,0 +1,14 @@ +class DashboardsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :set_locale + + authorize_resource :class => false + + before_action :check_database_readable + + def show + @user = current_user + end +end diff --git a/app/views/users/_contact.html.erb b/app/views/dashboards/_contact.html.erb similarity index 54% rename from app/views/users/_contact.html.erb rename to app/views/dashboards/_contact.html.erb index c7e10c060..7614c0c4d 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -4,21 +4,23 @@ :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) } %> -<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %> - <%= user_thumbnail contact %> -
-

+<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %> +

+ <%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %> +
+
+

<%= link_to contact.display_name, user_path(contact) %> <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> - (<%= t "users.show.m away", :count => (distance * 1000).round %>) + (<%= t ".m away", :count => (distance * 1000).round %>) <% else %> - (<%= t "users.show.km away", :count => distance.round %>) + (<%= t ".km away", :count => distance.round %>) <% end %> <% end %>

-

+

<% changeset = contact.changesets.first %> <% if changeset %> <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %> @@ -31,15 +33,17 @@ <% end %>

-
    -
  • <%= link_to t("users.show.send message"), new_message_path(contact) %>
    • -
  • - <% if current_user.is_friends_with?(contact) %> - <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% else %> - <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% end %> -
    • -
+
<% end %> diff --git a/app/views/users/_popup.html.erb b/app/views/dashboards/_popup.html.erb similarity index 100% rename from app/views/users/_popup.html.erb rename to app/views/dashboards/_popup.html.erb diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb new file mode 100644 index 000000000..9aa4abed4 --- /dev/null +++ b/app/views/dashboards/show.html.erb @@ -0,0 +1,65 @@ +<% content_for :heading do %> +

<%= t ".title" %>

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

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

+
+ <% else %> + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <% user_data = { + :lon => current_user.home_lon, + :lat => current_user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) + } %> + <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> + <% end %> + + <% friends = @user.friends %> + <% nearby = @user.nearby - friends %> +
+ +
+

<%= t ".my friends" %>

+ + <% if friends.empty? %> + <%= t ".no friends" %> + <% else %> + +
+ <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> +
+ <% end %> + +
+ +

<%= t ".nearby users" %>

+ + <% if nearby.empty? %> + <%= t ".no nearby users" %> + <% else %> + +
+ <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> +
+ <% end %> +
+ <% end %> +
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 946c6ce17..4080b8f95 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -23,31 +23,33 @@ <%= render :partial => "location", :object => diary_entry %> <% end %> - +
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 80561cbbf..6803c761e 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -6,19 +6,21 @@ <% end %>

<%= @title %>

- + <% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index a20474b57..192b07614 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -90,6 +90,7 @@
+ <%= link_to t("users.show.my_dashboard"), dashboard_path, :class => "dropdown-item" %> <%= link_to inbox_messages_path, :class => "dropdown-item" do %> <%= t("users.show.my messages") %> <%= number_with_delimiter(current_user.new_messages.size) %> diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 44de2ef06..74e096dd1 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -44,14 +44,16 @@ <% if trace.inserted? %> - + <% end %> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index 8955852c1..b0b73c5a0 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -20,18 +20,20 @@ <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %> - + diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 882eb27b1..8c89c80f3 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -3,10 +3,12 @@

<%= t(".heading_html", :name => link_to(@user_block.user.display_name, user_path(@user_block.user))) %>

- + <% end %> <%= bootstrap_form_for(@user_block) do |f| %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index d686bda10..03bcd3036 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -8,17 +8,19 @@ user_path(@user_block.user)), :block_by => link_to(@user_block.creator.display_name, user_path(@user_block.creator))) %> - + <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index caa7730cb..5aaeabb23 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,245 +1,202 @@ <% content_for :heading do %> -
- <%= user_image @user %> -
+
+
+ <%= user_image @user, :class => "user_image_no_margins" %> +
+

<%= @user.display_name %> <%= role_icons(@user) %>

<% if current_user and @user.id == current_user.id %> -
    -
  • - <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.changesets.size) %> -
    • -
  • - <%= link_to t(".my notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> - <%= number_with_delimiter(current_user.traces.size) %> -
    • -
  • - <%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.diary_entries.size) %> -
    • -
  • - <%= link_to t(".my comments"), diary_comments_path(current_user) %> -
    • -
  • - <%= link_to t(".my settings"), user_account_path(current_user) %> -
    • - - <% if current_user.blocks.exists? %> +
+ <% else %> -
    - -
  • - <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.changesets.size) %> -
    • -
  • - <%= link_to t(".notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.traces.size) %> -
    • - - - -
  • - <%= link_to t(".send message"), new_message_path(@user) %> -
    • -
  • - <%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.diary_entries.size) %> -
    • -
  • - <%= link_to t(".comments"), diary_comments_path(@user) %> -
    • -
  • - <% if current_user and current_user.is_friends_with?(@user) %> - <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> - <% elsif current_user %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> - <% else %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %> - <% end %> -
    • +
+ + <% end %> -

+

- <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %> - <% unless @user.terms_agreed %> - | - <%= t ".ct status" %> - <% if @user.terms_seen? -%> - <%= t ".ct declined" %> - <% else -%> - <%= t ".ct undecided" %> +
+
<%= t ".mapper since" %>
+
<%= l @user.creation_time.to_date, :format => :long %>
+ <% unless @user.terms_agreed %> +
<%= t ".ct status" %>
+
+ <% if @user.terms_seen? -%> + <%= t ".ct declined" %> + <% else -%> + <%= t ".ct undecided" %> + <% end -%> +
<% end -%> - <% end -%> +
-

-
- -
<%= @user.description.to_html %>
- - <% if current_user and @user.id == current_user.id %> -
- <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
- <% end %> -
+ <% if can?(:set_status, User) || can?(:destroy, User) %> + + <% end %> - <% if current_user and current_user.administrator? -%> - - <% end -%> - +
<% end %> -
- <% if current_user and @user.id == current_user.id %> -
- <% if @user.home_lat.nil? or @user.home_lon.nil? %> -
-

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

-
- <% else %> - <% content_for :head do %> - <%= javascript_include_tag "user" %> - <% end %> - <% user_data = { - :lon => current_user.home_lon, - :lat => current_user.home_lat, - :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) - } %> - <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> - <% end %> - - <% friends = @user.friends %> - <% nearby = @user.nearby - friends %> -
- -
-

<%= t ".my friends" %>

- - <% if friends.empty? %> - <%= t ".no friends" %> - <% else %> -
    -
  • <%= link_to t(".friends_changesets"), friend_changesets_path %>
    • -
  • <%= link_to t(".friends_diaries"), friends_diary_entries_path %>
    • -
-
- <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> -
- <% end %> - -
+
<%= @user.description.to_html %>
-

<%= t ".nearby users" %>

- - <% if nearby.empty? %> - <%= t ".no nearby users" %> - <% else %> -
    -
  • <%= link_to t(".nearby_changesets"), nearby_changesets_path %>
    • -
  • <%= link_to t(".nearby_diaries"), nearby_diary_entries_path %>
    • -
-
- <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> -
- <% end %> -
- <% end %> -
+<% if current_user and @user.id == current_user.id %> +
+ <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %> +
+<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c241f9020..6869e966b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -416,6 +416,26 @@ en: title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" timeout: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + dashboards: + contact: + km away: "%{count}km away" + m away: "%{count}m away" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" + show: + title: My Dashboard + no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." + edit_your_profile: Edit your profile + my friends: My friends + no friends: You have not added any friends yet. + nearby users: "Other nearby users" + no nearby users: "There are no other users who admit to mapping nearby yet." + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" diary_entries: new: title: New Diary Entry @@ -2495,6 +2515,7 @@ en: my settings: My Settings my comments: My Comments my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me edit_profile: Edit Profile @@ -2516,14 +2537,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." - edit_your_profile: Edit your profile - my friends: My friends - no friends: You have not added any friends yet. - km away: "%{count}km away" - m away: "%{count}m away" - nearby users: "Other nearby users" - no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2544,15 +2557,7 @@ en: unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" - nearby_changesets: "nearby user changesets" - nearby_diaries: "nearby user diary entries" report: Report this User - popup: - your location: "Your location" - nearby mapper: "Nearby mapper" - friend: "Friend" account: title: "Edit account" my settings: My Settings diff --git a/config/routes.rb b/config/routes.rb index dc10818b9..f4c19f88c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -240,6 +240,7 @@ OpenStreetMap::Application.routes.draw do match "/user/:display_name/account" => "users#account", :via => [:get, :post], :as => "user_account" post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user + resource :dashboard, :only => [:show] resource :preferences, :only => [:show, :edit, :update] resource :profile, :only => [:edit, :update] diff --git a/test/controllers/dashboards_controller_test.rb b/test/controllers/dashboards_controller_test.rb new file mode 100644 index 000000000..5073df8cc --- /dev/null +++ b/test/controllers/dashboards_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +class DashboardsControllerTest < ActionDispatch::IntegrationTest + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/dashboard", :method => :get }, + { :controller => "dashboards", :action => "show" } + ) + end + + def test_show_no_friends + user = create(:user) + session_for(user) + + get dashboard_path + end + + def test_show_with_friends + user = create(:user, :home_lon => 1.1, :home_lat => 1.1) + friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) + create(:friendship, :befriender => user, :befriendee => friend_user) + create(:changeset, :user => friend_user) + session_for(user) + + get dashboard_path + + # Friends should be visible as we're now logged in + assert_select "div#friends-container" do + assert_select "div.contact-activity", :count => 1 + end + end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 10c5c3bee..6e156375b 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -556,10 +556,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :not_found # Test a normal user - user = create(:user, :home_lon => 1.1, :home_lat => 1.1) - friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) - create(:friendship, :befriender => user, :befriendee => friend_user) - create(:changeset, :user => friend_user) + user = create(:user) get user_path(user) assert_response :success @@ -626,11 +623,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0 end - # Friends should be visible as we're now logged in - assert_select "div#friends-container" do - assert_select "div.contact-activity", :count => 1 - end - # Login as a moderator session_for(create(:moderator_user)) @@ -658,22 +650,22 @@ class UsersControllerTest < ActionDispatch::IntegrationTest get user_path(agreed_user) assert_response :success assert_select "div#userinformation" do - assert_select "p", :count => 0, :text => /Contributor terms/ + assert_select "dt", :count => 0, :text => /Contributor terms/ end get user_path(seen_user) assert_response :success # put @response.body assert_select "div#userinformation" do - assert_select "p", :count => 1, :text => /Contributor terms/ - assert_select "p", /Declined/ + assert_select "dt", :count => 1, :text => /Contributor terms/ + assert_select "dd", /Declined/ end get user_path(not_seen_user) assert_response :success assert_select "div#userinformation" do - assert_select "p", :count => 1, :text => /Contributor terms/ - assert_select "p", /Undecided/ + assert_select "dt", :count => 1, :text => /Contributor terms/ + assert_select "dd", /Undecided/ end end