Skip to content

Commit

Permalink
adapt processes layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@jorgeatgu
jorgeatgu committed Jun 29, 2023
1 parent 31d9f8c commit 95dbd4f
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 74 deletions.
2 changes: 0 additions & 2 deletions decidim-admin/app/packs/stylesheets/decidim/admin/_redesigned_table-list.scss
View file
Expand Up @@ -5,8 +5,6 @@
border: 1px solid rgba(228, 238, 255, .6);

@apply mb-0 text-gray-2;


}

//Table list
Expand Down
2 changes: 1 addition & 1 deletion decidim-assemblies/app/views/layouts/decidim/admin/assemblies.html.erb
View file
@@ -1,7 +1,7 @@
<%= 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", class:"process-title-content-breadcrumb" %>
<%= link_to t("decidim.admin.titles.assemblies"), decidim_assemblies.assemblies_path, target: "_blank", class: "process-title-content-breadcrumb" %>
<div class="ml-auto flex items-center gap-x-4">
<% if allowed_to? :create, :assembly %>
<%= link_to new_assembly_path(parent_id: parent_assembly&.id), class: "button button__transparent !py-1.5" do %>
Expand Down
67 changes: 4 additions & 63 deletions ...es/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb
View file
@@ -1,49 +1,6 @@
<% add_decidim_page_title(t("participatory_processes", scope: "decidim.admin.titles")) %>
<% content_for :sidebar_menu_nav do %>
<%= sidebar_menu(:admin_participatory_processes_menu).render %>
<% end %>
<%#= sidebar_menu(:admin_participatory_processes_menu).render %>

<div class="card with-overflow" id="processes">
<div class="card-divider">
<h2 class="card-title">
<%= t("participatory_processes", scope: "decidim.admin.titles") %>
<% if allowed_to? :create, :process %>
<%= link_to t("actions.new_process", scope: "decidim.admin"),
[:new, :participatory_process],
class: "button tiny button--title" %>
<% end %>
<% if process_group %>
<span>&lt;</span>
<%= link_to translated_attribute(process_group.title),
edit_participatory_process_group_path(process_group) %>
<% end %>
<% if allowed_to? :import, :process %>
<%= link_to t("actions.import_process", scope: "decidim.admin"),
new_import_path,
class: "button tiny button--title" %>
<% end %>

<button data-toggle="process_groups" class="dropdown button tiny button--title">
<%= t("actions.filter.process_groups", scope: "decidim.admin") %>
</button>
<div id="process_groups" class="dropdown-pane" data-position="bottom" data-dropdown data-auto-focus="true">
<ul class="list-reset">
<%= link_to query_params_with(decidim_participatory_process_group_id_eq: nil) do %>
<li><%= t("actions.filter.all_processes", scope: "decidim.admin") %></li>
<% end %>
<% process_groups_for_select.each do |group_title, group_id| %>
<%= link_to query_params_with(decidim_participatory_process_group_id_eq: group_id) do %>
<li><%= group_title %></li>
<% end %>
<% end %>
</ul>
</div>
</h2>
</div>
<%= admin_filter_selector %>
<div class="card-section">
<div class="table-scroll">
Expand All @@ -62,7 +19,9 @@
<th class="table-list__actions">
<%= sort_link(query, :published_at, t("models.participatory_process.fields.published", scope: "decidim.admin")) %>
</th>
<th></th>
<th>
<%= t("models.participatory_process.fields.actions", scope: "decidim.admin") %>
</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -98,18 +57,6 @@
<% end %>
</td>
<td class="table-list__actions">
<% if allowed_to? :update, :process, process: process %>
<%= icon_link_to "pencil", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
<% else %>
<span class="action-space icon"></span>
<% end %>
<% if allowed_to? :create, :process, process: process %>
<%= icon_link_to "clipboard", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
<% else %>
<span class="action-space icon"></span>
<% end %>
<% if allowed_to? :create, :process, process: process %>
<%= icon_link_to "data-transfer-download", participatory_process_export_path(process), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
<% else %>
Expand All @@ -121,12 +68,6 @@
<% else %>
<span class="action-space icon"></span>
<% end %>
<% if allowed_to? :read, :moderation, process: process %>
<%= icon_link_to "flag", moderations_path(process), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
<% else %>
<span class="action-space icon"></span>
<% end %>
</td>
</tr>
<% end %>
Expand Down
6 changes: 1 addition & 5 deletions ...im-participatory_processes/app/views/layouts/decidim/admin/participatory_process.html.erb
View file
@@ -1,9 +1,5 @@
<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
<% content_for :sidebar_menu_nav do %>
<%= sidebar_menu(:admin_participatory_process_menu).render do
public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space)
end %>
<% end %>
<%= render "layouts/decidim/admin/application" do %>
<div class="process-title">
Expand Down
49 changes: 46 additions & 3 deletions ...-participatory_processes/app/views/layouts/decidim/admin/participatory_processes.html.erb
View file
@@ -1,11 +1,54 @@
<%= render "layouts/decidim/admin/application" do %>
<div class="process-title">
<div class="process-title-content">
<%= link_to t("decidim.admin.titles.participatory_processes"), decidim_participatory_processes.participatory_processes_path, target: "_blank" %>
<%= link_to t("decidim.admin.titles.participatory_processes"), decidim_participatory_processes.participatory_processes_path, target: "_blank", class: "process-title-content-breadcrumb" %>
<div class="ml-auto flex items-center gap-x-4">
<% if allowed_to? :create, :process %>
<%= link_to [:new, :participatory_process], class: "button button__transparent !py-1.5" do %>
<svg viewBox="0 0 24 24" id="ri-add-line" class="w-4 h-4">
<g>
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M11 11V5h2v6h6v2h-6v6h-2v-6H5v-2z"/>
</g>
</svg>
<%= t("actions.new_process", scope: "decidim.admin") %>
<% end %>
<% end %>
<div class="inline-block relative">
<%= button_tag id: "processes-dropdown-menu-trigger", data: { component: 'dropdown', target: 'processes-dropdown-menu-settings' }, class: 'dropdown__trigger button button__transparent' do %>
<svg viewBox="0 0 24 24" id="ri-more-line">
<g>
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M4.5 10.5c-.825 0-1.5.675-1.5 1.5s.675 1.5 1.5 1.5S6 12.825 6 12s-.675-1.5-1.5-1.5zm15 0c-.825 0-1.5.675-1.5 1.5s.675 1.5 1.5 1.5S21 12.825 21 12s-.675-1.5-1.5-1.5zm-7.5 0c-.825 0-1.5.675-1.5 1.5s.675 1.5 1.5 1.5 1.5-.675 1.5-1.5-.675-1.5-1.5-1.5z"/>
</g>
</svg>
<% end %>
<div id="processes-dropdown-menu-settings">
<ul class="dropdown dropdown__bottom">
<li class="dropdown__item">
<% if allowed_to? :import, :process %>
<%= link_to t("actions.import_process", scope: "decidim.admin"),
new_import_path,
class: "text-secondary" %>
<% end %>
</li>
<li class="dropdown__item">
<% if allowed_to? :manage, :participatory_process_type %>
<%= link_to t("menu.participatory_process_types", scope: "decidim.admin"),
decidim_admin_participatory_processes.participatory_process_types_path,
class: "text-secondary" %>
<% end %>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>

<div class="process-content">
<%= yield %>
<div class="container">
<div class="process-content">
<%= yield %>
</div>
</div>
<% end %>
1 change: 1 addition & 0 deletions decidim-participatory_processes/config/locales/en.yml
View file
Expand Up @@ -140,6 +140,7 @@ en:
promoted: Highlighted
published: Published
title: Title
actions: Actions
name: Participatory process
participatory_process_group:
fields:
Expand Down

0 comments on commit 95dbd4f

Please sign in to comment.