From 63af7eca9f1f75c2498bb8b2e4c7511814091153 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 10:58:52 +1300 Subject: [PATCH 1/7] Fix wrapping of admin menu, and put profile link (with image) last --- app/views/layouts/_menu.haml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_menu.haml b/app/views/layouts/_menu.haml index 3703f969b..fba2e4aea 100644 --- a/app/views/layouts/_menu.haml +++ b/app/views/layouts/_menu.haml @@ -49,13 +49,21 @@ = link_to t('.forums'), forums_path, class: 'dropdown-item' - if member_signed_in? + - if current_member.role?(:crop_wrangler) || current_member.role?(:admin) + %li.nav-item.dropdown + %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.admin') + .dropdown-menu{"aria-labelledby" => "navbarDropdown"} + - if current_member.role?(:crop_wrangler) + = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item' + - if current_member.role?(:admin) + = link_to t('.admin'), admin_path, class: 'dropdown-item' + %li.nav-item.dropdown %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"} + = image_tag(avatar_uri(current_member, 50), alt: '', height: 25, width: 25) + = current_member.login_name - if current_member.unread_count.positive? - = t('.your_stuff') %span.badge.badge-info= current_member.unread_count - - else - = current_member.login_name .dropdown-menu{"aria-labelledby" => "navbarDropdown"} = link_to member_path(current_member), class: 'dropdown-item' do = t('.profile') @@ -80,14 +88,6 @@ .dropdown-divider = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item' - - if current_member.role?(:crop_wrangler) || current_member.role?(:admin) - %li.nav-item.dropdown - %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.admin') - .dropdown-menu{"aria-labelledby" => "navbarDropdown"} - - if current_member.role?(:crop_wrangler) - = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item' - - if current_member.role?(:admin) - = link_to t('.admin'), admin_path, class: 'dropdown-item' - else %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn btn-signin' %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn btn-signup' From 76a3dcfc9335b01ccc03cd8706538277e13670cc Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 11:09:19 +1300 Subject: [PATCH 2/7] Added breadcrumbs to members --- app/views/members/show.html.haml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml index 693a61d2a..62f2e0978 100644 --- a/app/views/members/show.html.haml +++ b/app/views/members/show.html.haml @@ -10,6 +10,10 @@ - content_for :member_rss_login_name, @member.login_name - content_for :member_rss_slug, @member.slug +- content_for :breadcrumbs do + %li.breadcrumb-item= link_to 'Members', members_path + %li.breadcrumb-item.active= link_to @member.login_name, member_path(@member) + .row .col-md-2 .card From 155f2ed548d19d239c5dc156db98fe4a5e588123 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 12:34:08 +1300 Subject: [PATCH 3/7] Fix menu link label in spec --- spec/features/conversations/index_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb index 9df3b584e..519ef144d 100644 --- a/spec/features/conversations/index_spec.rb +++ b/spec/features/conversations/index_spec.rb @@ -14,7 +14,7 @@ describe "Conversations", :js do describe "Read conversations list" do before do visit root_path - click_link 'Your Stuff' + click_link recipient.login_name click_link 'Inbox' end it { expect(page).to have_content 'something i want to say' } @@ -48,7 +48,7 @@ describe "Conversations", :js do sender.send_message(recipient, 'this is another message', 'follow up message') visit root_path - click_link 'Your Stuff' + click_link recipient.login_name click_link 'Inbox' all('input[type=checkbox]').each(&:click) @@ -63,7 +63,7 @@ describe "Conversations", :js do sender.send_message(recipient, 'this is another message', 'follow up message') visit root_path - click_link 'Your Stuff' + click_link recipient.login_name click_link 'Inbox' expect(page).to have_selector('.sent') From e8c7a9e1f5c01b53287ce0e62f333b9a3601a0d2 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 12:57:48 +1300 Subject: [PATCH 4/7] Fixed menu link label in another spec --- spec/features/conversations/show_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/conversations/show_spec.rb b/spec/features/conversations/show_spec.rb index 1bcfb8873..d72828c46 100644 --- a/spec/features/conversations/show_spec.rb +++ b/spec/features/conversations/show_spec.rb @@ -14,7 +14,7 @@ describe "Conversations", :js do describe 'view conversation thread' do before do visit root_path - click_link 'Your Stuff' + click_link member.login_name click_link 'Inbox' click_link 'something i want to say' end From 07a9891ec4d9c537665fceff1aa42d3bfc83a5fe Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 14:35:32 +1300 Subject: [PATCH 5/7] Fix spec --- spec/features/conversations/show_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/conversations/show_spec.rb b/spec/features/conversations/show_spec.rb index d72828c46..c2a7ae25a 100644 --- a/spec/features/conversations/show_spec.rb +++ b/spec/features/conversations/show_spec.rb @@ -14,7 +14,7 @@ describe "Conversations", :js do describe 'view conversation thread' do before do visit root_path - click_link member.login_name + click_link recipient.login_name click_link 'Inbox' click_link 'something i want to say' end From 325729751a1c9bedd7d59e017e515b28b056ef6b Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 20 Feb 2020 16:04:09 +1300 Subject: [PATCH 6/7] Move search bar to middle, hide sitename on small screens --- app/views/layouts/_header.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 414dac23e..86e2110f9 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -2,9 +2,10 @@ .nav %a.navbar-brand{ href: root_path } = image_tag("pear.png", class: 'logo', alt: 'Growstuff brand logo (drawing of a pear)') - %span.site-name Growstuff + .d-none.d-md-block + %span.site-name Growstuff + .nav= render 'crops/search_bar' .nav %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button" } %i.fas.fa-ellipsis-v.navbar-toggler-icon = render 'layouts/menu' - = render 'crops/search_bar' \ No newline at end of file From c85abe0bd100343073d3954bad0765bb9a3b2372 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 22 Feb 2020 12:29:02 +1300 Subject: [PATCH 7/7] Member planting progress (#2437) * Show member plantings summary on member page * Remove reference to current member * Tidy up member planting progress section --- app/views/members/_full_summary.html.haml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/members/_full_summary.html.haml b/app/views/members/_full_summary.html.haml index 9d35457c1..3ed78bd3b 100644 --- a/app/views/members/_full_summary.html.haml +++ b/app/views/members/_full_summary.html.haml @@ -8,10 +8,11 @@ %section.planting-progress %h2 Progress report %p Still growing - - @others.each do |planting| - .row - .col-2= render 'plantings/tiny', planting: planting - .col-10= render 'plantings/progress', planting: planting + .list-group + - @others.each do |planting| + .list-group-item + %span= render 'plantings/tiny', planting: planting + %span= render 'plantings/progress', planting: planting - if @late.size.positive? %section.late %h2 Late