Skip to content

Commit

Permalink
change show suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
@antopalidi
antopalidi committed Mar 25, 2024
1 parent 5d613dc commit c4438eb
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 138 deletions.
10 changes: 0 additions & 10 deletions app/packs/stylesheets/decidim/participatory_documents/participatory_documents_admin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@
}
}

.show-form-title {
@apply text-lg font-bold decoration-0 p-2 my-4;

--tw-text-opacity: 1 !important;
--tw-bg-opacity: 0.3 !important;

color: rgb(0 0 0 / var(--tw-text-opacity)) !important;
background: rgb(var(--secondary-rgb) / var(--tw-bg-opacity)) !important;
}

.close-icon {
font-size: 20px;
line-height: 24px;
Expand Down
65 changes: 29 additions & 36 deletions app/views/decidim/participatory_documents/admin/suggestion_notes/_suggestion_notes.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,38 @@
<section class="comments">
<div class="card">
<div>
<h2 class="show-form-title"><%= t("title", scope: "decidim.participatory_documents.admin.suggestion_notes") %></h2>
</div>
<div class="card-section">
<div class="comment-thread">
<% suggestion.notes.each do |note| %>
<div class="card">
<div class="card-divider">
<div class="comment">
<div class="comment__header">
<div class="author-data">
<div class="author-data__main">
<div class="author author--inline">
<strong><span class="author__name"><%= note.author.name %></span></strong>
<span><%= l note.created_at, format: :decidim_short %></span>
<%= render partial: "decidim/participatory_documents/admin/suggestion_notes/editing_suggestion_note", locals: { note: note } %>
</div>
</div>
</div>
</div>
<div class="comment__content">
<%= simple_format Decidim::ContentRenderers::LinkRenderer.new(note.body).render.html_safe %>
<div class="component__show_notes" data-component="accordion" id="accordion-notes">
<button class="card-divider-button" data-controls="panel-notes" type="button">
<%= icon "arrow-right-s-line" %>
<h2 class="card-title">
<%= t("title", scope: "decidim.participatory_documents.admin.suggestion_notes") %>
</h2>
</button>
<div id="panel-notes">
<div class="component__show_notes-grid">
<% suggestion.notes.each do |note| %>
<div class="comment">
<div class="comment__header">
<div class="author-data">
<div class="author-data__main">
<div class="author author--inline">
<strong><span class="author__name"><%= note.author.name %></span></strong>
<span><%= l note.created_at, format: :decidim_short %></span>
<%= render partial: "decidim/participatory_documents/admin/suggestion_notes/editing_suggestion_note", locals: { note: note } %>
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
<div class="card-section">
<div class="add-comment">
<div class="card">
<div>
<h2 class="item_show__header-title"><%= t("leave_your_note", scope: "decidim.participatory_documents.admin.suggestion_notes") %></h2>
</div>
<div class="card-section">
<%= render "decidim/participatory_documents/admin/suggestion_notes/form" %>
<div class="comment__content">
<%= simple_format Decidim::ContentRenderers::LinkRenderer.new(note.body).render.html_safe %>
</div>
</div>
<% end %>
</div>
<div class="card add-comment">
<div class="card-divider">
<h2 class="card-title"><%= t("leave_your_note", scope: "decidim.participatory_documents.admin.suggestion_notes") %></h2>
</div>
<div class="card-section">
<%= render "decidim/participatory_documents/admin/suggestion_notes/form" %>
</div>
</div>
</div>
</section>
</div>
25 changes: 10 additions & 15 deletions app/views/decidim/participatory_documents/admin/suggestions/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,21 @@
html: { class: "form-defaults form edit_suggestion suggestion_form_admin" }) do |form| %>
<div class="form__wrapper">
<div class="card pt4" id="suggestion-answer">
<div>
<h2 class="show-form-title"><%= t ".title" %></h2>
<div class="card-divider">
<h2 class="card-title"><%= t ".title" %></h2>
</div>
<div class="card-section">
<div class="row flex">
<div class="row column flex items-center gap-x-4 my-2">
<%= form.collection_radio_buttons :state, [
["not_answered", t("not_answered", scope: "decidim.participatory_documents.suggestions.answers")],
["accepted", t("accepted", scope: "decidim.participatory_documents.suggestions.answers")],
["rejected", t("rejected", scope: "decidim.participatory_documents.suggestions.answers")],
["evaluating", t("evaluating", scope: "decidim.participatory_documents.suggestions.answers")]
], :first, :last, prompt: true do |builder| %>
<div class="answer-container__radio mr-4">
<%= builder.radio_button(id: builder.value) %>
<label for="<%= builder.value %>">
<%= builder.text %>
</label>
</div>
<% end %>
], :first, :last, prompt: true do |builder|
builder.label { builder.radio_button + builder.text } end %>
</div>

<div class="row column">
<%= form.translated :text_area, :answer, autofocus: true, rows: 15 %>
<%= form.translated :editor, :answer, autofocus: true, rows: 15 %>
</div>

<div class="row column">
Expand All @@ -34,8 +27,10 @@
</div>
</div>
</div>
<div class="button button__sm button__secondary">
<%= form.submit t(".answer") %>
<div class="item__edit-sticky">
<div class="item__edit-sticky-container">
<%= form.submit t(".answer"), class: "button button__sm button__secondary" %>
</div>
</div>
<% end %>
</div>
73 changes: 37 additions & 36 deletions app/views/decidim/participatory_documents/admin/suggestions/_valuators.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
<div class="item__edit-form">
<% if suggestion.valuators.any? || allowed_to?(:assign_to_valuator, :suggestions) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title"><%= t ".valuators" %></h2>
</div>

<% if suggestion.valuators.any? || allowed_to?(:assign_to_valuator, :suggestions) %>
<div class="card">
<div>
<h2 class="show-form-title"> <%= t ".valuators" %></h2>
</div>

<div class="card-section">
<div class="row column">
<% if suggestion.valuators.any? %>
<strong><%= t ".assigned_valuators" %>:</strong>
<ul id="valuators">
<% suggestion.valuation_assignments.each do |assignment| %>
<% presented_valuator = present(assignment.valuator) %>
<li class="flex items-center">
<%= link_to(
presented_valuator.name,
presented_valuator.profile_path,
target: :blank,
class: "mr-2"
) %>
<% if valuator_assigned_to_suggestion? || current_user.admin? %>
<%= icon_link_to(
"close-circle-line",
document_suggestion_valuation_assignment_path(document, suggestion, assignment.valuator_role),
t(".remove_assignment"),
method: :delete,
data: { confirm: t(".remove_assignment_confirmation") },
class: "close-icon text-alert"
<div class="card-section">
<div class="row column">
<% if suggestion.valuators.any? %>
<strong><%= t ".assigned_valuators" %>:</strong>
<ul id="valuators">
<% suggestion.valuation_assignments.each do |assignment| %>
<% presented_valuator = present(assignment.valuator) %>
<li class="flex items-center">
<%= link_to(
presented_valuator.name,
presented_valuator.profile_path,
target: :blank,
class: "mr-2"
) %>
<% end %>
</li>
<% end %>
</ul>
<% end %>
<%= render "decidim/participatory_documents/admin/suggestions/add_valuators" %>
<% if valuator_assigned_to_suggestion? || current_user.admin? %>
<%= icon_link_to(
"close-circle-line",
document_suggestion_valuation_assignment_path(document, suggestion, assignment.valuator_role),
t(".remove_assignment"),
method: :delete,
data: { confirm: t(".remove_assignment_confirmation") },
class: "close-icon text-alert"
) %>
<% end %>
</li>
<% end %>
</ul>
<% end %>
<%= render "decidim/participatory_documents/admin/suggestions/add_valuators" %>

</div>
</div>
</div>
</div>
<% end %>
<% end %>
</div>
86 changes: 45 additions & 41 deletions app/views/decidim/participatory_documents/admin/suggestions/show.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,52 @@
<% add_decidim_page_title(translated_attribute(document.title)) %>
<%= append_stylesheet_pack_tag "decidim_admin_participatory_documents" %>
<%= append_javascript_pack_tag "decidim_admin_participatory_documents" %>
<div class="item_show__wrapper">
<div class="item_show__header">
<h1 class="item_show__header-title">
Suggestion for <%= translated_attribute(suggestion.suggestable.title) %>
</h1>
</div>
<div class="mb-2">
<p class="block"><strong><%= t ".authors" %>:</strong></p>
<ul id="proposal-authors-list">
<li class="text-secondary">
<% presented_author = present(suggestion.author) %>
<%= link_to_if(
presented_author.profile_path.present?,
presented_author.name,
presented_author.profile_path,
target: :blank
) %>
<% if presented_author.can_be_contacted? && presented_author.nickname != present(current_user).nickname %>
<%= icon_link_to "mail-check-line", current_or_new_conversation_path_with(presented_author), t("decidim.contact"), class: "action-icon--new" %>
<% end %>
</li>
<%# end %>
</ul>
</div>
<div class="component__show">
<div class="card">
<div class="component__show_header">
<h2 class="component__show_header-title">
Suggestion for <%= translated_attribute(suggestion.suggestable.title) %>
</h2>
</div>
<div class="mb-2">
<p class="block"><strong><%= t ".authors" %>:</strong></p>
<ul id="proposal-authors-list">
<li class="text-secondary">
<% presented_author = present(suggestion.author) %>
<%= link_to_if(
presented_author.profile_path.present?,
presented_author.name,
presented_author.profile_path,
target: :blank
) %>
<% if presented_author.can_be_contacted? && presented_author.nickname != present(current_user).nickname %>
<%= icon_link_to "mail-check-line", current_or_new_conversation_path_with(presented_author), t("decidim.contact"), class: "action-icon--new" %>
<% end %>
</li>
</ul>
</div>

<div class="mb-2">
<strong><%= t ".body" %>:</strong>
<p><%= suggestion_content(suggestion)[:text] %>
<% if suggestion_content(suggestion)[:file_link] %>
<%= suggestion_content(suggestion)[:file_link] %>
<% end %>
</p>
</div>
<div class="mb-2">
<strong><%= t ".created_at" %>:</strong>
<p><%= l suggestion.created_at, format: :decidim_short %></p>
</div>
<div class="mb-2">
<strong><%= t ".body" %>:</strong>
<p><%= suggestion_content(suggestion)[:text] %>
<% if suggestion_content(suggestion)[:file_link] %>
<%= suggestion_content(suggestion)[:file_link] %>
<% end %>
</p>
</div>
<div class="mb-2">
<strong><%= t ".created_at" %>:</strong>
<p><%= l suggestion.created_at, format: :decidim_short %></p>
</div>

<%= render "decidim/participatory_documents/admin/suggestions/valuators" %>
<%= render "decidim/participatory_documents/admin/suggestions/valuators" %>
<% if allowed_to?(:create, :suggestion_note, suggestion: suggestion) %>
<%= render "decidim/participatory_documents/admin/suggestion_notes/suggestion_notes" %>
<% end %>
<% if allowed_to?(:create, :suggestion_note, suggestion: suggestion) %>
<div class="card-section">
<%= render "decidim/participatory_documents/admin/suggestion_notes/suggestion_notes" %>
</div>
<% end %>
<%= render "decidim/participatory_documents/admin/suggestions/form" %>
<%= render "decidim/participatory_documents/admin/suggestions/form" %>
</div>
</div>

0 comments on commit c4438eb

Please sign in to comment.