decidim-decidim_awesome 0.6.7 → 0.8.1

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

@@ -0,0 +1,101 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column hashtags__container">
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
+    </div>
+
+    <div class="row column hashtags__container">
+      <%= render partial: "decidim/decidim_awesome/admin/proposals/editor", locals: { form: 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 @form.meetings %>
+      <div class="meeting-fields">
+        <div class="row column">
+          <%= form.check_box :created_in_meeting, label: t(".created_in_meeting") %>
+        </div>
+
+        <div class="row column" id="proposal_meeting">
+          <%= form.select :meeting_id,
+                          options_for_select(@form.meetings&.map { |meeting| [present(meeting).title, meeting.id] }, selected: meetings_as_authors_selected ),
+                          { include_blank: true, label: t(".select_a_meeting") },
+                          { multiple: false, class: "chosen-select" } %>
+        </div>
+      </div>
+    <% end %>
+
+    <% if @form.geocoding_enabled? %>
+      <div class="row column">
+        <%= form.geocoding_field :address %>
+      </div>
+    <% end %>
+
+    <% if @form.categories&.any? %>
+      <div class="row column">
+        <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
+      </div>
+    <% end %>
+
+    <% if current_component.has_subscopes? %>
+      <div class="row column">
+        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
+      </div>
+    <% end %>
+
+    <% if component_settings.attachments_allowed? %>
+      <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
+    <% end %>
+
+    <% if component_settings.attachments_allowed? %>
+      <div class="row column">
+        <fieldset>
+          <legend><%= t(".attachment_legend") %></legend>
+          <%= form.fields_for :attachment, @form.attachment do |form| %>
+            <div class="row column">
+              <%= form.text_field :title %>
+            </div>
+
+            <div class="row column">
+              <%= form.upload :file, optional: false %>
+              <% if params[:id].present? %>
+                <% if proposal.documents.present? %>
+                  <%= form.hidden_field :id, value: proposal.documents.first.id %>
+                  <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        </fieldset>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<%= javascript_pack_tag "decidim_proposals_admin" %>

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -0,0 +1,83 @@
+<%= form_required_explanation %>
+
+<div class="field hashtags__container">
+  <%= form.text_field :title, class: "js-hashtags", 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, nil, for: nil %>
+    <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 @form.geocoding_enabled? %>
+  <div class="field">
+    <%= form.check_box :has_address, checked: form_has_address? %>
+  </div>
+
+  <div class="field" id="address_input">
+    <%= form.geocoding_field :address %>
+  </div>
+<% end %>
+
+<% if @form.categories&.any? %>
+  <div class="field">
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
+  </div>
+<% end %>
+
+<% if current_component.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
+  </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? %>
+  <fieldset>
+    <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
+    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
+      <div class="field">
+        <%= nested_form.text_field :title %>
+      </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 %>
+  </fieldset>
+<% end %>

data/app/views/decidim/proposals/collaborative_drafts/show.html.erb

@@ -0,0 +1 @@
+<%= render partial: "#{version_prefix}/decidim/proposals/collaborative_drafts/show" %>

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

@@ -1,3 +1,7 @@
+<% def icon_aria_selected_link_to(text, link, icon_name, options = {})
+  aria_selected_link_to(safe_join([icon(icon_name), text]), link, options)
+end %>
+
 <% content_for :secondary_nav do %>
   <div class="secondary-nav">
     <div class="secondary-nav__title">
@@ -5,39 +9,53 @@
     </div>
 
     <ul>
-      <% if config_enabled?([:allow_images_in_full_editor, :allow_images_in_small_editor, :use_markdown_editor,
-:allow_images_in_markdown_editor]) %>
+      <% if menus[:editors] %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:editors)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:editors) %>
+          <%= icon_aria_selected_link_to I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:editors), "text" %>
+        </li>
+      <% end %>
+      <% if menus[:proposals] %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
+          <%= icon_aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals), "document" %>
         </li>
       <% end %>
-      <% if config_enabled? :auto_save_forms %>
+      <% if menus[:surveys] %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:surveys)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys) %>
+          <%= icon_aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys), "spreadsheet" %>
         </li>
       <% end %>
-      <% if config_enabled? :scoped_styles %>
+      <% if menus[:styles] %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:styles)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles) %>
+          <%= icon_aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles), "brush" %>
         </li>
       <% end %>
-      <% if config_enabled? :allow_images_in_proposals %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals) %>
+      <% if menus[:proposal_custom_fields] %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)) %> class="is-active" <% end %>>
+          <%= icon_aria_selected_link_to I18n.t("menu.proposal_custom_fields", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposal_custom_fields), "layers" %>
         </li>
       <% end %>
-      <% if config_enabled?([:intergram_for_admins, :intergram_for_public]) %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:livechat)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat) %>
+      <% if menus[:admins] %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:admins)) %> class="is-active" <% end %>>
+          <%= icon_aria_selected_link_to I18n.t("menu.admins", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:admins), "people" %>
         </li>
       <% end %>
-      <% if config_enabled? :menu %>
+      <% if menus[:menu_hacks] %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path %>
+          <%= icon_aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path, "menu" %>
+        </li>
+      <% end %>
+      <% if menus[:custom_redirects] %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.custom_redirects_path) %> class="is-active" <% end %>>
+          <%= icon_aria_selected_link_to I18n.t("menu.custom_redirects", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.custom_redirects_path, "share-boxed" %>
+        </li>
+      <% end %>
+      <% if menus[:livechat] %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:livechat)) %> class="is-active" <% end %>>
+          <%= icon_aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat), "chat" %>
         </li>
       <% end %>
       <li <% if is_active_link?(decidim_admin_decidim_awesome.checks_path) %> class="is-active" <% end %>>
-        <%= aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path %>
+        <%= icon_aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path, "pulse" %>
       </li>
     </ul>
   </div>

data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb

@@ -1,6 +1,8 @@
 <script>
 window.DecidimAwesome = <%= javascript_config_vars %>;
+window.DecidimAwesome.version = "<%= Decidim::DecidimAwesome::VERSION %>";
 window.DecidimAwesome.editor_uploader_path = "<%= decidim_decidim_awesome.editor_images_path %>";
+window.DecidimAwesome.rename_scope_label_path = "<%= decidim_admin_decidim_awesome.rename_scope_label_path %>";
 window.DecidimAwesome.texts = {
   "drag_and_drop_image": "<%= j t(".drag_and_drop_image") %>",
   "autosaved_success": "<%= j t(".autosaved_success") %>",

data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb

@@ -1,3 +1,3 @@
 <style media="all">
-  <%= awesome_custom_styles %>
+  <%== awesome_custom_styles.join("\n").html_safe %>
 </style>

data/app/views/v0.25/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -0,0 +1,128 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+<% add_decidim_meta_tags({
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
+  url: collaborative_draft_url(@collaborative_draft.id)
+}) %>
+
+<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+  <div class="row">
+    <div class="columns">
+      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
+    </div>
+  </div>
+<% end %>
+
+<div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to collaborative_drafts_path do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
+    <% end %>
+  </div>
+
+  <h2 class="heading2">
+    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
+  </h2>
+
+  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
+</div>
+
+<div class="row">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= render_proposal_body(@collaborative_draft) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
+      <% end %>
+
+      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
+    </div>
+  </div>
+
+  <div class="columns section view-side mediumlarge-4 large-3">
+    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+      <div class="card text-center" id="collaborative_draft_publish">
+        <div class="card__content">
+          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
+          <div class="text-small">
+            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
+            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="card text-center">
+      <div class="card__content">
+        <% if @collaborative_draft.published? %>
+          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
+        <% else %>
+          <div>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
+          </div>
+
+          <div>
+            <span class="text-medium">
+              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
+            </span>
+          </div>
+        <% end %>
+
+        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+        <% end %>
+
+        <%= render "request_access_form" %>
+
+        <% if @collaborative_draft.requesters.include? current_user %>
+          <button type="button" class="button expanded button--sc mt-s">
+            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
+          </button>
+        <% end %>
+      </div>
+
+      <div class="card__status">
+        <ul class="card-data">
+          <li class="card-data__item authors_status">
+            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+            <% end %>
+          </li>
+
+          <li class="card-data__item versions_status">
+            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
+                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
+              <% end %>
+            <% end %>
+          </li>
+          <li class="card-data__item">
+            <%= link_to "#comments" do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
+              <% end %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <%= render partial: "collaborator_requests" %>
+
+    <%= resource_reference(@collaborative_draft) %>
+
+    <%= render partial: "decidim/shared/share_modal" %>
+  </div>
+</div>
+
+<%= attachments_for @collaborative_draft %>
+<%= comments_for @collaborative_draft %>
+
+<%= cell("decidim/flag_modal", @collaborative_draft) %>

data/app/views/{v0.23 → v0.25}/layouts/decidim/_head.html.erb

@@ -18,22 +18,24 @@
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
 <%= favicon %>
-<%= stylesheet_link_tag    "application", media: "all" %>
+<%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
-<%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
-<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>
+<%# awesome styles before custom colors %>
+<%= stylesheet_pack_tag "decidim_decidim_awesome", media: "all" %>
+<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles.present? %>
+<%# end awesome %>
 
 <%= organization_colors %>
-<%= javascript_include_tag "decidim/confirm" %>
-<%= javascript_include_tag "application" %>
-<%= foundation_datepicker_locale_tag %>
+<%= javascript_pack_tag "decidim_core", defer: false %>
+
+<%# awesome javascript after app %>
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
+<%= javascript_pack_tag "decidim_decidim_awesome", defer: false %>
+<%= javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+<%# end awesome %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
 <%= snippets.display(:head) %>
 <%= content_for :header_snippets %>
-
-<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
-<%= javascript_include_tag "decidim/decidim_awesome/application" %>

data/app/views/v0.25/layouts/decidim/admin/_header.html.erb

@@ -0,0 +1,11 @@
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<%= csrf_meta_tags %>
+<%= organization_colors %>
+
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
+
+<%= stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>
+<%= javascript_pack_tag "decidim_admin_decidim_awesome", defer: false %>
+<%= javascript_pack_tag("decidim_admin_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+
+<%= snippets.display(:head) %>

data/app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -0,0 +1,128 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+<% add_decidim_meta_tags({
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
+  url: collaborative_draft_url(@collaborative_draft.id)
+}) %>
+
+<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+  <div class="row">
+    <div class="columns">
+      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
+    </div>
+  </div>
+<% end %>
+
+<div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to collaborative_drafts_path do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
+    <% end %>
+  </div>
+
+  <h2 class="heading2">
+    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
+  </h2>
+
+  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
+</div>
+
+<div class="row">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= render_proposal_body(@collaborative_draft) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
+      <% end %>
+
+      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
+    </div>
+  </div>
+
+  <div class="columns section view-side mediumlarge-4 large-3">
+    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+      <div class="card text-center" id="collaborative_draft_publish">
+        <div class="card__content">
+          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
+          <div class="text-small">
+            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
+            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="card text-center">
+      <div class="card__content">
+        <% if @collaborative_draft.published? %>
+          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
+        <% else %>
+          <div>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
+          </div>
+
+          <div>
+            <span class="text-medium">
+              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
+            </span>
+          </div>
+        <% end %>
+
+        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+        <% end %>
+
+        <%= render "request_access_form" %>
+
+        <% if @collaborative_draft.requesters.include? current_user %>
+          <button type="button" class="button expanded button--sc mt-s">
+            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
+          </button>
+        <% end %>
+      </div>
+
+      <div class="card__status">
+        <ul class="card-data">
+          <li class="card-data__item authors_status">
+            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+            <% end %>
+          </li>
+
+          <li class="card-data__item versions_status">
+            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
+                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
+              <% end %>
+            <% end %>
+          </li>
+          <li class="card-data__item">
+            <%= link_to "#comments" do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
+              <% end %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <%= render partial: "collaborator_requests" %>
+
+    <%= resource_reference(@collaborative_draft) %>
+
+    <%= render partial: "decidim/shared/share_modal" %>
+  </div>
+</div>
+
+<%= attachments_for @collaborative_draft %>
+<%= comments_for @collaborative_draft %>
+
+<%= cell("decidim/flag_modal", @collaborative_draft) %>

data/app/views/{v0.22 → v0.26}/layouts/decidim/_head.html.erb

@@ -17,21 +17,29 @@
 <meta property="og:description" content="<%= decidim_meta_description %>">
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
+<% if current_organization.colors["theme"] %>
+  <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
+<% end %>
+
 <%= favicon %>
-<%= stylesheet_link_tag    "application", media: "all" %>
+<%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
-<%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
-<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>
+<%# awesome styles before custom colors %>
+<%= stylesheet_pack_tag "decidim_decidim_awesome", media: "all" %>
+<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles.present? %>
+<%# end awesome %>
 
 <%= organization_colors %>
-<%= javascript_include_tag "decidim/confirm" %>
-<%= javascript_include_tag "application" %>
-<%= foundation_datepicker_locale_tag %>
+<%= javascript_pack_tag "decidim_core", defer: false %>
+
+<%# awesome javascript after app %>
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
+<%= javascript_pack_tag "decidim_decidim_awesome", defer: false %>
+<%= javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+<%# end awesome %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
-
-<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
-<%= javascript_include_tag "decidim/decidim_awesome/application" %>
+<%= snippets.display(:head) %>
+<%= content_for :header_snippets %>

data/app/views/v0.26/layouts/decidim/admin/_header.html.erb

@@ -0,0 +1,11 @@
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<%= csrf_meta_tags %>
+<%= organization_colors %>
+
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
+
+<%= stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>
+<%= javascript_pack_tag "decidim_admin_decidim_awesome", defer: false %>
+<%= javascript_pack_tag("decidim_admin_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+
+<%= snippets.display(:head) %>