Merge release/5.0 into dev

app/views/meetings/_form.html.erb

@@ -33,7 +33,9 @@ See doc/COPYRIGHT.md for more details.
 
   <div class="form--field">
     <label for="meeting-form-start-date" class="form--label -required">
-      <span aria-hidden="true"><%= Meeting.human_attribute_name(:start_date) %></span>
+      <span aria-hidden="true"><%= Meeting.human_attribute_name(:start_date) %>
+        <span class="form--label-required" aria-hidden="true">*</span>
+      </span>
       <span class="hidden-for-sighted"><%= l(:label_start_date)%></span>
     </label>
 
@@ -45,9 +47,11 @@ See doc/COPYRIGHT.md for more details.
             no_label: true %>
       <%= calendar_for('meeting-form-start-date') %>
       <label for="meeting-form-start-time" class="hidden-for-sighted">
-        <%= Meeting.human_attribute_name(:start_time_hour) %>
+        <%= Meeting.human_attribute_name(:start_time) %>
-        <%= l(:label_time_zone) %>
+        <label lang="en">
-        <%= Time.zone.to_s %>
+          <%= l(:label_time_zone) %>
+          <%= Time.zone.to_s %>
+        </label>
       </label>
       <%= f.text_field :start_time_hour,
             id: 'meeting-form-start-time',
@@ -61,8 +65,10 @@ See doc/COPYRIGHT.md for more details.
 
   <div class="form--field">
     <label for="meeting-form-duration" class="form--label -required">
-      <%= Meeting.human_attribute_name(:duration) %>
+      <span aria-hidden="true"><%= Meeting.human_attribute_name(:duration) %>
-      <span class="hidden-for-sighted"><%= l(:text_in_hours)%>  <%=l(:text_hours_between, min: 1, max: 168) %></span>
+        <span class="form--label-required" aria-hidden="true">*</span>
+      </span>
+      <span class="hidden-for-sighted" lang="en"><%= l(:text_in_hours)%>  <%=l(:text_hours_between, min: 1, max: 168) %></span>
     </label>
 
     <div class="form--field-container">

features/meetings_show.feature

@@ -140,6 +140,6 @@ Feature: Show meetings
 
        When I go to the show page for the meeting called "Bobs Meeting"
         And I follow "History" within ".meeting_agenda"
-        And I follow "1" within "table.list"
+        And I follow "1" within "table"
        Then I should see "Agenda" within ".meeting_agenda"
         And I should see "blah" within ".meeting_agenda"