diff --git a/app/assets/javascripts/my_page.js b/app/assets/javascripts/my_page.js deleted file mode 100644 index aff02b0a02..0000000000 --- a/app/assets/javascripts/my_page.js +++ /dev/null @@ -1,139 +0,0 @@ -//-- copyright -// OpenProject is a project management system. -// Copyright (C) 2012-2018 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. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2017 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// 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 docs/COPYRIGHT.rdoc for more details. -//++ - -jQuery(document).ready(function($) { - - // Add block - $('.my-page--block-form').submit(function (evt) { - var form = $(this); - var block = $('#block-options').val(); - evt.preventDefault(); - - jQuery - .ajax( - { - url: form.attr('action'), - type: 'POST', - dataType: 'html', - data: { - block: block - } - }) - .fail(function(error, text) { - jQuery(window).trigger( - 'op:notifications:add', - { - type: 'error', - message: I18n.t('js.error.cannot_save_changes_with_message', { error: _.get(error, 'responseText', 'Internal error') }) - } - ); - }) - .done(function(response) { - // Add partial to the top container. - jQuery("#top").prepend(response); - - // Revert options selection back to the default one. - jQuery('#block-options option').first().prop('selected', true); - - // Disable the option for this block in the blocks-to-add-to-page dropdown. - jQuery('#block-options option[value="' + block + '"]').attr("disabled", "true"); - }); - - return false; - }); - - // Remove block - $('.my-page--container') - .on('click', '.my-page--remove-block', function (evt) { - evt.preventDefault(); - - var link = $(this); - var block = link.data('name'); - var dasherized = link.data('dasherized'); - - jQuery - .ajax( - { - url: link.attr('href'), - type: 'POST', - dataType: 'html', - data: { - block: block - } - }) - .fail(function(error) { - jQuery(window).trigger( - 'op:notifications:add', - { - type: 'error', - message: I18n.t('js.error.cannot_save_changes_with_message', { error: _.get(error, 'responseText', 'Internal error') }) - } - ); - }) - .done(function() { - jQuery("#block-" + dasherized).remove(); - // Enable the option for this block in the blocks-to-add-to-page dropdown. - jQuery('#block-options option[value="' + block + '"]').removeAttr("disabled"); - }); - - return false; - }); - - // Canonical list of containers that will exchange draggable elements. - var containers = jQuery('.dragula-container').toArray(); - var drake = dragula(containers); - - // On 'el' drop, we fire an Ajax request to persist the order chosen by - // the user. Actual ordering details are handled on the server. - drake.on('drop', function(el, target, source, sibling){ - var url = window.gon.my_order_blocks_url; - - // Array of target ordered children after this drop. - var target_ordered_children = jQuery(target).find('.block-wrapper').map(function(){ - return jQuery(this).data('name'); - }).get(); - - // Array of source ordered children after this drop. - var source_ordered_children = jQuery(source).find('.block-wrapper').map(function(){ - return jQuery(this).data('name'); - }).get(); - - // We send the source, target, and the new order of the children in both - // containers to the server. - jQuery.ajax({ - url: url, - type: 'POST', - data: { - target: jQuery(target).attr('id'), - source: jQuery(source).attr('id'), - target_ordered_children: target_ordered_children, - source_ordered_children: source_ordered_children - } - }); - }); -}); diff --git a/app/views/my/_block.html.erb b/app/views/my/_block.html.erb deleted file mode 100644 index 2d7c01612e..0000000000 --- a/app/views/my/_block.html.erb +++ /dev/null @@ -1,46 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -
- - <% content_for "#{block_name}-remove-block" do %> -
- <%= link_to '', - { action: "remove_block", block: block_name }, - class: "icon icon-close close-icon my-page--remove-block", - data: { name: block_name, dasherized: block_name.dasherize }, - title: l(:button_remove_widget) - %> -
- <% end %> - -
- <%= render partial: "my/blocks/#{block_name}", locals: { user: user, edit: true, block_name: block_name } %> -
-
diff --git a/app/views/my/_block_container.html.erb b/app/views/my/_block_container.html.erb deleted file mode 100644 index a1461bdb3b..0000000000 --- a/app/views/my/_block_container.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% unless blocks.nil? || blocks.empty? %> - <% blocks.each do |block_name| %> - <% next unless MyController.available_blocks.keys.include? block_name %> - <% if edit %> - <%= render partial: "my/block", locals: { block_name: block_name, user: @user } %> - <% else %> -
- <%= render partial: "my/blocks/#{block_name}", locals: { edit: false, user: @user } %> -
- <% end %> - <% end %> -<% end %> diff --git a/app/views/my/add_block.html.erb b/app/views/my/add_block.html.erb deleted file mode 100644 index 26806015a2..0000000000 --- a/app/views/my/add_block.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<%= render partial: 'block', - locals: { user: @user, - block_name: @block - } %> diff --git a/app/views/my/blocks/_calendar.html.erb b/app/views/my/blocks/_calendar.html.erb deleted file mode 100644 index 9609d7bd20..0000000000 --- a/app/views/my/blocks/_calendar.html.erb +++ /dev/null @@ -1,45 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-calendar') %> - <%=l(:label_calendar)%> -

- -<% if edit %> -
- <%= t('js.editor.macro.embedded_calendar.text') %> -
-<% else %> - -<% end %> diff --git a/app/views/my/blocks/_embedded_work_package_table.html.erb b/app/views/my/blocks/_embedded_work_package_table.html.erb deleted file mode 100644 index e93130a6b2..0000000000 --- a/app/views/my/blocks/_embedded_work_package_table.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if edit %> -
- <%= t('js.editor.macro.embedded_table.text') %> -
-<% else %> - <%= render partial: 'work_packages/me_list_simple', locals: { user_filter: user_filter } %> -<% end %> diff --git a/app/views/my/blocks/_issuesassignedtome.html.erb b/app/views/my/blocks/_issuesassignedtome.html.erb deleted file mode 100644 index 54f4dbdfe6..0000000000 --- a/app/views/my/blocks/_issuesassignedtome.html.erb +++ /dev/null @@ -1,46 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-assigned-to-me') %> - <%=l(:label_assigned_to_me_work_packages)%> -

- -<%= render partial: 'my/blocks/embedded_work_package_table', - locals: { edit: edit, user_filter: :assignee } %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, - work_packages_assigned_to_me_path({format: 'atom', key: User.current.rss_key}), - {title: l(:label_assigned_to_me_work_packages)}) %> -<% end %> diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb deleted file mode 100644 index aa2fc09f2a..0000000000 --- a/app/views/my/blocks/_issuesreportedbyme.html.erb +++ /dev/null @@ -1,46 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-reported-by-me') %> - <%=l(:label_reported_work_packages)%> -

- -<%= render partial: 'my/blocks/embedded_work_package_table', - locals: { edit: edit, user_filter: :author } %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, - work_packages_reported_by_me_path({format: 'atom', key: User.current.rss_key}), - {title: l(:label_reported_work_packages)}) %> -<% end %> diff --git a/app/views/my/blocks/_issueswatched.html.erb b/app/views/my/blocks/_issueswatched.html.erb deleted file mode 100644 index 7dd0a046b4..0000000000 --- a/app/views/my/blocks/_issueswatched.html.erb +++ /dev/null @@ -1,39 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-preview') %> - <%=l(:label_watched_work_packages)%> -

- -<%= render partial: 'my/blocks/embedded_work_package_table', - locals: { edit: edit, user_filter: :watcher } %> diff --git a/app/views/my/blocks/_news.html.erb b/app/views/my/blocks/_news.html.erb deleted file mode 100644 index 256dfd6c46..0000000000 --- a/app/views/my/blocks/_news.html.erb +++ /dev/null @@ -1,63 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> -<% news = News.limit(10) - .order("#{News.table_name}.created_on DESC") - .where("#{News.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})") - .includes(:project, :author) unless @user.projects.empty? %> - -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-news') %> - <%= l(:label_news_latest) %> -

- -<% news = News.latest(count: 3) %> - -<% if news.empty? %> - <%= no_results_box(custom_title: t('news.my_page.no_results_title_text')) %> -<% end %> - -<% unless news.empty? %> - -<% end %> diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb deleted file mode 100644 index 2964e31736..0000000000 --- a/app/views/my/blocks/_timelog.html.erb +++ /dev/null @@ -1,142 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-time') %> - <%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>) -

- -<% -entries = TimeEntry.where(["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today]) - .includes(:activity, :project, { work_package: [:type, :status] }) - .references(:projects) - .order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{::Type.table_name}.position ASC, #{WorkPackage.table_name}.id ASC") -entries_by_day = entries.group_by(&:spent_on) -%> - -
-

<%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(:hours).to_f) %>

-
- -<% if entries.any? %> -
-
- - - - - - - - - - - - - - - - - - - <% entries_by_day.keys.sort.reverse.each do |day| %> - - - - - - - - <% entries_by_day[day].each do |entry| -%> - - - - - - - - <% end -%> - <% end -%> - -
-
-
- - <%= l(:label_activity) %> - -
-
- 		-
-
- - <%= Project.model_name.human %> - -
-
- 		-
-
- - <%= TimeEntry.human_attribute_name(:comments) %> - -
-
- 		-
-
- - <%= TimeEntry.human_attribute_name(:hours) %> - -
-
-
<%= day == Date.today ? l(:label_today).titleize : format_date(day) %><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %>
<%=h entry.activity %><%=h entry.project %> <%= ' - '.html_safe + link_to_work_package(entry.work_package, truncate: 50) if entry.work_package%><%=h entry.comments %><%= html_hours("%.2f" % entry.hours) %> - <% if entry.editable_by?(@user) -%> - <%= link_to icon_wrapper('icon-context icon-edit', ''), - {controller: '/timelog', action: 'edit', id: entry}, - alt: l(:button_edit), - class: 'no-decoration-on-hover', - title: l(:button_edit) %> - <%= link_to icon_wrapper('icon-context icon-delete', ''), - {controller: '/timelog', action: 'destroy', id: entry}, - data: { confirm: l(:text_are_you_sure) }, - class: 'no-decoration-on-hover', - method: :delete, - alt: l(:button_delete), - title: l(:button_delete) %> - <% end -%> -
- -
-
-<% end %> diff --git a/app/views/my/blocks/_workpackagesresponsiblefor.html.erb b/app/views/my/blocks/_workpackagesresponsiblefor.html.erb deleted file mode 100644 index 5b5b4a9bba..0000000000 --- a/app/views/my/blocks/_workpackagesresponsiblefor.html.erb +++ /dev/null @@ -1,45 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> -<% if defined? block_name %> - <%= content_for "#{block_name}-remove-block" %> -<% end %> - -

- <%= op_icon('icon-context icon-assigned-to-me') %> - <%=l(:label_responsible_for_work_packages)%> -

- -<%= render partial: 'my/blocks/embedded_work_package_table', - locals: { edit: edit, user_filter: :responsible } %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, - work_packages_responsible_for_path({format: 'atom', key: User.current.rss_key}), - {title: l(:label_responsible_for_work_packages)}) %> -<% end %> diff --git a/app/views/my/page_layout.html.erb b/app/views/my/page_layout.html.erb deleted file mode 100644 index 8080d9e4f9..0000000000 --- a/app/views/my/page_layout.html.erb +++ /dev/null @@ -1,69 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> -<%= javascript_include_tag 'my_page' %> -<%= include_gon(nonce: content_security_policy_nonce(:script)) %> - -<%= toolbar title: l(:label_my_page) do %> - <%= styled_form_tag({ action: "add_block" }, class: 'my-page--block-form') do %> - <% options = "" - .html_safe - .concat(options_for_select(@block_options)) %> - -
  • - <%= styled_select_tag 'block', options, id: 'block-options',class: '-small' %> -
    • - -
  • - <%= submit_tag l(:button_add), class: 'button' %> -
    • - -
  • - <%= link_to({action: 'page'}, class: 'button') do %> - <%= op_icon('button--icon icon-cancel') %> - <%= l(:button_save_back) %> - <% end %> -
    • - <% end %> -<% end %> - -

    <%=l(:label_visible_elements) %>

    -
    -
    - <%= render partial: 'block_container', locals: { edit: true, blocks: @blocks['top'] } %> -
    -
    - <% %w(left right).each do |position| %> -
    - <%= render partial: 'block_container', locals: { edit: true, blocks: @blocks[position] } %> -
    - <% end %> -
    -
    - -<% html_title(l(:label_my_page)) -%> diff --git a/app/views/work_packages/_me_list_simple.html.erb b/app/views/work_packages/_me_list_simple.html.erb deleted file mode 100644 index ad3d408307..0000000000 --- a/app/views/work_packages/_me_list_simple.html.erb +++ /dev/null @@ -1,46 +0,0 @@ -<%#-- copyright -OpenProject is a project management system. -Copyright (C) 2012-2018 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. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2017 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -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 docs/COPYRIGHT.rdoc for more details. - -++#%> - -<% - query_properties = { - 'columns[]': %w(id project type subject), - filters: - JSON.dump([{ user_filter => { operator: '=', values: ['me'] } }, { status: { operator: 'o', values: []}}]).to_s - } - - configuration = { - actionsColumnEnabled: false, - columnMenuEnabled: false, - contextMenuEnabled: false - } -%> - - - diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index dcb9b4f9bf..a77d305f36 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,14 +8,12 @@ OpenProject::Application.configure do accessibility.js admin_users.js autocompleter.js - calendar/lang/*.js copy_issue_actions.js date-de-DE.js date-en-US.js locales/*.js members_form.js members_select_boxes.js - my_page.js new_user.js project/responsible_attribute.js project/description_handling.js diff --git a/config/locales/en.yml b/config/locales/en.yml index 46a93b2fc5..3a5cfc188b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -736,7 +736,6 @@ en: button_print: "Print" button_quote: "Quote" button_remove: Remove - button_remove_widget: "Remove widget" button_rename: "Rename" button_replace: "Replace" button_reply: "Reply" @@ -1649,7 +1648,6 @@ en: label_keyboard_shortcut_go_preview: "Go to preview the current edit (on edit pages only)" label_keyboard_shortcut_focus_previous_item: "Focus previous list element (on some lists only)" label_keyboard_shortcut_focus_next_item: "Focus next list element (on some lists only)" - label_visible_elements: Visible elements auth_source: using_abstract_auth_source: "Can't use an abstract authentication source."