manuelcillero/suitepro
manuelcillero/suitepro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actualiza el plugin Additionals a 3.0.2-master

Browse source
This commit is contained in:
Manuel Cillero 2021-03-20 11:12:56 +01:00
parent 3b6a41320c
commit cfa0d58b18
164 changed files with 2027 additions and 58190 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/additionals/app/helpers/dashboards_helper.rb
View file

@ -86,10 +86,10 @@ module DashboardsHelper
tag.div class: 'active-dashboards' do
out = [tag.h3(l(:label_active_dashboard)),
tag.ul do
concat tag.ul "#{l :field_name}: #{dashboard.name}"
concat tag.ul safe_join([l(:field_author), link_to_user(dashboard.author)], ': ')
concat tag.ul "#{l :field_created_on}: #{format_time dashboard.created_at}"
concat tag.ul "#{l :field_updated_on}: #{format_time dashboard.updated_at}"
concat tag.li "#{l :field_name}: #{dashboard.name}"
concat tag.li safe_join([l(:field_author), link_to_user(dashboard.author)], ': ')
concat tag.li "#{l :field_created_on}: #{format_time dashboard.created_at}"
concat tag.li "#{l :field_updated_on}: #{format_time dashboard.updated_at}"
end]
if dashboard.description.present?
@ -105,7 +105,7 @@ module DashboardsHelper
return '' unless dashboards.any?
tag.h3(title, class: 'dashboards') +
tag.ul do
tag.ul(class: 'dashboards') do
dashboards.each do |dashboard|
selected = dashboard.id == if params[:dashboard_id].present?
params[:dashboard_id].to_i
@ -115,19 +115,24 @@ module DashboardsHelper
css = 'dashboard'
css << ' selected' if selected
li_class = nil
link = [dashboard_link(dashboard, project, class: css)]
if dashboard.system_default?
link << if dashboard.project_id.nil?
font_awesome_icon('fas_cube',
li_class = 'global'
font_awesome_icon 'fas_cube',
title: l(:field_system_default),
class: 'dashboard-system-default global')
class: "dashboard-system-default #{li_class}"
else
font_awesome_icon('fas_cube',
li_class = 'project'
font_awesome_icon 'fas_cube',
title: l(:field_project_system_default),
class: 'dashboard-system-default project')
class: "dashboard-system-default #{li_class}"
end
end
concat tag.li safe_join(link)
concat tag.li safe_join(link), class: li_class
end
end
end
@ -325,7 +330,7 @@ module DashboardsHelper
max_entries = settings[:max_entries] || DashboardContent::DEFAULT_MAX_ENTRIES
news = if dashboard.content_project.nil?
News.latest User.current
News.latest User.current, max_entries
else
dashboard.content_project
.news
@ -378,7 +383,7 @@ module DashboardsHelper
max_entries = max_entries.present? ? max_entries.to_i : 10
begin
URI.open(url) do |rss_feed|
URI.parse(url).open do |rss_feed|
rss = RSS::Parser.parse(rss_feed)
rss.items.each do |item|
cnt += 1