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
Use new "news" widget on the homescreen
Henriette Dargea76a8e68ea49
diff --git a/app/components/homescreen/blocks/news.html.erb b/app/components/homescreen/blocks/news.html.erbdeleted file mode 100644index 46faa9abfa0..00000000000--- a/app/components/homescreen/blocks/news.html.erb+++ /dev/null@@ -1,17 +0,0 @@-<%= widget_wrapper do %>- <% unless @news.empty? %>- <ul class="widget-box--arrow-links">- <% @news.each do |news| %>- <li class="widget-box--arrow-multiline">- <%= avatar(news.author, class: "widget-box--avatar news-author-avatar hidden-for-mobile") %>- <div class="widget-box--project">- <%= safe_join([link_to_project(news.project), ": "]) %>- <%= link_to h(news.title), news_path(news) %>- </div>- <div class="widget-box--author news-author"><%= authoring_at format_date(news.created_at), news.author %></div>- <p class="widget-box--additional-info"><%= news.summary %></p>- </li>- <% end %>- </ul>- <% end %>-<% end %>diff --git a/app/components/homescreen/blocks/news.rb b/app/components/homescreen/blocks/news.rbindex cd8ebd988d7..d3935954f93 100644--- a/app/components/homescreen/blocks/news.rb+++ b/app/components/homescreen/blocks/news.rb@@ -31,21 +31,8 @@module Homescreenmodule Blocksclass News < Grids::WidgetComponent- include AvatarHelper- include ApplicationHelper-- def initialize(*)- super-- @news = ::News.latest(count: 3)- end-- def title- I18n.t(:label_news_latest)- end-- def render?- @news.any?+ def call+ render(Overviews::Widgets::NewsComponent.new(news_limit: 3))endendenddiff --git a/modules/overviews/app/components/_index.sass b/modules/overviews/app/components/_index.sassindex 6fef6c9c4ae..e6b391477cd 100644--- a/modules/overviews/app/components/_index.sass+++ b/modules/overviews/app/components/_index.sass@@ -1,3 +1,4 @@@import "./overviews/project_custom_fields/item_component.sass"@import "./overviews/project_phases/item_component.sass"@import "./overviews/overview_grid_component.sass"+@import "./overviews/widgets/news_component/item_component.sass"diff --git a/modules/overviews/app/components/overviews/widgets/news_component.rb b/modules/overviews/app/components/overviews/widgets/news_component.rbindex a78f97513cb..abc0ecf4d9d 100644--- a/modules/overviews/app/components/overviews/widgets/news_component.rb+++ b/modules/overviews/app/components/overviews/widgets/news_component.rb@@ -31,11 +31,9 @@module Overviewsmodule Widgetsclass NewsComponent < Grids::WidgetComponent- NEWS_LIMIT = 5-param :project, optional: true- def initialize(*)+ def initialize(*, news_limit: 5)super@news =@@ -48,7 +46,7 @@ module Overviews.includes(:project)end- @newest = @news.limit(NEWS_LIMIT).to_a+ @newest = @news.limit(news_limit).to_aenddef titlediff --git a/modules/overviews/app/components/overviews/widgets/news_component/item_component.html.erb b/modules/overviews/app/components/overviews/widgets/news_component/item_component.html.erbindex fa9055dbe23..5ef5a51cd40 100644--- a/modules/overviews/app/components/overviews/widgets/news_component/item_component.html.erb+++ b/modules/overviews/app/components/overviews/widgets/news_component/item_component.html.erb@@ -28,16 +28,17 @@ See COPYRIGHT and LICENSE files for more details.++#%><%=- render(Primer::Box.new) do+ render(Primer::Box.new(classes: "news-widget-item")) docomponent_collection do |body|body.with_component(- flex_layout do |layout|+ flex_layout(flex_wrap: :wrap) do |layout|unless projectlayout.with_column dorender(Primer::Beta::Link.new(font_weight: :bold,- scheme: :secondary,+ mr: 1,+ classes: "news-widget-item--project",href: project_path(item.project))) { "#{item.project.name}:" }diff --git a/modules/overviews/app/components/overviews/widgets/news_component/item_component.sass b/modules/overviews/app/components/overviews/widgets/news_component/item_component.sassnew file mode 100644index 00000000000..cd2211040da--- /dev/null+++ b/modules/overviews/app/components/overviews/widgets/news_component/item_component.sass@@ -0,0 +1,3 @@+.news-widget-item+ &--project+ white-space: nowrap