decidim-initiatives 0.9.1 → 0.11.0.pre1

data/app/views/decidim/initiatives/initiatives/_filters_small_view.html.erb

@@ -1,18 +1,18 @@
 <div class="filters-controls hide-for-mediumlarge">
   <button data-open="filter-box" class="filters-controls__trigger">
-    <%= t '.filter' %>
-    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
 <div class="reveal" id="filter-box" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t '.filter_by' %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t('.close_modal') %>" type="button">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="filters">
-    <%= render partial: 'filters' %>
+    <%= render partial: "filters" %>
   </div>
 </div>

data/app/views/decidim/initiatives/initiatives/_index_header.html.erb

@@ -1,6 +1,6 @@
 <div class="row collapse">
   <h2 id="initiatives-count" class="title-action__title section-heading">
-    <%= render partial: 'count' %>
+    <%= render partial: "count" %>
   </h2>
   <% if can? :create, Decidim::Initiative %>
     <%= action_authorized_link_to :create, create_initiative_path(:select_initiative_type), class: "title-action__action button small hollow" do %>

data/app/views/decidim/initiatives/initiatives/_initiative_badge.html.erb

@@ -2,4 +2,4 @@
   <span class="<%= state_badge_css_class(initiative) %> label initiative-status">
     <%= humanize_state initiative %>
   </span>
-<% end %>
+<% end %>

data/app/views/decidim/initiatives/initiatives/_initiatives.html.erb

@@ -1,10 +1,10 @@
 <div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
   <div class="column">
-    <%= order_selector available_orders, i18n_scope: 'decidim.initiatives.initiatives.orders' %>
+    <%= order_selector available_orders, i18n_scope: "decidim.initiatives.initiatives.orders" %>
   </div>
 
   <div class="column">
-    <%= render partial: 'decidim/shared/results_per_page' %>
+    <%= render partial: "decidim/shared/results_per_page" %>
   </div>
 </div>
 

data/app/views/decidim/initiatives/initiatives/_result.html.erb

@@ -1,8 +1,8 @@
 <% if initiative.accepted? && initiative.answered? && translated_attribute(initiative.answer).present? %>
-  <br>
+  <br />
   <div class="row column">
     <div class="callout success">
-      <h5><%= t('.initiative_accepted_reason') %>:</h5>
+      <h5><%= t(".initiative_accepted_reason") %>:</h5>
       <p>
         <% if initiative.answer_url %>
           <a href="<%= initiative.answer_url %>" target="_blank">
@@ -17,10 +17,10 @@
 <% end %>
 
 <% if initiative.rejected? %>
-  <br>
+  <br />
   <div class="row column">
     <div class="callout warning">
-      <h5><%= t('.initiative_rejected_reason') %></h5>
+      <h5><%= t(".initiative_rejected_reason") %></h5>
     </div>
   </div>
 <% end %>

data/app/views/decidim/initiatives/initiatives/_statistics.html.erb

@@ -1,21 +1,21 @@
 <div class="card extra definition-data initiative-statistics">
   <div class="definition-data__item">
-    <span class="definition-data__title"><%=t '.supports_count_title' %></span>
+    <span class="definition-data__title"><%= t ".supports_count_title" %></span>
     <%= stats.supports_count %>
   </div>
 
   <div class="definition-data__item">
-    <span class="definition-data__title"><%=t '.comments_count_title' %></span>
+    <span class="definition-data__title"><%= t ".comments_count_title" %></span>
     <%= stats.comments_count %>
   </div>
 
   <div class="definition-data__item">
-    <span class="definition-data__title"><%=t '.meetings_count_title' %></span>
+    <span class="definition-data__title"><%= t ".meetings_count_title" %></span>
     <%= stats.meetings_count %>
   </div>
 
   <div class="definition-data__item">
-    <span class="definition-data__title"><%=t '.assistants_count_title' %></span>
+    <span class="definition-data__title"><%= t ".assistants_count_title" %></span>
     <%= stats.assistants_count %>
   </div>
-</div>
+</div>

data/app/views/decidim/initiatives/initiatives/_supports.html.erb

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="columns large-12">
       <div class="section committee">
-        <h4 class="section-heading"><%= t('.title') %></h4>
+        <h4 class="section-heading"><%= t(".title") %></h4>
       </div>
     </div>
 

data/app/views/decidim/initiatives/initiatives/_supports_count.html.erb

@@ -1,7 +1,6 @@
 <div id="initiative-<%= initiative.id %>-supports-count" class="card__support__data">
   <% unless initiative.supports_count.zero? %>
     <span class="card__support__number"><%= initiative.supports_count %></span>
-    <span><%= t('.count', count: initiative.supports_count) %></span>
+    <span><%= t(".count", count: initiative.supports_count) %></span>
   <% end %>
 </div>
-

data/app/views/decidim/initiatives/initiatives/_tags.html.erb

@@ -1,4 +1,4 @@
-<ul class="tags tags--initiative" >
+<ul class="tags tags--initiative">
   <li><%= link_to translated_attribute(resource.type.title), initiatives_path(filter: { type: [resource.type.id] }) %></li>
   <li><%= link_to translated_attribute(resource.scope.name), initiatives_path(filter: { scope_id: [resource.scope.id] }) %></li>
-</ul>
+</ul>

data/app/views/decidim/initiatives/initiatives/_vote_button.html.erb

@@ -4,7 +4,7 @@
                                     initiative_initiative_vote_path(initiative_slug: initiative.slug),
                                     remote: true,
                                     data: { disable: true },
-                                    class: 'card__button button expanded button--sc' %>
+                                    class: "card__button button expanded button--sc" %>
 <% end %>
 
 <% if can? :unvote, initiative %>
@@ -14,5 +14,5 @@
                                     method: :delete,
                                     remote: true,
                                     data: { disable: true },
-                                    class: 'card__button button expanded button--sc success' %>
-<% end %>
+                                    class: "card__button button expanded button--sc success" %>
+<% end %>

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -1,7 +1,7 @@
 <% if current_user && current_user.user_groups.verified.any? %>
   <button id="select-identity-button"
           class="card__button button expanded button--sc">
-    <%= t('.vote') %>
+    <%= t(".vote") %>
   </button>
 
   <div class="reveal"
@@ -19,8 +19,8 @@
 
 <% if cannot?(:vote, initiative) && cannot?(:unvote, initiative) %>
   <button class='card__button button expanded button--sc disabled' disabled>
-    <%= t('.votes_blocked') %>
+    <%= t(".votes_blocked") %>
   </button>
 <% end %>
 
-<%= javascript_include_tag 'decidim/initiatives/identity_selector_dialog' %>
+<%= javascript_include_tag "decidim/initiatives/identity_selector_dialog" %>

data/app/views/decidim/initiatives/initiatives/_votes_count.html.erb

@@ -4,9 +4,9 @@
         <%= initiative.supports_count %>
     </span>
     <span class="extra__suport-text">
-      <%= t('.count', count: initiative.supports_count) %>
+      <%= t(".count", count: initiative.supports_count) %>
     </span>
 
     <%= popularity_tag initiative %>
   </div>
-<% end %>
+<% end %>

data/app/views/decidim/initiatives/initiatives/index.html.erb

@@ -1,24 +1,24 @@
-<% provide :meta_title, t('initiatives.index.title', scope: 'decidim') %>
+<% provide :meta_title, t("initiatives.index.title", scope: "decidim") %>
 <main class="wrapper">
   <div class="row columns">
     <div class="title-action">
-      <%= render partial: 'index_header' %>
+      <%= render partial: "index_header" %>
     </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 class="card card--secondary show-for-mediumlarge">
+        <%= render partial: "filters" %>
       </div>
     </div>
     <div id="initiatives" class="columns mediumlarge-8 large-9">
-      <%= render partial: 'initiatives' %>
+      <%= render partial: "initiatives" %>
     </div>
   </div>
 </main>
 
-<%= javascript_include_tag 'decidim/filters' %>
-<%= javascript_include_tag 'decidim/orders' %>
-<%= stylesheet_link_tag 'decidim/initiatives/application' %>
+<%= javascript_include_tag "decidim/filters" %>
+<%= javascript_include_tag "decidim/orders" %>
+<%= stylesheet_link_tag "decidim/initiatives/application" %>

data/app/views/decidim/initiatives/initiatives/index.js.erb

@@ -2,8 +2,8 @@ var $initiatives = $('#initiatives');
 var $initiativesCount = $('#initiatives-count');
 var $orderFilterInput = $('.order_filter');
 
-$initiatives.html('<%= j(render partial: 'initiatives') %>');
-$initiativesCount.html('<%= j(render partial: 'count') %>');
+$initiatives.html('<%= j(render partial: "initiatives") %>');
+$initiativesCount.html('<%= j(render partial: "count") %>');
 $orderFilterInput.val('<%= order %>');
 
 var $dropdownMenu = $('.dropdown.menu', $initiatives);

data/app/views/decidim/initiatives/initiatives/show.html.erb

@@ -1,20 +1,20 @@
 <% add_decidim_meta_tags({
   image_url: current_initiative.type.banner_image.url,
-  description: partially_translated_attribute(current_initiative.description),
-  title: partially_translated_attribute(current_initiative.title),
+  description: translated_attribute(current_initiative.description),
+  title: translated_attribute(current_initiative.title),
   url: initiative_url(current_initiative.id),
   twitter_handler: current_organization.twitter_handler
 }) %>
 
-<% add_decidim_page_title(partially_translated_attribute(current_initiative.title)) %>
+<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
 <% provide :meta_image_url, current_initiative.type.banner_image.url %>
 <div class="row">
   <% unless current_initiative.online? %>
     <div class="column">
       <div class="callout secondary">
         <p>
-          <%=t '.any_vote_method' if current_initiative.any? %>
-          <%=t '.offline_method' if current_initiative.offline? %>
+          <%= t ".any_vote_method" if current_initiative.any? %>
+          <%= t ".offline_method" if current_initiative.offline? %>
         </p>
       </div>
     </div>
@@ -24,51 +24,51 @@
     <div class="card extra definition-data">
       <div class="definition-data__item vote-block">
         <div id="initiative-<%= current_initiative.id %>-votes-count">
-          <%= render partial: 'votes_count', locals: { initiative: current_initiative } %>
+          <%= render partial: "votes_count", locals: { initiative: current_initiative } %>
         </div>
         <% if current_initiative.votes_enabled? %>
           <div id="initiative-<%= current_initiative.id %>-vote-cabin">
-            <%= render partial: 'vote_cabin', locals: { initiative: current_initiative } %>
+            <%= render partial: "vote_cabin", locals: { initiative: current_initiative } %>
           </div>
         <% end %>
 
         <% if current_user %>
-          <%= render partial: 'decidim/shared/follow_button', locals: { followable: current_initiative } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_initiative } %>
         <% end %>
       </div>
     </div>
 
-    <%= render partial: 'decidim/shared/share_modal' %>
+    <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for initiative_initiative_widget_url(current_initiative, format: :js) %>
 
-    <%= render partial: 'statistics' %>
+    <%= render partial: "statistics" %>
   </div>
 
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <div class="row column">
         <h2 class="heading2">
-          <%= partially_translated_attribute(current_initiative.title) %>
+          <%= translated_attribute(current_initiative.title) %>
         </h2>
-        <%= render partial: 'author', locals: { initiative: current_initiative } %>
+        <%= render partial: "author", locals: { initiative: current_initiative } %>
       </div>
-      <br>
+      <br />
       <div class="row column">
-        <%= render partial: 'initiative_badge', locals: { initiative: current_initiative } %>
-        <%= sanitize partially_translated_attribute(current_initiative.description) %>
-        <%= render partial: 'tags', locals: { resource: current_initiative } %>
+        <%= render partial: "initiative_badge", locals: { initiative: current_initiative } %>
+        <%= sanitize translated_attribute(current_initiative.description) %>
+        <%= render partial: "tags", locals: { resource: current_initiative } %>
       </div>
 
-      <%= render partial: 'result', locals: { initiative: current_initiative } %>
+      <%= render partial: "result", locals: { initiative: current_initiative } %>
     </div>
 
     <%= attachments_for current_initiative %>
 
-    <%= render partial: 'supports', locals: { initiative: current_initiative } %>
+    <%= render partial: "supports", locals: { initiative: current_initiative } %>
   </div>
 </div>
 
 <%= comments_for current_initiative if current_initiative.published? %>
-<%= javascript_include_tag 'decidim/initiatives/social_share' %>
-<%= stylesheet_link_tag 'decidim/initiatives/application' %>
-<%= stylesheet_link_tag 'decidim/initiatives/social_share' %>
+<%= javascript_include_tag "decidim/initiatives/social_share" %>
+<%= stylesheet_link_tag "decidim/initiatives/application" %>
+<%= stylesheet_link_tag "decidim/initiatives/social_share" %>

data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb

@@ -1,8 +1,8 @@
 <div class="reveal__header">
-  <h1 class="reveal__title"><%=t '.select_identity' %></h1>
+  <h1 class="reveal__title"><%= t ".select_identity" %></h1>
 </div>
 
-<%= render partial: 'decidim/initiatives/initiatives/vote_button',
+<%= render partial: "decidim/initiatives/initiatives/vote_button",
            locals: {
                initiative: current_initiative,
                vote_label: current_user.name,
@@ -10,7 +10,7 @@
            } unless current_initiative.offline? %>
 
 <% current_user.user_groups.verified.each do |g| %>
-  <br>
+  <br />
   <% if @voted_groups.include? g.id %>
       <%= action_authorized_button_to :vote,
                                       g.name,
@@ -18,13 +18,13 @@
                                       method: :delete,
                                       remote: true,
                                       data: { disable: true },
-                                      class: 'card__button button expanded button--sc success' %>
+                                      class: "card__button button expanded button--sc success" %>
   <% else %>
     <%= action_authorized_button_to :vote,
                                     g.name,
                                     initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
                                     remote: true,
                                     data: { disable: true },
-                                    class: 'card__button button expanded button--sc' %>
+                                    class: "card__button button expanded button--sc" %>
   <% end %>
-<% end %>
+<% end %>

data/app/views/decidim/initiatives/initiatives_mailer/_initiative_link.html.erb

@@ -1,5 +1,5 @@
 <% if @link %>
     <p>
-      <%= t('.check_initiative_details') %> <%= link_to t('.here'), @link %>
+      <%= t(".check_initiative_details") %> <%= link_to t(".here"), @link %>
     </p>
-<% end %>
+<% end %>

data/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb

@@ -1,11 +1,11 @@
 <p>
-<%=t 'decidim.initiatives.initiatives_mailer.creation_subject', title: partially_translated_attribute(@initiative.title) %>.
-<%= link_to t('decidim.initiatives.initiatives_mailer.more_information'), decidim.page_url('initiatives', host: @organization.host) %>
+<%= t "decidim.initiatives.initiatives_mailer.creation_subject", title: translated_attribute(@initiative.title) %>.
+<%= link_to t("decidim.initiatives.initiatives_mailer.more_information"), decidim.page_url("initiatives", host: @organization.host) %>
 </p>
 
 <% if @initiative.created_by_individual? %>
     <p>
-      <%=t 'decidim.initiatives.initiatives_mailer.promotal_committee_help',
+      <%= t "decidim.initiatives.initiatives_mailer.promotal_committee_help",
            member_count: Decidim::Initiatives.minimum_committee_members %>
     </p>
     <p>
@@ -13,10 +13,10 @@
                   decidim_initiatives.new_initiative_committee_request_url(@initiative, host: @organization.host) %>
     </p>
 <% end %>
-<br><br>
+<br /><br />
 
 <p>
-  <%= t('check_initiative_details', scope: 'decidim.initiatives.initiatives_mailer.initiative_link') %>
-  <%= link_to t('here',  scope: 'decidim.initiatives.initiatives_mailer.initiative_link'),
+  <%= t("check_initiative_details", scope: "decidim.initiatives.initiatives_mailer.initiative_link") %>
+  <%= link_to t("here",  scope: "decidim.initiatives.initiatives_mailer.initiative_link"),
               decidim_admin_initiatives.initiative_url(@initiative, host: @organization.host) %>
 </p>

data/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb

@@ -1,3 +1,3 @@
 <%= sanitize @body %>
-<br><br>
-<%= render partial: 'initiative_link' %>
+<br /><br />
+<%= render partial: "initiative_link" %>

data/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb

@@ -1,3 +1,3 @@
 <%= sanitize @body %>
-<br><br>
-<%= render partial: 'initiative_link' %>
+<br /><br />
+<%= render partial: "initiative_link" %>

data/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb

@@ -1,3 +1,3 @@
 <%= sanitize @body %>
-<br><br>
-<%= render partial: 'initiative_link' %>
+<br /><br />
+<%= render partial: "initiative_link" %>

data/app/views/decidim/initiatives/initiatives_type_scopes/search.html.erb

@@ -1 +1 @@
-<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope.name), s.scope.id] }, params[:selected] %>
+<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope.name), s.scope.id] }, params[:selected] %>

data/app/views/layouts/decidim/_initiative_creation_header.html.erb

@@ -16,13 +16,12 @@
                 <% unless future_step? wizard_step %>
                   <li class="phase-item--past">
                     <span></span>
-                    <div class="caption"><%=t ".#{wizard_step}" %></div>
+                    <div class="caption"><%= t ".#{wizard_step}" %></div>
                   </li>
-
                 <% else %>
                   <li>
                     <span></span>
-                    <div class="caption"><%=t ".#{wizard_step}" %></div>
+                    <div class="caption"><%= t ".#{wizard_step}" %></div>
                   </li>
                 <% end %>
               <% end %>
@@ -33,4 +32,4 @@
       <div class="columns mediumlarge-3"></div>
     </div>
   </div>
-</div>
+</div>

data/app/views/layouts/decidim/_initiative_header.html.erb

@@ -5,7 +5,7 @@
       <div class="columns mediumlarge-9 process-header__info">
         <div>
           <h1 class="text-highlight heading2">
-            <%= participatory_space_helpers.partially_translated_attribute(current_participatory_space.title) %>
+            <%= participatory_space_helpers.translated_attribute(current_participatory_space.title) %>
           </h1>
         </div>
         <div>
@@ -15,44 +15,44 @@
                 <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}" %>
               </span>
             <% end %>
-            <%=strip_tags participatory_space_helpers.partially_translated_attribute(current_participatory_space.type.title) %>
+            <%= strip_tags participatory_space_helpers.translated_attribute(current_participatory_space.type.title) %>
           </h2>
         </div>
       </div>
-      <%= render partial: 'layouts/decidim/initiative_header_steps', locals: { initiative: current_participatory_space } %>
+      <%= render partial: "layouts/decidim/initiative_header_steps", locals: { initiative: current_participatory_space } %>
     </div>
   </div>
-  <% if current_participatory_space.features.any? %>
+  <% if current_participatory_space.components.any? %>
       <div class="row column">
         <div class="process-nav">
-          <button class="process-nav__trigger hide-for-medium"  data-toggle="process-nav-content">
-            <%= icon 'caret-bottom', class: 'icon--small process-nav__trigger__icon', aria_label: t('.unfold'), role: 'img' %>
+          <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
+            <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
             <div class="process-nav__link">
-              <%  if self.try(:current_feature) %>
-                  <%= feature_icon(current_feature) %>
-                  <%= translated_attribute(current_feature.name) %>
+              <% if self.try(:current_component) %>
+                <%= component_icon(current_component) %>
+                <%= translated_attribute(current_component.name) %>
               <% else %>
-                  <%= icon 'chat' %>
-                  <%= t '.initiative_menu_item' %>
+                <%= icon "chat" %>
+                <%= t ".initiative_menu_item" %>
               <% end %>
             </div>
           </button>
           <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
             <ul>
-              <li class="<%= 'is-active' if is_active_link?(decidim_initiatives.initiative_path(current_participatory_space), :exclusive) %>">
-                <%= active_link_to decidim_initiatives.initiative_path(current_participatory_space), active: :exclusive, class: 'process-nav__link', class_active: 'is-active' do %>
-                    <%= icon 'chat' %>
-                    <%= t '.initiative_menu_item' %>
+              <li class="<%= "is-active" if is_active_link?(decidim_initiatives.initiative_path(current_participatory_space), :exclusive) %>">
+                <%= active_link_to decidim_initiatives.initiative_path(current_participatory_space), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
+                  <%= icon "chat" %>
+                  <%= t ".initiative_menu_item" %>
                 <% end %>
               </li>
 
-              <% current_participatory_space.features.each do |feature| %>
-                  <% if feature.published? || feature == self.try(:current_feature) %>
-                      <li class="<%= "is-active" if is_active_link?(main_feature_path(feature), :inclusive) %>">
-                        <%= active_link_to main_feature_path(feature), class: 'process-nav__link', active: :inclusive, class_active: 'is-active' do %>
-                            <%= feature_icon(feature) %>
+              <% current_participatory_space.components.each do |component| %>
+                  <% if component.published? || component == self.try(:current_component) %>
+                      <li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">
+                        <%= active_link_to main_component_path(component), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
+                            <%= component_icon(component) %>
 
-                            <%= translated_attribute(feature.name) %>
+                            <%= translated_attribute(component.name) %>
                         <% end %>
                       </li>
                   <% end %>