decidim-assemblies 0.11.2 → 0.12.0.pre

data/app/views/decidim/assemblies/_assembly.html.erb

@@ -1,22 +1 @@
-<div class="column">
-  <article class="card card--process">
-    <%= link_to assembly_path(assembly), class: "card__link" do %>
-      <div class="card__image-top"
-           style="background-image:url(<%= assembly.hero_image.url %>)"></div>
-    <% end %>
-    <div class="card__content">
-      <%= link_to assembly_path(assembly), class: "card__link" do %>
-        <h4 class="card__title"><%= translated_attribute assembly.title %></h4>
-      <% end %>
-      <p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(assembly.short_description), length: 630, separator: "...") %></p>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <span class="card--process__small"></span>
-        <%= link_to assembly_path(assembly), class: "card__button button small" do %>
-          <%= t("assemblies.assembly.take_part", scope: "layouts.decidim") %>
-        <% end %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for assembly %>

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -132,10 +132,12 @@
 
     <div class="row column">
       <%= form.date_field :duration %>
+      <p class="help-text"><%== t(".duration_help") %></p>
     </div>
 
     <div class="row column">
       <%= form.date_field :included_at %>
+      <p class="help-text"><%== t(".included_at_help") %></p>
     </div>
 
     <div class="row column" id="closing_date_div">

data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb

@@ -3,7 +3,7 @@
   <div class="button--double form-general-submit">
     <%= f.submit t("assemblies.edit.update", scope: "decidim.admin"), class: "button" %>
 
-    <% if can? :publish, current_assembly %>
+    <% if allowed_to? :publish, :assembly, assembly: current_assembly %>
       <% if current_assembly.published? %>
         <%= link_to t("actions.unpublish", scope: "decidim.admin"), assembly_publish_path(current_assembly), method: :delete, class: "button muted" %>
       <% else %>
@@ -11,7 +11,7 @@
       <% end %>
     <% end %>
 
-    <% if can? :destroy, current_assembly %>
+    <% if allowed_to? :destroy, :assembly, assembly: current_assembly %>
       <%= link_to t("decidim.admin.actions.destroy"), current_assembly, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
     <% end %>
   </div>

data/app/views/decidim/assemblies/admin/assemblies/index.html.erb

@@ -5,7 +5,7 @@
         <%= link_to "#{translated_attribute(assembly.title)} > ", edit_assembly_path(assembly) %>
       <% end if parent_assembly %>
       <%= t "decidim.admin.titles.assemblies" %>
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly.name", scope: "decidim.admin")), new_assembly_path(parent_id: parent_assembly&.id), class: "button tiny button--title" if can? :create, Decidim::Assembly %>
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly.name", scope: "decidim.admin")), new_assembly_path(parent_id: parent_assembly&.id), class: "button tiny button--title" if allowed_to? :create, :assembly %>
     </h2>
   </div>
   <div class="card-section">
@@ -29,11 +29,11 @@
                     <%= icon "star" %>
                   </span>
                 <% end %>
-                <% if can? :update, assembly %>
+                <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %><br />
-                <% elsif can? :preview, assembly %>
+                <% elsif allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %><br />
-                <% elsif can? :read, Decidim::Moderation %>
+                <% elsif allowed_to? :read, :moderation, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), moderations_path(assembly) %><br />
                 <% else %>
                   <%= translated_attribute(assembly.title) %>
@@ -57,19 +57,19 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
-                <% if can? :create, assembly %>
+                <% if allowed_to? :create, :assembly, assembly: assembly %>
                   <%= icon_link_to "clipboard", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
                 <% end %>
 
-                <% if can? :update, assembly %>
+                <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= icon_link_to "pencil", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
                 <% end %>
 
-                <% if assembly.children_count > 0 || can?(:create, assembly) %>
+                <% if assembly.children_count > 0 || allowed_to?(:create, :assembly) %>
                   <%= icon_link_to "dial", decidim_admin_assemblies.assemblies_path(parent_id: assembly.id), t("decidim.admin.titles.assemblies"), class: "action-icon--dial" %>
                 <% end %>
 
-                <% if can? :preview, assembly %>
+                <% if allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= icon_link_to "eye", decidim_assemblies.assembly_path(assembly), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
                 <% end %>
               </td>

data/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb

@@ -0,0 +1,66 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="user-fields">
+      <div class="row column">
+        <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
+      </div>
+
+      <div class="row column user-fields--full-name">
+        <%= form.text_field :full_name, autofocus: true %>
+      </div>
+
+      <div class="row column user-fields--user-picker">
+        <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
+        <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
+          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+        end %>
+      </div>
+    </div>
+
+    <div class="position-fields">
+      <div class="row column">
+        <%= form.select :position, @form.positions_for_select, { include_blank: t(".select_a_position") }, { multiple: false } %>
+      </div>
+
+      <div class="row column position-fields--position-other">
+        <%= form.text_field :position_other %>
+      </div>
+    </div>
+
+    <div class="row column">
+      <%= form.number_field :weight %>
+    </div>
+
+    <div class="row column">
+      <%= form.date_field :designation_date %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :designation_mode %>
+    </div>
+
+    <div class="row column">
+      <%= form.date_field :ceased_date %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :gender %>
+    </div>
+
+    <div class="row column">
+      <%= form.date_field :birthday %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :birthplace %>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/assemblies/admin/assembly_members" %>

data/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: assembly_member_path(@assembly_member.assembly, @assembly_member), html: { class: "form edit_assembly_member" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("assembly_members.edit.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+  <%= f.submit t("assembly_members.edit.update", scope: "decidim.admin") %>
+  </div>
+<% end %>

data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb

@@ -0,0 +1,91 @@
+<div class="filters row">
+  <div class="column medium-3">
+    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
+    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
+      <li class="is-dropdown-submenu-parent">
+        <a href="#">
+          <% if @status.present? %>
+            <%= t(".filter.#{@status}") %>
+          <% else %>
+            <%= t(".filter.all") %>
+          <% end %>
+        </a>
+        <ul class="menu is-dropdown-submenu">
+          <li><%= link_to t(".filter.ceased"), url_for(status: "ceased", q: @query) %></li>
+          <li><%= link_to t(".filter.not_ceased"), url_for(status: "not_ceased", q: @query) %></li>
+          <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div class="column medium-4">
+    <%= form_tag "", method: :get do %>
+      <div class="filters__search">
+        <div class="input-group">
+          <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
+          <%= hidden_field_tag :state, @state %>
+          <div class="input-group-button">
+            <button type="submit" class="button button--muted">
+              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            </button>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div class='card' id="assembly_members">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
+      <% if allowed_to? :create, :assembly_member %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="stack">
+        <thead>
+          <tr>
+            <th><%= t("models.assembly_member.fields.full_name", scope: "decidim.admin") %></th>
+            <th><%= t("models.assembly_member.fields.position", scope: "decidim.admin") %></th>
+            <th><%= t("models.assembly_member.fields.designation_date", scope: "decidim.admin") %></th>
+            <th><%= t("models.assembly_member.fields.ceased_date", scope: "decidim.admin") %></th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @assembly_members.each do |member| %>
+            <% member_presenter = Decidim::Admin::AssemblyMemberPresenter.new(member) %>
+            <tr>
+              <td>
+                <%= member_presenter.name %>
+              </td>
+              <td>
+                <%= member_presenter.position %>
+              </td>
+              <td>
+                <%= l member.designation_date, format: :datepicker %>
+              </td>
+              <td>
+                <%= member.ceased_date ? l(member.ceased_date, format: :datepicker) : nil %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to? :update, :assembly_member, member: member %>
+                  <%= icon_link_to "pencil", edit_assembly_member_path(current_assembly, member), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if allowed_to? :destroy, :assembly_member, member: member %>
+                  <%= icon_link_to "circle-x", assembly_member_path(current_assembly, member), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assembly_members/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_assembly_member" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("assembly_members.new.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assembly_members.new.create", scope: "decidim.admin") %>
+  </div>
+<% end %>

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
-      <% if can? :create, Decidim::AssemblyUserRole %>
+      <% if allowed_to? :create, :assembly_user_role %>
          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_user_role.name", scope: "decidim.admin")), new_assembly_user_role_path(current_assembly), class: "button tiny button--title new" %>
       <% end %>
     </h2>
@@ -44,15 +44,15 @@
                 <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br />
               </td>
               <td class="table-list__actions">
-                <% if can?(:invite, role) && role.user.invited_to_sign_up? %>
+                <% if allowed_to?(:invite, :assembly_user_role, user_role: role) && role.user.invited_to_sign_up? %>
                   <%= icon_link_to "reload", resend_invitation_assembly_user_role_path(current_assembly, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
                 <% end %>
 
-                <% if can? :update, role %>
+                <% if allowed_to? :update, :assembly_user_role, user_role: role %>
                   <%= icon_link_to "pencil", edit_assembly_user_role_path(current_assembly, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, role %>
+                <% if allowed_to? :destroy, :assembly_user_role, user_role: role %>
                   <%= icon_link_to "circle-x", assembly_user_role_path(current_assembly, role), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
               </td>

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

@@ -1,7 +1,6 @@
 <% add_decidim_meta_tags({
   image_url: current_participatory_space.hero_image.url,
   description: translated_attribute(current_participatory_space.short_description),
-  title: translated_attribute(current_participatory_space.title),
   url: assembly_url(current_participatory_space),
   twitter_handler: current_organization.twitter_handler
 }) %>
@@ -73,7 +72,7 @@
       <% if current_participatory_space.children_count > 0 %>
         <section id="assemblies-grid" class="section row collapse">
           <h4 class="section-heading"><%= t("assemblies.show.children", scope: "decidim") %></h4>
-          <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
+          <div class="row small-up-1 medium-up-2 large-up-2 card-grid">
             <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children %>
           </div>
         </section>

data/app/views/decidim/assemblies/assembly_members/index.html.erb

@@ -0,0 +1,10 @@
+<% add_decidim_meta_tags(title: t("assembly_members.index.title", scope: "decidim")) %>
+
+<div class="section row column">
+  <div class="flex--sbe">
+    <h2 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h2>
+  </div>
+  <div id="assembly_members-grid" class="row small-up-1 medium-up-2 large-up-3 card-grid">
+    <%= render(collection) %>
+  </div>
+</div>

data/app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb

@@ -0,0 +1,12 @@
+<% if assemblies.any? %>
+  <div class="card__footer card__footer--transparent">
+    <div class="card__support">
+      <div><strong><%= t(".member_of") %></strong></div>
+      <div class="card__text--separated-mid-dot js-read-more">
+        <% assemblies.each do |assembly| %>
+          <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/assembly_members/_assembly_member.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/assemblies/assembly_member", Decidim::AssemblyMemberPresenter.new(assembly_member) %>

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

@@ -21,7 +21,7 @@
       </div>
     </div>
   </div>
-  <% if current_participatory_space.components.any? %>
+  <% if current_participatory_space.components.any? || current_participatory_space.members.not_ceased.any? %>
     <div class="row column">
       <div class="process-nav">
         <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
@@ -45,6 +45,15 @@
               <% end %>
             </li>
 
+            <% if current_participatory_space.members.not_ceased.any? %>
+              <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_assembly_members_path(current_participatory_space), :inclusive) %>">
+                <%= active_link_to decidim_assemblies.assembly_assembly_members_path(current_participatory_space), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
+                  <%= icon("members") %>
+                  <%= t ".assembly_member_menu_item" %>
+                <% end %>
+              </li>
+            <% end %>
+
             <% 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) %>">

data/app/views/layouts/decidim/admin/assemblies.html.erb

@@ -1,14 +1,11 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t "decidim.admin.titles.assemblies" %>
-    </div>
-    <div class="secondary-nav__actions">
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly.name", scope: "decidim.admin")), new_assembly_path(parent_id: parent_assembly&.id), class: "button expanded small" if can? :create, Decidim::Assembly %>
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.titles.assemblies"), decidim_assemblies.assemblies_path, target: "_blank" %>
     </div>
   </div>
-<% end %>
 
-<%= render "layouts/decidim/admin/application" do %>
-  <%= yield %>
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

data/app/views/layouts/decidim/admin/assembly.html.erb

@@ -1,12 +1,12 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, current_participatory_space %>
+      <% if allowed_to? :update, :assembly, assembly: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_participatory_space) %>
         </li>
       <% end %>
-      <% if can? :read, Decidim::Component %>
+      <% if allowed_to? :read, :component %>
         <li <% if is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.components_path(current_participatory_space) %>
           <ul>
@@ -25,21 +25,21 @@
           </ul>
         </li>
       <% end %>
-      <% if can? :read, Decidim::Category %>
+      <% if allowed_to? :read, :category %>
         <li <% if is_active_link?(decidim_admin_assemblies.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.categories_path(current_participatory_space) %>
         </li>
       <% end %>
-      <% if can?(:read, Decidim::AttachmentCollection) || can?(:read, Decidim::Attachment) %>
+      <% if allowed_to?(:read, :attachment_collection) || allowed_to?(:read, :attachment) %>
         <li>
           <span class="secondary-nav__subtitle"><%= t("attachments", scope: "decidim.admin.menu.assemblies_submenu") %></span>
           <ul>
-            <% if can? :read, Decidim::AttachmentCollection %>
+            <% if allowed_to? :read, :attachment_collection %>
               <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)) %> class="is-active" <% end %>>
                 <%= aria_selected_link_to t("attachment_collections", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space) %>
               </li>
             <% end %>
-            <% if can? :read, Decidim::Attachment %>
+            <% if allowed_to? :read, :attachment %>
               <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
                 <%= aria_selected_link_to t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_participatory_space) %>
               </li>
@@ -47,17 +47,22 @@
           </ul>
         </li>
       <% end %>
-      <% if can? :read, Decidim::AssemblyUserRole %>
+      <% if allowed_to? :read, :assembly_member %>
+        <li <% if is_active_link?(decidim_admin_assemblies.assembly_members_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("assembly_members", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_members_path(current_participatory_space) %>
+        </li>
+      <% end %>
+      <% if allowed_to? :read, :assembly_user_role %>
         <li <% if is_active_link?(decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space) %>
         </li>
       <% end %>
-      <% if can? :read, Decidim::ParticipatorySpacePrivateUser %>
+      <% if allowed_to? :read, :space_private_user %>
         <li <% if is_active_link?(decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("private_users", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space) %>
         </li>
       <% end %>
-      <% if can? :read, Decidim::Moderation %>
+      <% if allowed_to? :read, :moderation %>
         <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_participatory_space) %>
         </li>
@@ -69,8 +74,11 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(current_participatory_space.title) %>
+      <%= link_to translated_attribute(current_participatory_space.title), decidim_assemblies.assembly_path(current_participatory_space), target: "_blank" %>
     </div>
   </div>
-  <%= yield %>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>