Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Move Overviews subheader to within main column

Alexander Brandon Colescad7ae7e695e
diff --git a/modules/overviews/app/components/overviews/show_component.html.erb b/modules/overviews/app/components/overviews/show_component.html.erb
index 571fa3d1be3..bc3a104fb61 100644
--- a/modules/overviews/app/components/overviews/show_component.html.erb
+++ b/modules/overviews/app/components/overviews/show_component.html.erb
@@ -27,25 +27,6 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
-<%=
- if allowed_to_manage?
- render(Primer::OpenProject::SubHeader.new) do |subheader|
- subheader.with_action_button(
- scheme: :primary,
- leading_icon: :plus,
- label: t(:label_widget_new),
- data: {
- controller: "overview--add-widgets",
- action: "click->overview--add-widgets#addWidget"
- },
- test_selector: "overview--add-widgets-button"
- ) do
- t(:label_widget)
- end
- end
- end
-%>
-
<%=
render(OpPrimer::ConditionalLayoutComponent.new(condition: sidebar_enabled?)) do |component|
component.with_sidebar(width: :narrow, col_placement: :end) do
@@ -68,6 +49,25 @@ See COPYRIGHT and LICENSE files for more details.
end
end
- angular_component_tag "opce-overview"
+ if allowed_to_manage?
+ concat(
+ render(Primer::OpenProject::SubHeader.new) do |subheader|
+ subheader.with_action_button(
+ scheme: :primary,
+ leading_icon: :plus,
+ label: t(:label_widget_new),
+ data: {
+ controller: "overview--add-widgets",
+ action: "click->overview--add-widgets#addWidget"
+ },
+ test_selector: "overview--add-widgets-button"
+ ) do
+ t(:label_widget)
+ end
+ end
+ )
+ end
+
+ concat(angular_component_tag("opce-overview"))
end
%>