Skip to content
This repository has been archived by the owner on Mar 9, 2023. It is now read-only.

Commit

Permalink
Merge pull request #44 from Metatavu/develop
Browse files Browse the repository at this point in the history 
Develop to master
  • Loading branch information
@Eskilmar
Eskilmar committed Jan 30, 2021
2 parents da9ea80 + a0004b4 commit 537dcea
Show file tree
Hide file tree
Showing 12 changed files with 476 additions and 10 deletions.
15 changes: 5 additions & 10 deletions app/assets/stylesheets/decidim.scss
View file
Expand Up @@ -11,7 +11,7 @@ $primary-rgb: 82,172,170;
// $alert: #ec5840;
// $alert-rgb: 236,88,64;
//
// $proposals: #238ff7;
$proposals: #238ff7;
// $actions: #57d685;
// $debates: #fa6c96;
// $meetings: #fabc6c;
Expand All @@ -27,8 +27,8 @@ $primary-rgb: 82,172,170;
// // Define custom properties as css color variables
//
:root{
--primary: #{$primary};
--primary-rgb: #{$primary-rgb};
--primary: #{$primary};
--primary-rgb: #{$primary-rgb};
// --secondary: #{$secondary};
// --secondary-rgb: #{$secondary-rgb};
// --success: #{$success};
Expand All @@ -37,7 +37,7 @@ $primary-rgb: 82,172,170;
// --warning-rgb: #{$warning-rgb};
// --alert: #{$alert};
// --alert-rgb: #{$alert-rgb};
// --proposals: #{$proposals};
--proposals: #{$proposals};
// --actions: #{$actions};
// --debates: #{$debates};
// --meetings: #{$meetings};
Expand Down Expand Up @@ -250,11 +250,6 @@ $primary-rgb: 82,172,170;
margin-bottom: 110px;
}
}
@media screen and (min-width: 1024px) {
.button.expanded {
margin-left: 15px;
}
}
.footer-separator{
flex-grow: 0;
}
Expand All @@ -270,4 +265,4 @@ $primary-rgb: 82,172,170;
}
}

@import "decidim/application";
@import "decidim/application";
16 changes: 16 additions & 0 deletions app/cells/decidim/progress_bar/show.erb
View file
@@ -0,0 +1,16 @@
<div id="<%= element_id %>" class="progress__bar<%= " progress__bar--vertical" unless small? %>">
<div class="progress__bar__title">
<span class="progress__bar__text"><%= t('.votes_count', count: progress) %></span>
</div>
<% if total != 0 %>
<div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> percent" aria-valuemax="100">
<div class="progress-meter progress__bar__bar--complete" style="width: <%= percentage %>%"></div>
<div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= percentage %>%);"></div>
</div>
<% if subtitle_text.present? %>
<div class="progress__bar__subtitle">
<%= subtitle_text %>
</div>
<% end %>
<% end %>
</div>
81 changes: 81 additions & 0 deletions app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
View file
@@ -0,0 +1,81 @@
<div class="field hashtags__container">
<%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
</div>

<div class="field hashtags__container">
<%= text_editor_for_proposal_body(form) %>
</div>

<% if @form.component_automatic_hashtags.any? %>
<div class="field">
<%= form.label :automatic_hashtags %>
<div class="checkboxes hashtags">
<% @form.component_automatic_hashtags.each do |hashtag| %>
<label>
<%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
</label>
<% end %>
</div>
</div>
<% end %>
<% if @form.component_suggested_hashtags.any? %>
<div class="field">
<%= form.label :suggested_hashtags %>
<div class="checkboxes hashtags">
<%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
end %>
</div>
</div>
<% end %>
<% if component_settings.geocoding_enabled? %>
<div class="field">
<%= form.check_box :has_address, checked: form_has_address? %>
</div>

<div class="field" id="address_input">
<%= form.text_field :address %>
</div>
<% end %>
<% if @form.categories&.any? %>
<div class="field">
<%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.proposals.edit.select_a_category") %>
</div>
<% end %>
<% if current_participatory_space.has_subscopes? %>
<div class="field">
<%= scopes_picker_field form, :scope_id %>
</div>
<% end %>
<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
<div class="field">
<%= user_group_select_field form, :user_group_id %>
</div>
<% end %>
<% if component_settings.attachments_allowed? && @proposal %>
<div id="photo-field">
<%= form.fields_for :attachment, @form.attachment do |nested_form| %>
<div class="field">
<%= nested_form.hidden_field :title, value: "Untitled" %>
</div>

<div class="field">
<%= nested_form.upload :file, optional: false %>
<% if @form.errors[:attachment].present? %>
<% @form.errors[:attachment].each do |message| %>
<small class="form-error is-visible">
<%= message %>
</small>
<% end %>
<% end %>
</div>
<% end %>
</div>
</div>
<% end %>
22 changes: 22 additions & 0 deletions app/views/decidim/proposals/proposals/_proposal_similar.html.erb
View file
@@ -0,0 +1,22 @@
<div class="column">
<article class="card card--proposal">
<div class="card__content">
<div class="card__header">
<%= link_to proposal, target: "_blank" do %>
<h5 class="card__title"><%= decidim_html_escape(present(proposal).title).html_safe %></h5>
<% end %>
<%= cell("decidim/coauthorships", proposal, has_actions: false, context: { current_user: current_user }) %>

<div class="tech-info tech-info--text-left">
<%= t("decidim.proposals.proposals.proposal.creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
</div>
<%= resource_reference(proposal, class: "tech-info--text-left") %>
</div>

<%== cell("decidim/proposals/proposal_m", proposal).badge %>

<p><%= truncate(present(proposal).body(strip_tags: true), length: 100) %></p>
<%= cell "decidim/tags", proposal, context: { extra_classes: ["tags--proposal"] } %>
</div>
</article>
</div>
18 changes: 18 additions & 0 deletions app/views/decidim/proposals/proposals/_proposals.html.erb
View file
@@ -0,0 +1,18 @@
<!-- Sort controls commented out
<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
<div class="column">
<%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
</div>
<div class="column">
<%= render partial: "decidim/shared/results_per_page" %>
</div>
</div>
-->
<div class="row small-up-1 medium-up-2 card-grid">
<%= render @proposals %>
</div>
<%= decidim_paginate @proposals %>
23 changes: 23 additions & 0 deletions app/views/decidim/proposals/proposals/compare.html.erb
View file
@@ -0,0 +1,23 @@
<div class="row">
<!-- Side wizard commented out
<%= render partial: "wizard_aside" %>
-->
<div class="columns large-6 small-centered">
<%= render partial: "wizard_header", locals: { callout_step_help_text_class: "warning" } %>
<% if @similar_proposals.presence %>
<div class="row small-up-1 card-grid">
<% @similar_proposals.each do |proposal| %>
<%= render partial: "proposal_similar", locals: { proposal: proposal } %>
<% end %>
</div>
<% end %>

<div class="row column text-center">
<%= link_to t(".continue"), complete_proposal_path(@proposal), class: "button small" %>
</div>
</div>
<!-- div commented out
<div class="columns large-3"></div>
-->
</div>
25 changes: 25 additions & 0 deletions app/views/decidim/proposals/proposals/complete.html.erb
View file
@@ -0,0 +1,25 @@
<div class="row">
<!-- Side wizard commented out
<%= render partial: "wizard_aside" %>
-->
<div class="columns large-6 small-centered">
<%= render partial: "wizard_header" %>

<div class="card">
<div class="card__content">
<%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
<%= render partial: "edit_form_fields", locals: { form: form } %>

<div class="actions">
<%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
</div>
<% end %>
</div>
</div>
</div>
<!-- Div commented out
<div class="columns large-3"></div>
-->
</div>

<%= javascript_include_tag "decidim/proposals/add_proposal" %>
27 changes: 27 additions & 0 deletions app/views/decidim/proposals/proposals/edit_draft.html.erb
View file
@@ -0,0 +1,27 @@
<div class="row">
<!-- Side wizard commented out
<%= render partial: "wizard_aside" %>
-->
<div class="columns large-6 small-centered">
<%= render partial: "wizard_header" %>

<div class="card">
<div class="card__content">
<%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
<%= render partial: "edit_form_fields", locals: { form: form } %>

<div class="row column flex-center">
<%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %>
<%= form.submit t(".send"), class: "button button--nomargin small", data: { disable: true } %>
</div>
<% end %>
</div>
</div>
</div>
<!-- div commented out
<div class="columns large-3"></div>
-->
</div>

<%= javascript_include_tag "decidim/proposals/add_proposal" %>
80 changes: 80 additions & 0 deletions app/views/decidim/proposals/proposals/index.html.erb
View file
@@ -0,0 +1,80 @@
<%= render partial: "decidim/shared/component_announcement" %>
<% if component_settings.geocoding_enabled? %>
<%= dynamic_map_for proposals_data_for_map(@proposals.select(&:geocoded?)) do %>
<template id="marker-popup">
<div class="map-info__content">
<h3>${title}</h3>
<div id="bodyContent">
<p>{{html body}}</p>
<div class="map__date-adress">
<div class="address card__extra">
<div class="address__icon">{{html icon}}</div>
<div class="address__details">
<span>${address}</span><br>
</div>
</div>
</div>
<div class="map-info__button">
<a href="${link}" class="button button--sc">
<%= t(".view_proposal") %>
</a>
</div>
</div>
</div>
</template>
<%= stylesheet_link_tag "decidim/map" %>
<%= javascript_include_tag "decidim/map" %>
<% end %>
<% end %>
<div class="row columns mb-sm" style="text-align: center;">
<% 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 large", data: { "redirect_url" => new_proposal_path } do %>
<%= t(".new_proposal") %>
<%= icon "plus" %>
<% end %>
<% else %>
<span class="title-action__action button large hollow disabled">
<%= t(".new_proposal") %>
<%= icon "plus" %>
</span>
<% end %>
</div>
<div class="row columns">
<div class="title-action">
<h2 id="proposals-count" class="title-action__title section-heading">
<%= render partial: "count" %>
</h2>
<% 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>
<!-- Filters commented out
<div class="row">
<div class="columns mediumlarge-12 large-12">
<%= render partial: "filters_small_view" %>
<div class="card card--secondary show-for-mediumlarge">
<%= render partial: "filters" %>
</div>
</div>
</div>
-->
<div class="row">
<div id="proposals" class="columns mediumlarge-12 large-12">
<%= render partial: "proposals" %>
</div>
</div>
<!-- Link commented out
<div class="row">
<div class="text-right">
<%= link_to t(".see_all_withdrawn"), proposals_path("filter[state][]" => "withdrawn") %>
</div>
</div>
-->
<%= javascript_include_tag("decidim/filters") %>
<%= javascript_include_tag "decidim/orders" %>
37 changes: 37 additions & 0 deletions app/views/decidim/proposals/proposals/new.html.erb
View file
@@ -0,0 +1,37 @@
<div class="row">
<!-- Side wizard commented out
<%= render partial: "decidim/proposals/proposals/wizard_aside" %>
-->
<div class="columns large-6 small-centered">
<%= render partial: "decidim/proposals/proposals/wizard_header" %>

<div class="card">
<div class="card__content">
<%= decidim_form_for(@form) do |form| %>
<div class="field hashtags__container">
<%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
</div>

<div class="field hashtags__container">
<%= text_editor_for_proposal_body(form) %>
</div>

<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
<div class="field">
<%= user_group_select_field form, :user_group_id %>
</div>
<% end %>

<div class="actions">
<%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
</div>
<% end %>
</div>
</div>
</div>
<!-- No need for this div
<div class="columns large-3"></div>
-->
</div>

<%= javascript_include_tag "decidim/proposals/add_proposal" %>

0 comments on commit 537dcea

Please sign in to comment.