diff --git a/app/services/concerns/decidim/privacy/order_reminder_generator_extensions.rb b/app/services/concerns/decidim/privacy/order_reminder_generator_extensions.rb index da1da03..34f1495 100644 --- a/app/services/concerns/decidim/privacy/order_reminder_generator_extensions.rb +++ b/app/services/concerns/decidim/privacy/order_reminder_generator_extensions.rb @@ -10,12 +10,12 @@ module OrderReminderGeneratorExtensions # Overridden in order to include all users, not only published accounts. def send_reminders(component) - budgets = Decidim::Budgets::Budget.where(component: component) + budgets = Decidim::Budgets::Budget.where(component:) pending_orders = Decidim::Budgets::Order.where(budget: budgets, checked_out_at: nil) users = Decidim::User.entire_collection.where(id: pending_orders.pluck(:decidim_user_id).uniq) users.each do |user| - reminder = Decidim::Reminder.find_or_create_by(user: user, component: component) - users_pending_orders = pending_orders.where(user: user) + reminder = Decidim::Reminder.find_or_create_by(user:, component:) + users_pending_orders = pending_orders.where(user:) update_reminder_records(reminder, users_pending_orders) if reminder.records.active.any? Decidim::Budgets::SendVoteReminderJob.perform_later(reminder) diff --git a/app/views/decidim/initiatives/initiatives/_author.html.erb b/app/views/decidim/initiatives/initiatives/_author.html.erb deleted file mode 100644 index 424b583..0000000 --- a/app/views/decidim/initiatives/initiatives/_author.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -
-
-
- - <%= image_tag present(initiative.author).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(initiative.author_name)) %> - - - <% if initiative.author&.deleted? %> - - <%= t(".deleted") %> - - <% else %> - <%= decidim_sanitize(initiative.author_name) %> - <% end %> - -
- - <% initiative.committee_members.excluding_author.approved.each do |m| %> - <% unless m.user&.deleted? %> -
- - <%= image_tag present(m.user).avatar_url %> - - - <%= decidim_sanitize(m.user&.name) %> - -
- <% end %> - <% end %> - -
- <%= l initiative.published_at || initiative.created_at, format: "%d/%m/%Y" %> -
-
-
diff --git a/app/views/decidim/initiatives/initiatives/_committee_members.html.erb b/app/views/decidim/initiatives/initiatives/_committee_members.html.erb index e2589e8..2530a83 100644 --- a/app/views/decidim/initiatives/initiatives/_committee_members.html.erb +++ b/app/views/decidim/initiatives/initiatives/_committee_members.html.erb @@ -1,73 +1,56 @@ -
- <%= t ".title" %> +
+ <%= t ".link" %> + + <%= t ".invite_to_committee_help" %> + -
-
- <%= t ".invite_to_committee_help" %> -
- -
-
-
-
-
-
- <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %> -
-
-
-
- <%= icon_link_to "clipboard", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %> -
-
-
+
+ + <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %> + +
+ +
-
-
- - - - - - - - - <% if current_initiative.committee_members.empty? %> - - - - - <% end %> + - <% current_initiative.committee_members.each do |request| %> - - - - - <% end %> - -
<%= t ".title" %>
<%= t ".no_members_yet" %>
- <%= link_to request.user&.name, "mailto:#{request.user&.email}" %> - - <% if allowed_to? :approve, :initiative_committee_member, initiative: current_initiative, request: request %> - <%= icon_link_to "check", - approve_initiative_committee_request_path(current_initiative, request), - t(".approve"), - class: "action-icon--check" %> +
+ <%= t ".title" %> + <% if current_initiative.committee_members.empty? %> + <%= t ".no_members_yet" %> + <% end %> + <% current_initiative.committee_members.each do |request| %> +
+
+ <%= card_for request.user %> + <% if allowed_to? :approve, :initiative_committee_member, initiative: current_initiative, request: request %> + <%= link_to( + approve_initiative_committee_request_path(current_initiative, request), + data: { confirm: t(".confirm_approve") }, + class: "button button__sm button__transparent-secondary" + ) do %> + <%= t(".approve") %> + <%= icon "check-line" %> <% end %> - - <% if allowed_to? :revoke, :initiative_committee_member, initiative: current_initiative, request: request %> - <%= icon_link_to "circle-x", - revoke_initiative_committee_request_path(current_initiative, request), - t(".revoke"), - class: "action-icon--remove", - method: :delete, - data: { confirm: t(".confirm_revoke") } %> + <% end %> + <% if allowed_to? :revoke, :initiative_committee_member, initiative: current_initiative, request: request %> + <%= link_to( + revoke_initiative_committee_request_path(current_initiative, request), + method: :delete, + data: { confirm: t(".confirm_revoke") }, + class: "button button__sm button__transparent-secondary" + ) do %> + <%= t(".revoke") %> + <%= icon "forbid-line" %> <% end %> -
+ <% end %> +
-
-
+ <% end %> + <%= append_javascript_pack_tag "decidim_initiatives_admin" %> diff --git a/app/views/decidim/proposals/proposals/_linked_proposals.html.erb b/app/views/decidim/proposals/proposals/_linked_proposals.html.erb deleted file mode 100644 index b764ad4..0000000 --- a/app/views/decidim/proposals/proposals/_linked_proposals.html.erb +++ /dev/null @@ -1,37 +0,0 @@ -
- <% resources.each do |proposal| %> -
-
- <%= link_to resource_locator(proposal).path do %> - <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %> - <% end %> -
- <%= link_to resource_locator(proposal).path, class: "card__link" do %> -
<%== decidim_html_escape(present(proposal).title) %>
- <% end %> - <% present(proposal) do |proposal| %> - <% if proposal.author %> -
- - <%= image_tag proposal.author.avatar_url %> - - - <%= proposal.author.name %> - <%= proposal.author.nickname %> - -
- <% end %> - <% end %> -
-
- <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? && - proposal.component.current_settings.votes_enabled? %> -
- - <%= proposal.votes.size %> - <%= t(".proposal_votes", count: proposal.votes.size) %> -
- <% end %> -
- <% end %> -
diff --git a/app/views/layouts/decidim/footer/_main_links.html.erb b/app/views/layouts/decidim/footer/_main_links.html.erb index ea781b5..d49fd9f 100644 --- a/app/views/layouts/decidim/footer/_main_links.html.erb +++ b/app/views/layouts/decidim/footer/_main_links.html.erb @@ -1,20 +1,13 @@ <%= footer_menu.render %> - - + + + +<%= cell("decidim/footer_topics", nil) %> diff --git a/app/views/layouts/decidim/user_profile.html.erb b/app/views/layouts/decidim/user_profile.html.erb deleted file mode 100644 index 4be0ddc..0000000 --- a/app/views/layouts/decidim/user_profile.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% subtitle = content_for(:subtitle) %> - -<%= render "layouts/decidim/application" do %> - <% if controller_name == "privacy_settings" && current_user.public? || controller_name == "account" && current_user.public? %> -
-
-
- <%= icon "information-line", class: "icon--big margin-right-1 private-icon", role: "img", "aria-hidden": true %> -
<%= t(".public") %>
-
-
-
-
-

<%= t(".message") %>

- <%= link_to request.base_url + decidim.profile_path(current_user.nickname), decidim.profile_path(current_user.nickname) %> -
-
-
- <% end %> - <%= yield %> -<% end %>