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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Update Homescreen Blocks
Alexander Brandon Colesb9529101a420
diff --git a/app/views/homescreen/blocks/_administration.html.erb b/app/views/homescreen/blocks/_administration.html.erbindex 4d6eefbf5f8..68fa55a3261 100644--- a/app/views/homescreen/blocks/_administration.html.erb+++ b/app/views/homescreen/blocks/_administration.html.erb@@ -1,6 +1,4 @@-<%= render "homescreen/blocks/header", title: t(:label_administration) %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t(:label_administration), classes: "administration") do %><ul class="widget-box--arrow-links"><li><%= link_to t(:label_project_plural), projects_path,@@ -56,4 +54,4 @@class: "security-badge--help-icon icon-context icon-help1",target: "_blank", rel: "noopener" %><% end if display_security_badge_graphic? %>-</div>+<% end %>diff --git a/app/views/homescreen/blocks/_community.html.erb b/app/views/homescreen/blocks/_community.html.erbindex d0b385c9c07..1e26077a0e7 100644--- a/app/views/homescreen/blocks/_community.html.erb+++ b/app/views/homescreen/blocks/_community.html.erb@@ -1,6 +1,4 @@-<%= render "homescreen/blocks/header", title: t("homescreen.blocks.community") %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t("homescreen.blocks.community"), classes: "community") do %><ul class="widget-box--arrow-links"><li><%= static_link_to :user_guides %>@@ -89,4 +87,4 @@<%= static_link_to :api_docs %></li></ul>-</div>+<% end %>diff --git a/app/views/homescreen/blocks/_header.html.erb b/app/views/homescreen/blocks/_header.html.erbdeleted file mode 100644index 716f30c2d2f..00000000000--- a/app/views/homescreen/blocks/_header.html.erb+++ /dev/null@@ -1,5 +0,0 @@-<div class="op-widget-box--header" data-test-selector="op-widget-box--header">- <div class="op-widget-box--header-title title-container">- <h3 class="editable-toolbar-title--fixed"><%= title %></h3>- </div>-</div>diff --git a/app/views/homescreen/blocks/_my_account.html.erb b/app/views/homescreen/blocks/_my_account.html.erbindex 20dc3c0f611..7c5f141364d 100644--- a/app/views/homescreen/blocks/_my_account.html.erb+++ b/app/views/homescreen/blocks/_my_account.html.erb@@ -1,6 +1,4 @@-<%= render "homescreen/blocks/header", title: t("label_my_account") %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t("label_my_account"), classes: "my_account") do %><ul class="widget-box--arrow-links"><li><%= link_to t(:label_profile), my_account_path, title: t(:label_profile) %>@@ -13,4 +11,4 @@<%= link_to t(:button_change_password), my_password_path, title: t(:button_change_password) %></li></ul>-</div>+ <% end %>diff --git a/app/views/homescreen/blocks/_new_features.html.erb b/app/views/homescreen/blocks/_new_features.html.erbindex f691c472c11..b7b3a36bbdc 100644--- a/app/views/homescreen/blocks/_new_features.html.erb+++ b/app/views/homescreen/blocks/_new_features.html.erb@@ -1,5 +1,3 @@-<%= render "homescreen/blocks/header", title: t(:label_new_features) %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t(:label_new_features), classes: "new_features") do %><%= render Homescreen::NewFeaturesComponent.new %>-</div>+<% end %>diff --git a/app/views/homescreen/blocks/_news.html.erb b/app/views/homescreen/blocks/_news.html.erbindex 1e7e57a7101..c50d1a30dc4 100644--- a/app/views/homescreen/blocks/_news.html.erb+++ b/app/views/homescreen/blocks/_news.html.erb@@ -1,6 +1,4 @@-<%= render "homescreen/blocks/header", title: t(:label_news_latest) %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t(:label_news_latest), classes: "news") do %><% unless @news.empty? %><ul class="widget-box--arrow-links"><% @news.each do |news| %>@@ -16,4 +14,4 @@<% end %></ul><% end %>-</div>+<% end %>diff --git a/app/views/homescreen/blocks/_projects.html.erb b/app/views/homescreen/blocks/_projects.html.erbindex 52f0e92b869..708ac1f84da 100644--- a/app/views/homescreen/blocks/_projects.html.erb+++ b/app/views/homescreen/blocks/_projects.html.erb@@ -1,6 +1,4 @@-<%= render "homescreen/blocks/header", title: t(:label_project_plural) %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: t(:label_project_plural), classes: "projects") do %><% if @favorite_projects.any? %><p class="widget-box--additional-info"><%= t("projects.lists.favored") %></p><ul class="widget-box--arrow-links">@@ -56,4 +54,4 @@title: t(:label_project_view_all) %><% end %></div>-</div>+<% end %>diff --git a/app/views/homescreen/blocks/_users.html.erb b/app/views/homescreen/blocks/_users.html.erbindex 3f96a8220bc..098e6c083b8 100644--- a/app/views/homescreen/blocks/_users.html.erb+++ b/app/views/homescreen/blocks/_users.html.erb@@ -1,25 +1,23 @@-<%= render "homescreen/blocks/header", title: t(:label_user_plural) %>+<%= render Grids::WidgetBoxComponent.new(title: t(:label_user_plural), classes: "users") do %>+ <p class="widget-box--additional-info"><%= t("homescreen.additional.users") %></p>-<div class="op-widget-box--body">- <p class="widget-box--additional-info"><%= t("homescreen.additional.users") %></p>-- <% unless @newest_users.empty? %>- <ul class="widget-box--arrow-links">- <% @newest_users.each do |user| %>- <li>- <%= link_to_user user %>- <small>(<%= format_date(user.created_at) %>)</small>- </li>- <% end %>- </ul>+ <% unless @newest_users.empty? %>+ <ul class="widget-box--arrow-links">+ <% @newest_users.each do |user| %>+ <li>+ <%= link_to_user user %>+ <small>(<%= format_date(user.created_at) %>)</small>+ </li><% end %>+ </ul>+ <% end %>- <div class="widget-box--buttons">- <% if User.current.admin? %>- <%= link_to new_user_path, class: "button -primary" do %>- <%= op_icon("button--icon icon-add") %>- <span class="button--text"><%= t(:label_invite_user) %></span>- <% end %>+ <div class="widget-box--buttons">+ <% if User.current.admin? %>+ <%= link_to new_user_path, class: "button -primary" do %>+ <%= op_icon("button--icon icon-add") %>+ <span class="button--text"><%= t(:label_invite_user) %></span><% end %>- </div>-</div>+ <% end %>+ </div>+<% end %>diff --git a/app/views/homescreen/blocks/_welcome.html.erb b/app/views/homescreen/blocks/_welcome.html.erbindex 80ab5fd1a39..cdd0ac788f7 100644--- a/app/views/homescreen/blocks/_welcome.html.erb+++ b/app/views/homescreen/blocks/_welcome.html.erb@@ -1,7 +1,5 @@-<%= render "homescreen/blocks/header", title: Setting.welcome_title.presence || organization_name %>--<div class="op-widget-box--body">+<%= render Grids::WidgetBoxComponent.new(title: Setting.welcome_title.presence || organization_name, classes: "welcome") do %><div class="wiki op-uc-container"><%= format_text(Setting.welcome_text, headings: false) %></div>-</div>+<% end %>diff --git a/app/views/homescreen/index.html.erb b/app/views/homescreen/index.html.erbindex 90bfc0324f6..f89cdeaa538 100644--- a/app/views/homescreen/index.html.erb+++ b/app/views/homescreen/index.html.erb@@ -39,9 +39,7 @@ See COPYRIGHT and LICENSE files for more details.<section class="widget-boxes -flex"><% @homescreen[:blocks].each do |block| %><% if block[:if].nil? || instance_eval(&block[:if]) %>- <div class="widget-box <%= block[:partial] %>">- <%= render partial: "homescreen/blocks/#{block[:partial]}", locals: block[:locals] || {} %>- </div>+ <%= render partial: "homescreen/blocks/#{block[:partial]}", locals: block[:locals] || {} %><% end %><% end %></section>