From 4a0afad3975079fed65b8c25e0c29f56d14f7530 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Fri, 17 Jan 2014 08:33:40 +0100 Subject: [PATCH 1/3] Removes superfluous view --- .../my_projects_overviews/account.html.erb | 70 ------------------- 1 file changed, 70 deletions(-) delete mode 100644 app/views/my_projects_overviews/account.html.erb diff --git a/app/views/my_projects_overviews/account.html.erb b/app/views/my_projects_overviews/account.html.erb deleted file mode 100644 index 01affacf6c..0000000000 --- a/app/views/my_projects_overviews/account.html.erb +++ /dev/null @@ -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. - -++#%> - -
-<%= link_to(l(:button_change_password), :action => 'password') if @user.change_password_allowed? %> -<%= call_hook(:view_my_account_contextual, :user => @user)%> -
-

<%=l(:label_my_account)%>

-<%= error_messages_for 'user' %> - -<% form_for :user, @user, :url => { :action => "account" }, - :builder => TabularFormBuilder, - :lang => current_language, - :html => { :id => 'my_account_form' } do |f| %> -
-

<%=l(:label_information_plural)%>

-
-

<%= f.text_field :firstname, :required => true %>

-

<%= f.text_field :lastname, :required => true %>

-

<%= f.text_field :mail, :required => true %>

-

<%= f.select :language, lang_options_for_select %>

-<% if Setting.openid? %> -

<%= f.text_field :identity_url %>

-<% end %> - -<% @user.custom_field_values.select(&:editable?).each do |value| %> -

<%= custom_field_tag_with_label :user, value %>

-<% end %> -<%= call_hook(:view_my_account, :user => @user, :form => f) %> -
- -<%= submit_tag l(:button_save) %> -
- -
-

<%=l(:field_mail_notification)%>

-
-<%= render :partial => 'users/mail_notifications' %> -
- -

<%=l(:label_preferences)%>

-
-<%= render :partial => 'users/preferences' %> -
- -
-<% end %> - -<% content_for :sidebar do %> -<%= render :partial => 'sidebar' %> -<% end %> - -<% html_title(l(:label_my_account)) -%> From f263c84e1a3aa07430f3a12178f753ea524011e0 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Fri, 17 Jan 2014 08:34:01 +0100 Subject: [PATCH 2/3] Adds specific action menu --- .../my_projects_overviews/index.html.erb | 6 ++++-- .../page_layout.html.erb | 20 ++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/views/my_projects_overviews/index.html.erb b/app/views/my_projects_overviews/index.html.erb index d923ad2bad..956c6bb52f 100644 --- a/app/views/my_projects_overviews/index.html.erb +++ b/app/views/my_projects_overviews/index.html.erb @@ -18,7 +18,7 @@ See doc/COPYRIGHT.md for more details. ++#%> -
+<% 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("   ").html_safe %> -
+<% end %>

<%=l(:label_overview)%>

+<%= render :partial => 'layouts/action_menu_specific' %> + <% ['top', 'left', 'right'].each do |position| %>
<% blocks[position].each do |b| %> diff --git a/app/views/my_projects_overviews/page_layout.html.erb b/app/views/my_projects_overviews/page_layout.html.erb index 745adf8679..078470884b 100644 --- a/app/views/my_projects_overviews/page_layout.html.erb +++ b/app/views/my_projects_overviews/page_layout.html.erb @@ -112,19 +112,21 @@ function addBlock() { //]]> -
-<%= form_tag({:action => "add_block"}, :id => "block-form") do %> - <%= select_tag 'block', - ("" + 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', + ("" + 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' %> -

<%=l(:label_overview)%>

+<%= render :partial => 'layouts/action_menu_specific' %> +

<%=l(:label_visible_elements) %>

<% (field_list - ['hidden']).each do |f| %>
From f1fa0c2f81f765dcf5557611664a26b0fa5a4831 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Fri, 17 Jan 2014 08:35:40 +0100 Subject: [PATCH 3/3] Adds changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e5c083294..fdbc18ecfd 100644 --- a/CHANGELOG.md +++ b/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