Merge pull request #21 from finnlabs/fix/accessibility_linearisation_of_work_package_show_form_2259

[FIX] Accessibility linearisation of work package show form 2259

CHANGELOG.md

@@ -20,6 +20,8 @@ See doc/COPYRIGHT.md for more details.
 
 # Changelog
 
+* `#2259` [Accessibility] linearisation of issue show form (2)
+
 ## 3.0.0.pre11
 
 * fixed sepc for User Story #2743: Clear filters when 'Work Packages' is clicked in the menu bar

app/views/my_projects_overviews/account.html.erb

@@ -1,70 +0,0 @@
-<%#-- copyright
-OpenProject is a project management system.
-Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See doc/COPYRIGHT.md for more details.
-
-++#%>
-
-<div class="contextual">
-<%= link_to(l(:button_change_password), :action => 'password') if @user.change_password_allowed? %>
-<%= call_hook(:view_my_account_contextual, :user => @user)%>
-</div>
-<h2><%=l(:label_my_account)%></h2>
-<%= error_messages_for 'user' %>
-
-<% form_for :user, @user, :url => { :action => "account" },
-                          :builder => TabularFormBuilder,
-                          :lang => current_language,
-                          :html => { :id => 'my_account_form' } do |f| %>
-<div class="splitcontentleft">
-<h3><%=l(:label_information_plural)%></h3>
-<div class="box tabular">
-<p><%= f.text_field :firstname, :required => true %></p>
-<p><%= f.text_field :lastname, :required => true %></p>
-<p><%= f.text_field :mail, :required => true %></p>
-<p><%= f.select :language, lang_options_for_select %></p>
-<% if Setting.openid? %>
-<p><%= f.text_field :identity_url  %></p>
-<% end %>
-
-<% @user.custom_field_values.select(&:editable?).each do |value| %>
-	<p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-<%= call_hook(:view_my_account, :user => @user, :form => f) %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-</div>
-
-<div class="splitcontentright">
-<h3><%=l(:field_mail_notification)%></h3>
-<div class="box">
-<%= render :partial => 'users/mail_notifications' %>
-</div>
-
-<h3><%=l(:label_preferences)%></h3>
-<div class="box tabular">
-<%= render :partial => 'users/preferences' %>
-</div>
-
-</div>
-<% end %>
-
-<% content_for :sidebar do %>
-<%= render :partial => 'sidebar' %>
-<% end %>
-
-<% html_title(l(:label_my_account)) -%>

app/views/my_projects_overviews/index.html.erb

@@ -18,7 +18,7 @@ See doc/COPYRIGHT.md for more details.
 
 ++#%>
 
-<div class="contextual">
+<% content_for :action_menu_specific do %>
     <%=
       context_links = []
       if User.current.allowed_to?(:add_subprojects, project)
@@ -35,10 +35,12 @@ See doc/COPYRIGHT.md for more details.
       end
       context_links.join("&nbsp;&nbsp;&nbsp;").html_safe
     %>
-</div>
+<% end %>
 
 <h2><%=l(:label_overview)%></h2>
 
+<%= render :partial => 'layouts/action_menu_specific' %>
+
 <% ['top', 'left', 'right'].each do |position| %>
   <div id="list-<%= position %>" class="splitcontent<%= position %>">
     <% blocks[position].each do |b| %>

app/views/my_projects_overviews/page_layout.html.erb

@@ -112,19 +112,21 @@ function addBlock() {
 //]]>
 </script>
 
-<div class="contextual">
-<%= form_tag({:action => "add_block"}, :id => "block-form") do %>
-  <%= select_tag 'block',
-                 ("<option>--#{t(:button_add)}--</option>" + options_for_select(block_options)).html_safe,
-                 :id => "block-select",
-                 :onChange => "addBlock();"
-%>
+<% content_for :action_menu_specific do %>
+  <%= form_tag({:action => "add_block"}, :id => "block-form") do %>
+    <%= select_tag 'block',
+                   ("<option>--#{t(:button_add)}--</option>" + options_for_select(block_options)).html_safe,
+                   :id => "block-select",
+                   :onChange => "addBlock();"
+  %>
+  <% end %>
+  <%= link_to l(:button_back), {:action => 'index'}, :class => 'icon icon-cancel' %>
 <% end %>
-<%= link_to l(:button_back), {:action => 'index'}, :class => 'icon icon-cancel' %>
-</div>
 
 <h2><%=l(:label_overview)%></h2>
 
+<%= render :partial => 'layouts/action_menu_specific' %>
+
 <h4><%=l(:label_visible_elements) %></h4>
 <% (field_list - ['hidden']).each do |f| %>
   <div id="list-<%= f %>" class="splitcontent<%= f %> block-receiver">