Merge branch 'release/5.0' into dev

app/assets/stylesheets/meeting/meeting.css.erb

@@ -35,18 +35,6 @@ div.tabular > div { margin: 0;
 #meeting_agenda_preview fieldset {margin-top: 1em; background: url(<%= asset_path 'draft.png' %>);}
 #meeting_minutes_preview fieldset {margin-top: 1em; background: url(<%= asset_path 'draft.png' %>);}
 
-dt > .icon-meeting:before {
-  content: "\e057";
-}
-
-dt > .icon-meeting-agenda:before {
-  content: "\e023";
-}
-
-dt > .icon-meeting-minutes:before {
-  content: "\e022";
-}
-
 div.flash.notice a.link_to_profile {
   cursor:pointer;
   color: #008BD0;

app/helpers/meeting_contents_helper.rb

@@ -119,7 +119,7 @@ module MeetingContentsHelper
                             { controller: '/' + content_type.pluralize,
                               action: 'notify', meeting_id: meeting },
                             method: :put,
-                            class: 'button icon-context icon-mail'
+                            class: 'button icon-context icon-mail1'
     end
   end
 end

app/views/meeting_contents/_form.html.erb

@@ -26,7 +26,7 @@ See doc/COPYRIGHT.md for more details.
                    :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
 <%= f.hidden_field :lock_version %>
 <p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><%= f.text_field :comment, :size => 120 %></p>
-<p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
+<p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-checkmark' %>
 <% path = send("preview_#{content_type}_path", content.meeting) %>
 <%= preview_link path, "#{content_type}_form", { class: 'button preview' } %>
 <%= link_to l(:button_cancel), "#",

app/views/meeting_contents/diff.html.erb

@@ -20,7 +20,8 @@ See doc/COPYRIGHT.md for more details.
 ++#%>
 
 <% html_title "#{l(:label_meeting_diff)}: #{@meeting.title}" %>
-<%= toolbar title: "#{l(:"label_#{@content_type}")}: #{link_to @meeting, @meeting}" do %>
+<%= toolbar title: l(:"label_#{@content_type}"),
+            link_to: link_to(@meeting, @meeting) %>
   <% if authorize_for(@content_type.pluralize, :history) %>
     <li class="toolbar-item">
       <%= link_to({controller: "/#{@content_type.pluralize}", action: 'history', meeting_id: @meeting }, class: 'button') do %>

app/views/meeting_contents/history.html.erb

@@ -21,7 +21,8 @@ See doc/COPYRIGHT.md for more details.
 
 <% html_title "#{l(:label_history)}: #{@meeting.title}" %>
 
-<%= toolbar title: "#{l(:"label_#{@content_type}")}: #{link_to @meeting, @meeting}" %>
+<%= toolbar title: l(:"label_#{@content_type}"),
+            link_to: link_to(@meeting, @meeting) %>
 
 <h3><%= l(:label_history) %></h3>
 

app/views/meetings/_form.html.erb

@@ -32,15 +32,25 @@ See doc/COPYRIGHT.md for more details.
   </div>
 
   <div class="form--field">
-    <label class="form--label"><%= Meeting.human_attribute_name(:start_date) %></label>
+    <label for="meeting-form-start-date" class="form--label -required">
+      <span aria-hidden="true"><%= Meeting.human_attribute_name(:start_date) %></span>
+      <span class="hidden-for-sighted"><%= l(:label_start_date)%></span>
+    </label>
 
     <div class="form--field-container">
       <%= f.text_field :start_date,
+            id: 'meeting-form-start-date',
             required: true,
             size:     10,
             no_label: true %>
-      <%= calendar_for('meeting_start_date') %>
+      <%= calendar_for('meeting-form-start-date') %>
+      <label for="meeting-form-start-time" class="hidden-for-sighted">
+        <%= Meeting.human_attribute_name(:start_time_hour) %>
+        <%= l(:label_time_zone) %>
+        <%= Time.zone.to_s %>
+      </label>
       <%= f.text_field :start_time_hour,
+            id: 'meeting-form-start-time',
             required: true,
             type:     'time',
             no_label: true,
@@ -50,10 +60,14 @@ See doc/COPYRIGHT.md for more details.
   </div>
 
   <div class="form--field">
-    <label class="form--label"><%= Meeting.human_attribute_name(:duration) %></label>
+    <label for="meeting-form-duration" class="form--label -required">
+      <%= Meeting.human_attribute_name(:duration) %>
+      <span class="hidden-for-sighted"><%= l(:text_in_hours)%></span>
+    </label>
 
     <div class="form--field-container">
       <%= f.number_field :duration,
+            id: 'meeting-form-duration',
             required: true,
             size:     5,
             no_label: true,

app/views/meetings/edit.html.erb

@@ -24,7 +24,7 @@ See doc/COPYRIGHT.md for more details.
 <%= toolbar title: "#{l(:label_meeting)} ##{@meeting.id}" %>
 <%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'update'}, :html => {:id => 'meeting-form', :method => :put} do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>
-<%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
+<%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-checkmark' %>
 <%= link_to l(:button_cancel), { :action => 'show', :id => @meeting },
       class: 'button' %>
 <% end if @project %>

app/views/meetings/show.html.erb

@@ -20,7 +20,8 @@ See doc/COPYRIGHT.md for more details.
 ++#%>
 
 <% html_title "#{l(:label_meeting)}: #{@meeting.title}" %>
-<%= toolbar title: "#{l(:label_meeting)}: #{link_to @meeting}",
+<%= toolbar title: l(:label_meeting),
+            link_to: link_to(@meeting),
             html: { class: 'meeting--main-toolbar' } do %>
   <% unless User.current.anonymous? %>
     <li class="toolbar-item">

config/locales/en.yml

@@ -59,6 +59,8 @@ en:
   label_meeting_diff: "Diff"
   label_notify: "Send for review"
   label_version: "Version"
+  label_time_zone: "Time zone"
+  label_start_date: "Start date"
 
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.

lib/open_project/meeting/engine.rb

@@ -50,7 +50,7 @@ module OpenProject::Meeting
            caption: :project_module_meetings,
            param: :project_id,
            after: :wiki,
-           html: { class: 'icon2 icon-quote' }
+           html: { class: 'icon2 icon-meetings' }
 
       ActiveSupport::Inflector.inflections do |inflect|
         inflect.uncountable 'meeting_minutes'