Skip to content

Commit

Permalink
release: v0.5.4 (#114)
Browse files Browse the repository at this point in the history
* fix: Disable author tooltip (#113)

* test: Add specs for user presenter

* fix: Set has_tooltip to false for user presenter

* revert: "fix: Disable author tooltip (#113)" (#116)

This reverts commit 7639d0a.

* fix: Remove Map from proposals index page

* fix: Remove map

* fix: Allow to configure Rails log level in dev mode

* fix: Ignore missing i18n keys

* fix: Add index.js.erb to fix sorting buttons
  • Loading branch information
Quentinchampenois authored Nov 6, 2024
1 parent 82ed076 commit 0368f0e
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 1 deletion.
31 changes: 31 additions & 0 deletions app/views/decidim/proposals/proposals/index.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<%= render partial: "decidim/shared/component_announcement" %>

<%= render partial: "voting_rules" %>
<div class="row columns">
<div class="title-action">
<h2 id="proposals-count" class="title-action__title section-heading">
<%= render partial: "count" %>
</h2>
<% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
<%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
<%= t(".new_proposal") %>
<%= icon "plus", role: "img", "aria-hidden": true %>
<% end %>
<% end %>

<% if component_settings.collaborative_drafts_enabled? %>
<%= link_to t(".collaborative_drafts_list"), collaborative_drafts_path, class: "title-action__action button small hollow ml-s" %>
<% end %>
</div>
</div>
<div class="row">
<div class="columns mediumlarge-4 large-3">
<%= render partial: "filters_small_view" %>
<div class="card card--secondary show-for-mediumlarge">
<%= render partial: "filters" %>
</div>
</div>
<div id="proposals" class="columns mediumlarge-8 large-9" aria-live="polite">
<%= render partial: "proposals" %>
</div>
</div>
10 changes: 10 additions & 0 deletions app/views/decidim/proposals/proposals/index.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
var $proposals = $('#proposals');
var $proposalsCount = $('#proposals-count');
var $orderFilterInput = $('.order_filter');

$proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
$proposalsCount.html('<%= j(render partial: "count").strip.html_safe %>');
$orderFilterInput.val('<%= order %>');

var $dropdownMenu = $('.dropdown.menu', $proposals);
$dropdownMenu.foundation();
1 change: 1 addition & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@

config.active_job.queue_adapter = :sidekiq
config.action_mailer.perform_deliveries = true
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "debug").to_sym
end
2 changes: 1 addition & 1 deletion config/i18n-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ignore_missing:
- decidim.admin.actions.import
- decidim.budgets_importer.actions.import
- index.confirmed_orders_count

- decidim.proposals.proposals.index.{new_proposal,collaborative_drafts_list}
# Consider these keys used:
ignore_unused:
- faker.*
Expand Down

0 comments on commit 0368f0e

Please sign in to comment.