Split mobile participant row to partial, fontawesome update

app/views/activities/_mobile_participant_row.html.haml

@@ -0,0 +1,15 @@
+- p = participant
+- all_buttons = show_all_buttons
+%tr.participant-row{data: {person_id: p.person.id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
+  %td
+    = p.person.full_name
+    - if p.is_organizer
+      %i.far.fa-star
+
+  %td
+    - if p.person.id == current_person.id || all_buttons
+      = render partial: "activities/presence_buttons", locals: {activity: @activity, person: p.person, state: p.attending}
+
+  %tr.participant-row{data: {person_id: p.person_id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
+    %td{colspan: "2"}
+      = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"

app/views/activities/_presence_buttons.haml

@@ -1,12 +1,12 @@
 .btn-group.btn-group-xs{role: "group"}
   %button.btn.btn-success.btn-present.btn-presence{data: {person_id: person.id, activity_id: activity.id, group_id: activity.group.id, new_state: "present"}}
     - if !state
-      %i.fa.fa-check
+      %i.fas.fa-check
     - else
-      %i.fa.fa-check-circle
+      %i.fas.fa-check-circle
 
   %button.btn.btn-danger.btn-absent.btn-presence{data: {person_id: person.id, activity_id: activity.id, group_id: activity.group.id, new_state: "absent"}}
     - if state == false
-      %i.fa.fa-times-circle
+      %i.fas.fa-times-circle
     - else
-      %i.fa.fa-times
+      %i.fas.fa-times

app/views/activities/_wide_presence_buttons.haml

@@ -2,15 +2,15 @@
   .btn-group
     %button.btn.btn-success.btn-present.btn-presence{data: {wide: 1, person_id: person.id, activity_id: activity.id, group_id: activity.group.id, new_state: "present"}}
       - if !state
-        %i.fa.fa-check
+        %i.fas.fa-check
       - else
-        %i.fa.fa-check-circle
+        %i.fas.fa-check-circle
       = t 'activities.state.present'
 
   .btn-group
     %button.btn.btn-danger.btn-absent.btn-presence{data: {wide: 1, person_id: person.id, activity_id: activity.id, group_id: activity.group.id, new_state: "absent"}}
       - if state == false
-        %i.fa.fa-times-circle
+        %i.fas.fa-times-circle
       - else
-        %i.fa.fa-times
+        %i.fas.fa-times
       = t 'activities.state.absent'

app/views/activities/edit.html.haml

@@ -61,7 +61,7 @@
             = f.check_box :is_assignable
             = t 'activerecord.attributes.subgroup.is_assignable'
             (
-            %i.fa.fa-random
+            %i.fas.fa-random
             )
 
       = f.submit t('activities.subgroups.create'), class: 'btn btn-success'
@@ -77,10 +77,10 @@
             = t 'activerecord.attributes.subgroup.name'
 
           %th
-            %i.fa.fa-random
+            %i.fas.fa-random
 
           %th
-            %i.fa.fa-cogs
+            %i.fas.fa-cogs
         - @subgroups.each do |sg|
           %tr
             %td
@@ -90,16 +90,16 @@
             %td
               = link_to group_activity_update_subgroup_path(@group, @activity, sg.id, 'subgroup[is_assignable]' => !sg.is_assignable), method: :patch, class: 'btn btn-default btn-xs' do
                 - if sg.is_assignable
-                  %i.fa.fa-check
+                  %i.fas.fa-check
                 - else
-                  %i.fa.fa-times
+                  %i.fas.fa-times
 
             %td
               = link_to group_activity_destroy_subgroup_path(@group, @activity, sg.id), method: :delete, class: 'btn btn-danger btn-xs', data: {confirm: I18n.t(:areyousure)} do
-                %i.fa.fa-trash
+                %i.fas.fa-trash
 
       = link_to(group_activity_edit_subgroups_path(@group, @activity), class: 'btn btn-default') do
-        %i.fa.fa-edit
+        %i.fas.fa-edit
         = t 'activities.subgroups.edit'
 
 

app/views/activities/index.html.haml

@@ -8,15 +8,15 @@
 .btn-group.pull-right
   - if params[:past]
     = link_to group_activities_path(@group), class: 'btn btn-default' do
-      %i.fa.fa-history
+      %i.fas.fa-history
       = t 'activities.upcoming'
   - else
     = link_to group_activities_path(@group, past: true), class: 'btn btn-default' do
-      %i.fa.fa-history
+      %i.fas.fa-history
       = t 'activities.past'
   - if isleader
     = link_to new_group_activity_path(@group), class: 'btn btn-default' do
-      %i.fa.fa-plus
+      %i.fas.fa-plus
       = t 'activities.new'
 
 %table.table
@@ -49,6 +49,6 @@
         - if isleader
           %td
             = link_to edit_group_activity_path(@group, a) do
-              %i.fa.fa-pencil
+              %i.fas.fa-pencil-alt
 
 = will_paginate @activities

app/views/activities/show.html.haml

@@ -5,21 +5,21 @@
       .panel-heading
         .btn-group.pull-right
           %button.btn.btn-default.dropdown-toggle.btn-xs{data: {toggle: 'dropdown'}, 'aria-haspopup': true, 'aria-expanded': false}
-            %i.fa.fa-cogs
+            %i.fas.fa-cogs
             %span.caret
           %ul.dropdown-menu
             %li
               %a.copy-reactions{data: {activity: @activity.id, absent: true}}
-                %i.fa.fa-files-o
+                %i.fas.fa-copy
                 = t 'activities.participant.copy_absent'
               %a.copy-reactions{data: {activity: @activity.id, present: true, absent: true, unknown: true}}
-                %i.fa.fa-files-o
+                %i.fas.fa-copy
                 = t 'activities.participant.copy_responses'
             - if all_buttons
               %li.divider{role: 'separator'}
               %li
                 = link_to edit_group_activity_path(@group, @activity) do
-                  %i.fa.fa-pencil
+                  %i.fas.fa-pencil
                   = t :edit
         = @activity.name
 
@@ -115,7 +115,7 @@
         %td
           = p.person.full_name
           - if p.is_organizer
-            %i.fa.fa-star-o
+            %i.fas.fa-star-o
 
         %td
           = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
@@ -137,10 +137,10 @@
       %a{role: 'button', href: '#present-collapse', data: {toggle: 'collapse'}, 'aria-expanded': 'false'}
 
         %span.sv-show-collapsed
-          %i.fa.fa-angle-down
+          %i.fas.fa-angle-down
 
         %span.sv-show-expanded
-          %i.fa.fa-angle-up
+          %i.fas.fa-angle-up
 
         = t 'activities.state.present'
         %span.badge.state-count.present-count
@@ -149,30 +149,17 @@
     %table.table.collapse#present-collapse
       %tbody
         - @participants.where(attending: true).each do |p|
-          %tr.participant-row{data: {person_id: p.person.id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td
-              = p.person.full_name
-              - if p.is_organizer
-                %i.fa.fa-star-o
-
-            %td
-              - if p.person.id == current_person.id || all_buttons
-                = render partial: "activities/presence_buttons", locals: {activity: @activity, person: p.person, state: p.attending}
-
-          %tr.participant-row{data: {person_id: p.person_id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
-
+          = render partial: "mobile_participant_row", locals: {participant: p, show_all_buttons: all_buttons}
 
   .panel.panel-default
     .panel-heading
       %a{role: 'button', href: '#unknown-collapse', data: {toggle: 'collapse'}, 'aria-expanded': 'false'}
 
         %span.sv-show-collapsed
-          %i.fa.fa-angle-down
+          %i.fas.fa-angle-down
 
         %span.sv-show-expanded
-          %i.fa.fa-angle-up
+          %i.fas.fa-angle-up
 
         = t 'activities.state.need_response'
 
@@ -182,29 +169,17 @@
     %table.table.collapse#unknown-collapse
       %tbody
         - @participants.where(attending: nil).each do |p|
-          %tr.participant-row{data: {person_id: p.person.id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td
-              = p.person.full_name
-              - if p.is_organizer
-                %i.fa.fa-star-o
-
-            %td
-              - if p.person.id == current_person.id || all_buttons
-                = render partial: "activities/presence_buttons", locals: {activity: @activity, person: p.person, state: p.attending}
-
-          %tr.participant-row{data: {person_id: p.person_id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
+          = render partial: "mobile_participant_row", locals: {participant: p, show_all_buttons: all_buttons}
 
   .panel.panel-default.panel-danger
     .panel-heading
       %a{role: 'button', href: '#absent-collapse', data: {toggle: 'collapse'}, 'aria-expanded': 'false'}
 
         %span.sv-show-collapsed
-          %i.fa.fa-angle-down
+          %i.fas.fa-angle-down
 
         %span.sv-show-expanded
-          %i.fa.fa-angle-up
+          %i.fas.fa-angle-up
 
         = t 'activities.state.absent'
 
@@ -214,16 +189,4 @@
     %table.table.collapse#absent-collapse
       %tbody
         - @participants.where(attending: false).each do |p|
-          %tr.participant-row{data: {person_id: p.person.id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td
-              = p.person.full_name
-              - if p.is_organizer
-                %i.fa.fa-star-o
-
-            %td
-              - if p.person.id == current_person.id || all_buttons
-                = render partial: "activities/presence_buttons", locals: {activity: @activity, person: p.person, state: p.attending}
-
-          %tr.participant-row{data: {person_id: p.person_id, activity_id: @activity.id, subgroup_id: p.subgroup_id}}
-            %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
+          = render partial: "mobile_participant_row", locals: {participant: p, show_all_buttons: all_buttons}

app/views/authentication/logout_confirm.html.haml

@@ -4,7 +4,7 @@
       = t :areyousure
     .panel-body
       = link_to logout_path, method: :delete, class: 'btn btn-danger' do
-        %i.fa.fa-sign-out{'aria-hidden': true}
+        %i.fas.fa-sign-out-alt{'aria-hidden': true}
         = t :log_out
       = link_to root_path, class: 'btn btn-default' do
         = t :cancel

app/views/dashboard/home.html.haml

@@ -45,10 +45,10 @@
               %a{role: 'button', href: '#needresponse-collapse', data: {toggle: 'collapse'}, 'aria-expanded': 'false'}
 
                 %span.sv-show-collapsed
-                  %i.fa.fa-angle-down
+                  %i.fas.fa-angle-down
 
                 %span.sv-show-expanded
-                  %i.fa.fa-angle-up
+                  %i.fas.fa-angle-up
 
                 = t 'activities.state.need_response'
                 %span.badge

app/views/dashboard/settings.html.haml

@@ -14,14 +14,14 @@
         = text_field_tag(:calurl, person_calendar_url(@person.calendar_token), readonly: true, id: 'calurl', class: 'form-control')
         %span.input-group-btn
           = button_tag(class: 'btn btn-default copy-url', data: {'clipboard-target': '#calurl'}) do
-            %i.fa.fa-files-o
+            %i.far.fa-files
 
     .form-group
       .input-group
         = text_field_tag(:calurl_nocancel, person_calendar_url(@person.calendar_token, skipcancel: 1), readonly: true, id: 'calurl-skipcancel', class: 'form-control')
         %span.input-group-btn
           = button_tag(class: 'btn btn-default copy-url', data: {'clipboard-target': '#calurl-skipcancel'}) do
-            %i.fa.fa-files-o
+            %i.far.fa-files
 
 %h2
   = t 'settings.email_settings'

app/views/shared/_menu.html.haml

@@ -14,31 +14,31 @@
       %ul.nav.navbar-nav
         %li
           = link_to root_path do
-            %i.fa.fa-home{'aria-hidden': true}
+            %i.fas.fa-home{'aria-hidden': true}
             Home
 
         %li
           = link_to user_groups_path do
-            %i.fa.fa-users{'aria-hidden': true}
+            %i.fas.fa-users{'aria-hidden': true}
             = t 'groups.plural'
 
         - if current_person.is_admin?
           %li
             = link_to people_path do
-              %i.fa.fa-user{'aria-hidden': true}
+              %i.fas.fa-user{'aria-hidden': true}
               = t 'person.plural'
 
           %li
             = link_to groups_path do
-              %i.fa.fa-users{'aria-hidden': true}
+              %i.fas.fa-users{'aria-hidden': true}
               = t 'groups.all'
 
       %ul.nav.navbar-nav.navbar-right
         %li
           = link_to settings_path do
-            %i.fa.fa-cogs{'aria-hidden': true}
+            %i.fas.fa-cogs{'aria-hidden': true}
             = t 'settings.settings'
         %li
           = link_to logout_path, confirm: "Really log out?", method: :delete do
-            %i.fa.fa-sign-out{'aria-hidden': true}
+            %i.fas.fa-sign-out-alt{'aria-hidden': true}
             = t 'log_out'