diff --git a/app/views/custom_actions/edit.html.erb b/app/views/custom_actions/edit.html.erb
index 6c6a563ca8ca..9005be612aaf 100644
--- a/app/views/custom_actions/edit.html.erb
+++ b/app/views/custom_actions/edit.html.erb
@@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details.
render Primer::OpenProject::PageHeader.new do |header|
header.with_title { @custom_action.name }
header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") },
- { href: admin_settings_work_package_tracking_path, text: t(:label_work_package_plural) },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
{ href: custom_actions_path, text: t("custom_actions.plural") },
@custom_action.name ])
end
diff --git a/app/views/custom_actions/index.html.erb b/app/views/custom_actions/index.html.erb
index 7b56c168457a..f391825bb692 100644
--- a/app/views/custom_actions/index.html.erb
+++ b/app/views/custom_actions/index.html.erb
@@ -4,7 +4,7 @@
render Primer::OpenProject::PageHeader.new do |header|
header.with_title { t("custom_actions.plural") }
header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") },
- { href: admin_settings_work_package_tracking_path, text: t(:label_work_package_plural) },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
t("custom_actions.plural") ])
end
%>
diff --git a/app/views/custom_actions/new.html.erb b/app/views/custom_actions/new.html.erb
index f124a55d65bb..50b2cebfa625 100644
--- a/app/views/custom_actions/new.html.erb
+++ b/app/views/custom_actions/new.html.erb
@@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details.
render Primer::OpenProject::PageHeader.new do |header|
header.with_title { t("custom_actions.new") }
header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") },
- { href: admin_settings_work_package_tracking_path, text: t(:label_work_package_plural) },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
{ href: custom_actions_path, text: t("custom_actions.plural") },
t("custom_actions.new") ])
end
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 51868bc9c7ba..6480748f59c5 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -85,7 +85,7 @@ See COPYRIGHT and LICENSE files for more details.
- <% if @custom_field.new_record? || @custom_field.list? || @custom_field.multi_value_possible? %>
+ <% if @custom_field.new_record? || @custom_field.multi_value_possible? %>
>
<%= f.check_box :multi_value,
data: { action: 'admin--custom-fields#checkOnlyOne' } %>
@@ -118,7 +118,7 @@ See COPYRIGHT and LICENSE files for more details.
<% end %>
- <% if @custom_field.new_record? || @custom_field.version? || @custom_field.allow_non_open_versions_possible? %>
+ <% if @custom_field.new_record? || @custom_field.allow_non_open_versions_possible? %>
>
<%= f.check_box :allow_non_open_versions %>
diff --git a/app/views/custom_fields/edit.html.erb b/app/views/custom_fields/edit.html.erb
index ccebc45111d3..3417c07bbfc6 100644
--- a/app/views/custom_fields/edit.html.erb
+++ b/app/views/custom_fields/edit.html.erb
@@ -28,15 +28,8 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<% html_title t(:label_administration), "#{t(:label_edit)} #{CustomField.model_name.human} #{h @custom_field.name}" %>
-<%=
- render(Primer::OpenProject::PageHeader.new(test_selector: "custom-fields--page-header")) do |header|
- header.with_title { @custom_field.name }
- header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
- { href: custom_fields_path, text: t(:label_custom_field_plural) },
- { href: custom_fields_path(tab: @custom_field.type), text: I18n.t(@custom_field.type_name) },
- @custom_field.name])
- end
-%>
+
+<%= render(Admin::CustomFields::EditFormHeaderComponent.new(custom_field: @custom_field, selected: :edit)) %>
<%= error_messages_for 'custom_field' %>
diff --git a/app/views/custom_styles/_branding.html.erb b/app/views/custom_styles/_branding.html.erb
new file mode 100644
index 000000000000..6225aa0e874c
--- /dev/null
+++ b/app/views/custom_styles/_branding.html.erb
@@ -0,0 +1,119 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+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-2013 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 COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
+<%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
+<%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
diff --git a/app/views/custom_styles/_interface.html.erb b/app/views/custom_styles/_interface.html.erb
new file mode 100644
index 000000000000..8c9098a53778
--- /dev/null
+++ b/app/views/custom_styles/_interface.html.erb
@@ -0,0 +1,46 @@
+<%= form_tag update_design_colors_path, method: :post, class: "form" do %>
+
+ <%# Fill in the computed css variables in the inputs as their defaults %>
+ <%= nonced_javascript_tag do %>
+ var computedStyle = getComputedStyle(document.documentElement);
+
+ document
+ .querySelectorAll('.design-color--variable-input')
+ .forEach(function(el) {
+ if (!el.value || el.value === '') {
+ el.placeholder = computedStyle.getPropertyValue('--' + el.dataset.variableName).trim();
+ }
+ });
+ <% end %>
+<% end %>
diff --git a/app/views/custom_styles/_pdf_export_styles.html.erb b/app/views/custom_styles/_pdf_export_styles.html.erb
new file mode 100644
index 000000000000..f81c03ff0f45
--- /dev/null
+++ b/app/views/custom_styles/_pdf_export_styles.html.erb
@@ -0,0 +1,122 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+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-2013 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 COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
+<%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
+<%= form_tag update_custom_style_export_cover_text_color_path, html: { multipart: true, class: "form -vertical" } do |f| %>
+
+<% end %>
diff --git a/app/views/custom_styles/show.html.erb b/app/views/custom_styles/show.html.erb
index eec81989d040..633b5a612d45 100644
--- a/app/views/custom_styles/show.html.erb
+++ b/app/views/custom_styles/show.html.erb
@@ -27,18 +27,9 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
-<% html_title t(:label_administration), t(:label_custom_style) %>
-
-<%=
- render(Primer::OpenProject::PageHeader.new) do |header|
- header.with_title { t(:label_custom_style) }
- header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
- t(:label_custom_style)])
- end
-%>
+<%= render(Admin::DesignHeaderComponent.new(tabs: design_tabs)) %>
<%= error_messages_for 'custom_style' %>
-
<%= form_tag update_design_themes_path, method: :post, class: "form" do %>