decidim-decidim_awesome 0.10.2 → 0.11.2

data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb

@@ -1,13 +1,22 @@
-<%= decidim_form_for(@form, url: menu_hack_path, method: :patch, html: { class: :form }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: menu_hack_path(params[:menu_id]), method: :patch, html: { class: "form form-defaults" }) do |f| %>
+      <div class="card pt-4">
+        <div class="card-section">
+          <%= render partial: "form", object: f %>
+        </div>
+      </div>
+
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb

@@ -1,44 +1,41 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t(".title") %>
-      <%= link_to t(".new"), decidim_admin_decidim_awesome.new_menu_hack_path, class: "button tiny button--title" %>
-    </h2>
-  </div>
-  <div class="card-section">
-  <div class="row column decidim_awesome-form">
-    <table class="table-list">
-      <thead>
-        <tr>
-          <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
-          <th class="actions"></th>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".#{params[:menu_id]}.title") %>
+    <%= link_to t(".new"), decidim_admin_decidim_awesome.new_menu_hack_path, class: "button button__sm button__secondary ml-auto" %>
+  </h2>
+</div>
+<div class="table-scroll">
+  <table class="table-list">
+    <thead>
+      <tr>
+        <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
+        <th class="actions"><%= t("decidim.decidim_awesome.admin.actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% current_items.each do |item| %>
+        <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
+          <td><%= item.label %></td>
+          <td><%= item.url %></td>
+          <td><%= item.position %></td>
+          <td><%= target_options.invert[item.try(:target)||""] %></td>
+          <td><%= visibility_options.invert[item.try(:visibility)] %></td>
+          <td class="table-list__actions">
+            <%= icon_link_to "pencil-line", decidim_admin_decidim_awesome.edit_menu_hack_path(params[:menu_id], md5(item.url)), t(".edit"), class: "action-icon--edit" %>
+            <% if item.respond_to?(:overrided?) %>
+              <%= icon_link_to "close-circle-line", decidim_admin_decidim_awesome.menu_hack_path(params[:menu_id], md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+            <% else %>
+                <span class="action-icon">
+                  <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img" %>
+                </span>
+            <% end %>
+          </td>
         </tr>
-      </thead>
-      <tbody>
-        <% current_items.each do |item| %>
-          <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
-            <td><%= item.label %></td>
-            <td><%= item.url %></td>
-            <td><%= item.position %></td>
-            <td><%= target_options.invert[item.try(:target)||""] %></td>
-            <td><%= visibility_options.invert[item.try(:visibility)] %></td>
-            <td class="table-list__actions">
-              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_menu_hack_path(md5(item.url)), t(".edit"), class: "action-icon--edit" %>
-              <% if item.respond_to?(:overrided?) %>
-                <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.menu_hack_path(md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
-              <% else %>
-                  <span class="action-icon">
-                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
-                  </span>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
+      <% end %>
+    </tbody>
+  </table>
 </div>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb

@@ -1,13 +1,22 @@
-<%= decidim_form_for(@form, url: menu_hacks_path, html: { class: :form }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: menu_hacks_path(params[:menu_id]), html: { class: "form form-defaults" }) do |f| %>
+      <div class="card pt-4">
+        <div class="card-section">
+          <%= render partial: "form", object: f %>
+        </div>
+      </div>
+
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb

@@ -1,6 +1,9 @@
-<%= admin_editor_for_proposal_body(form) %>
-<% unless awesome_proposal_custom_fields.blank? %>
-  <div class="proposal_custom_field">
-    <div class="loading-spinner"></div>
-  </div>
+<% if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) && editor = admin_editor_for_proposal_body(form) %>
+  <%= editor %>
+<% else %>
+  <%= form.translated :editor, :body, hashtaggable: true, aria: { label: :body } %>
+<% end %>
+
+<% if Decidim::DecidimAwesome.enabled?(:proposal_private_custom_fields) && private_custom_fields = awesome_proposal_custom_fields_for(:private_body) %>
+  <%= render_proposal_custom_fields_override(private_custom_fields, form, :private_body) if private_custom_fields.present? %>
 <% end %>

data/app/views/decidim/decidim_awesome/admin/proposals/_private_body.html.erb

@@ -0,0 +1,20 @@
+<div class="card-section" data-component="accordion" id="accordion-private_body">
+  <button class="card-divider-button" data-controls="panel-private_body" type="button">
+    <%= icon "arrow-right-s-line" %>
+    <h2 class="card-title">
+      <%= t "decidim.decidim_awesome.admin.proposal_custom_fields.private_body" %>
+    </h2>
+  </button>
+  <div id="panel-private_body">
+    <div class="component__show_private_data-grid">
+      <div><%= Decidim::ContentProcessor.render_without_format(render_sanitized_content(proposal, :private_body)).html_safe %></div>
+      <% if proposal&.extra_fields&.private_body_updated_at %>
+        <div class="date_info">
+          <%= t("decidim.decidim_awesome.admin.proposal_custom_fields.private_data_last_update", time_ago: time_ago_in_words(proposal.extra_fields.private_body_updated_at)) if proposal.extra_fields.private_body.present? %>
+          <%= t("decidim.decidim_awesome.admin.proposal_custom_fields.private_data_last_remove", time_ago: time_ago_in_words(proposal.extra_fields.private_body_updated_at)) if proposal.extra_fields.private_body.blank? %>
+          <%= link_to t("decidim.decidim_awesome.admin.proposal_custom_fields.remove_private_data"), decidim_admin_decidim_awesome.maintenance_path(:private_data) if proposal.extra_fields.private_body_updated_at && proposal.extra_fields.private_body_updated_at < Decidim::DecidimAwesome.private_data_expiration_time.ago %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb

@@ -1,41 +1,42 @@
-<div class="filters__section">
-  <div class="fcell filter">
+<div class="filters__section p-4 flex mb-0">
+  <div class="fcell filter self-start">
     <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
       <li>
-        <a href="#" class="dropdown button">
+        <a href="#" class="dropdown button button__sm button__secondary">
           <%= t("filter_label", scope: "decidim.admin.filters") %>
+          <%= icon "arrow-down-s-fill", class: "dropdown-filter-icon" %>
         </a>
         <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
       </li>
     </ul>
   </div>
   <div class="fcell search">
-    <%= search_form_for(query, url: url_for) do |form| %>
+    <%= search_form_for(query, url: url_for, html: { class: "form-defaults form" }) do |form| %>
       <%= applied_filters_hidden_field_tags %>
-      <div class="input-group">
+      <div class="input-group flex items-center">
         <%= form.search_field(
               search_field_predicate,
-              class: "input-group-field",
+              class: "input-group-field shadow-md border-alert",
               label: false,
               placeholder: t(search_field_predicate,
                              collection: collection_name,
                              scope: "decidim.admin.filters.search_placeholder")
             ) %>
         <div class="input-group-button">
-          <button type="submit" class="button">
-            <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
+          <button type="submit" class="text-secondary py-2 px-4 rounded-r focus:outline-none outline-none">
+            <%= icon "search-line", class: "fill-secondary w-4 h-4", aria_label: t("search_label", scope: "decidim.admin.filters") %>
           </button>
         </div>
       </div>
-      <div class="input-group mt-xs">
-        <div class="input-group-field">
+      <div class="input-group flex mt-4 w-full justify-center">
+        <div class="input-group-field flex flex-col w-full">
           <%= form.label t("search_field_start_date", scope: "decidim.admin.filters.label") %>
           <%= form.date_field(:created_at_gteq,
                               class: "input-group-field",
                               label: false,
                               datepicker: true) %>
         </div>
-        <div class="input-group-field">
+        <div class="input-group-field flex flex-col w-full">
           <%= form.label t("search_field_end_date", scope: "decidim.admin.filters.label") %>
           <%= form.date_field(:created_at_lteq,
                               class: "input-group-field",
@@ -46,11 +47,6 @@
     <% end %>
   </div>
 </div>
-<div class="card-section fcell grid-x">
-  <div class="cell medium-10 filter-status">
-    <%= applied_filters_tags(i18n_ctx) %>
-  </div>
-  <div class="cell auto text-right">
-    <%= admin_filters_pagination %>
-  </div>
+<div class="fcell grid-x" data-applied-filters-tags>
+  <%= applied_filters_tags(i18n_ctx) %>
 </div>

data/app/views/decidim/decidim_awesome/amendments/_modal.html.erb

@@ -0,0 +1,23 @@
+<!--the modal window will be used in another pr-->
+<%= decidim_modal id: "LimitAmendmentsModal", data: { "limit-amendments": current_component.settings&.limit_pending_amendments } do %>
+  <div data-dialog-container>
+    <%= icon "notification-3-fill" %>
+    <h3 data-dialog-title><%= t("decidim.decidim_awesome.amendments.modal.amendment_exists") %></h3>
+
+    <div>
+      <div class="instructions">
+        <%= t("decidim.decidim_awesome.amendments.modal.explanation_html",
+                                    proposal_link: present(@proposal).proposal_path + "#comments") %>
+
+        <% emendations = @proposal.emendations.not_hidden.where(decidim_amendments: { state: Decidim::Amendment.states["evaluating"] }) %>
+        <% if current_component.current_settings&.amendments_visibility == "all" && emendations %>
+          <%= t("decidim.decidim_awesome.amendments.modal.current_amendment_html",
+                                        amendment_link: present(emendations&.first).proposal_path) %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div data-dialog-actions>
+    <button type="button" class="button button__sm md:button__lg button__transparent-secondary cancel-action" data-dialog-close="LimitAmendmentsModal"><%= t("decidim.decidim_awesome.amendments.modal.dismiss") %></button>
+  </div>
+<% end %>

data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb

@@ -1,6 +1,12 @@
-<div class="proposal_custom_field" id="proposa-custom-field-<%= name %>" data-spec="<%= spec.to_json %>" data-name="<%= "#{form.object_name}[#{name}]" %>">
-  <div class="loading-spinner"></div>
+<div class="decidim_awesome-custom_fields <%= name %>">
+  <% if name == :private_body %>
+    <p class="private_body-disclosure help-text"><%= icon "spy" %><%= t("decidim.decidim_awesome.proposal_private_custom_fields_disclosure") %></p>
+  <% end %>
+  <div class="proposal_custom_field proposal_custom_field--<%= name %>" id="proposal-custom-field-<%= name %>" data-spec="<%= spec.to_json %>" data-editor-options="<%= editor_options[:editor].to_json %>" data-name="<%= "#{form.object_name}[#{name}]" %>">
+    <div class="loading-spinner"></div>
+  </div>
 </div>
 
+<%= editor_upload.html_safe %>
 <%= form.hidden_field name %>
 <%= form.error_for name %>

data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb

@@ -1,14 +1,9 @@
-<%= announcement = render(partial: "decidim/shared/component_announcement") %>
+<main class="participatory-space__container">
+  <%= announcement = render(partial: "decidim/shared/component_announcement") %>
 
-<%= stylesheet_pack_tag "decidim_decidim_awesome_iframe" %>
+  <%= append_stylesheet_pack_tag "decidim_decidim_awesome_iframe" %>
 
-<style rel="stylesheet" type="text/css">
-<% if remove_margins? %>
-  <%= ".wrapper { padding-left: 0;padding-right: 0;padding-bottom: 0; }" %>
-  <%= ".wrapper { padding-top: 0; }" unless announcement.present? %>
-<% end %>
-</style>
-
-<div class="awesome-iframe<%= " row" if viewport_width? %>">
-  <%= iframe %>
-</div>
+  <section id="<%= viewport_width? ? "iframe-block" : "html-block-html" %>" class="awesome-iframe layout-main__section">
+    <%= iframe %>
+  </section>
+</main>

data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb

@@ -1,59 +1,72 @@
 <div class="loading-spinner"></div>
 
 <script id="marker-proposal-popup" type="text/x-jsrender">
-  <div class="map-info__content">
-    <h3>{{:title.translation}}</h3>
-    <div id="bodyContent">
-      <div class="description">{{:body.translation}}</div>
-      <div class="map__date-adress">
-        <div class="address card__extra">
-          <div class="address__icon">{{:icon}}</div>
-          <div class="address__details">
-            <span>{{>address}}</span><br>
+  <div class="space-y-6">
+    <div class="card__list">
+      <div class="card__list-content">
+        <a href="{{>link}}" target="proposal">
+          <h3 class="h4 card__list-title">{{:title.translation}}</h3>
+          <div class="card__list-metadata">
+            <span>
+              <%= icon "account-circle-line" %>
+              {{:authorName}}
+            </span>
+            <span>
+              <%= icon "wechat-line" %>
+              {{:totalCommentsCount}}
+            </span>
+            <span>
+              <%= icon "like" %>
+              {{:endorsementsCount}}
+            </span>
+            <span>
+              <span class="label {{:stateClass}}">{{:humanState}}</span>
+            </span>
+            {{if isAmendment() }}
+              <span>
+                <%= icon "other" %>
+                <%= t("activerecord.models.decidim/amendment", count: 1) %>
+              </span>
+            {{/if}}
           </div>
-        </div>
-      </div>
-      <div class="map-info__button">
-        <a href="{{>link}}" class="button button--sc">
-          <%= t("view_proposal", scope: "decidim.decidim_awesome.map_component.map.show") %>
+          <div class="text-sm">{{>address}}</div>
         </a>
+        <div class="description">
+         <div>{{:body.translation}}</div>
+       </div>
       </div>
     </div>
   </div>
 </script>
 
 <script id="marker-meeting-popup" type="text/x-jsrender">
-  <div class="map-info__content">
-    <h3>{{:title.translation}}</h3>
-    <div id="bodyContent">
-      <div class="description">{{:body.translation}}</div>
-      <div class="map__date-adress">
-        <div class="card__datetime">
-          <div class="card__datetime__date">
-            {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
-          </div>
-          <div class="card__datetime__time">{{>starTime}}</div>
-        </div>
-        <div class="address card__extra">
-          <div class="address__icon">{{:icon}}</div>
-          <div class="address__details">
-            <strong>{{:location.translation}}</strong><br>
-            <span>{{>address}}</span><br>
-            <span>{{:locationHints.translation}}</span>
+  <div class="space-y-6">
+    <div class="card__list">
+      <div class="card__list-content">
+        <a href="{{>link}}" target="meeting">
+          <h3 class="h4 card__list-title">{{:title.translation}}</h3>
+          <div class="card__list-metadata">
+            <span>
+              <%= icon "calendar-line" %>
+              {{:dateRange}}
+            </span>
+            <span>
+              <%= icon "{{:icon}}", ignore_missing: true %>
+              {{:meetingType}}
+            </span>
           </div>
-        </div>
-      </div>
-      <div class="map-info__button">
-        <a href="{{>link}}" class="button button--sc">
-          <%= t("view_meeting", scope: "decidim.meetings.meetings_map") %>
+          <div class="text-sm">{{>address}}</div>
         </a>
+        <div class="description">
+         {{:body.translation}}
+       </div>
       </div>
     </div>
   </div>
 </script>
 
 <style type="text/css">
-  #awesome-map .google-map, .wrapper #awesome-map .google-map {
+  #awesome-map .dynamic-map {
     height: <%= map_height %>px;
   }
   <% current_categories(categories).each do |category| %>
@@ -65,4 +78,7 @@
 <script>
   window.AwesomeMap = window.AwesomeMap || {};
   window.AwesomeMap.categories = <%= current_categories(categories).to_json.html_safe %>;
+  window.AwesomeMapProposalTexts = <%= Decidim::Proposals::Proposal::STATES.to_h { |state, _| [state, t("decidim.proposals.answers.#{state}")] }.to_json.html_safe %>;
+  window.AwesomeMapMeetingTypes = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, Decidim.icons.all[type.to_s]["icon"]] }.to_json.html_safe %>;
+  window.AwesomeMapMeetingTexts = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, t("decidim.meetings.meetings.filters.type_values.#{type}")] }.to_json.html_safe %>;
 </script>

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -1,7 +1,16 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<main class="participatory-space__container">
+  <% announcement = translated_attribute(current_settings.announcement).presence || translated_attribute(component_settings.announcement).presence %>
+  <% if strip_tags(announcement).present? %>
+    <section>
+      <%= cell("decidim/announcement", announcement, local_assigns.merge(callout_class: "editor-content")) %>
+    </section>
+  <% end %>
 
-<%= render partial: "api_ready" %>
+  <%= render partial: "api_ready" %>
 
-<%= awesome_map_for map_components do %>
-  <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
-<% end %>
+  <section id="map-block" class="awesome-iframe layout-main__section">
+    <%= awesome_map_for map_components do %>
+      <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
+    <% end %>
+  </section>
+</main>

data/app/views/decidim/decidim_awesome/voting/voting_cards/_show_vote_button.html.erb

@@ -1,6 +1,3 @@
 <div class="voting-voting_cards">
   <%= cell("decidim/decidim_awesome/voting/voting_cards_proposal", proposal, from_proposals_list: true) %>
-  <% if current_component.settings.voting_cards_show_modal_help %>
-    <%= cell("decidim/decidim_awesome/voting/voting_cards_proposal_modal", proposal) %>
-  <% end %>
 </div>

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

@@ -2,21 +2,23 @@
 window.DecidimAwesome = <%= javascript_config_vars %>;
 window.DecidimAwesome.currentLocale = "<%= current_locale %>";
 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.editorUploaderPath = "<%= decidim_decidim_awesome.editor_images_path %>";
+window.DecidimAwesome.renameScopeLabelPath = "<%= 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") %>",
-  "autosaved_error": "<%= j t(".autosaved_error") %>",
-  "autosaved_retrieved": "<%= j t(".autosaved_retrieved") %>",
+  "dragAndDropImage": "<%= j t(".drag_and_drop_image") %>",
+  "autosavedSuccess": "<%= j t(".autosaved_success") %>",
+  "autosavedError": "<%= j t(".autosaved_error") %>",
+  "autosavedRetrieved": "<%= j t(".autosaved_retrieved") %>",
   "categories": "<%= j t(".categories") %>",
   "hashtags": "<%= j t(".hashtags") %>",
   "proposals": "<%= j t(".proposals") %>",
   "meetings": "<%= j t(".meetings") %>",
   "amendments": "<%= j t(".amendments") %>",
   "items": "<%= j t(".items") %>",
-  "select_deselect_all": "<%= j t(".select_deselect_all") %>"
+  "selectDeselectAll": "<%= j t(".select_deselect_all") %>",
+  "officialAuthor": "<%= j t("decidim.blogs.models.post.fields.official_blog_post") %>",
 }
+window.DecidimAwesome.formBuilderLangsLocation = "<%= j Decidim::DecidimAwesome.form_builder_langs_location %>";
 <% if defined?(questionnaire) && questionnaire&.id %>
   window.DecidimAwesome.current_questionnaire = "edit_questionnaire_<%= questionnaire.id %>";
   <% if defined? visitor_already_answered? %>

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

@@ -1,16 +1,19 @@
 <script>
-  window.intergramId = "<%= j (settings[:chat_id]).html_safe %>";
-
-  window.intergramOnOpen = {};
-  window.intergramOnOpen.visitorName = "<%= j current_user&.nickname %>";
+  window.intergramId = "<%= j (settings[:chat_id])&.html_safe %>";
+  window.intergramOnOpen = {
+    visitorName: "<%= j current_user&.nickname %>"
+  };
   window.intergramCustomizations = {
     titleClosed: "<%= j (settings[:title_closed].presence || t("decidim.decidim_awesome.config.intergram.title_closed")).html_safe %>",
     titleOpen: "<%= j (settings[:title_open].presence || t("decidim.decidim_awesome.config.intergram.title_open")).html_safe %>",
     introMessage: "<%= j (settings[:intro_message].presence || t("decidim.decidim_awesome.config.intergram.intro_message")).html_safe %>",
     autoResponse: "<%= j (settings[:auto_response].presence || t("decidim.decidim_awesome.config.intergram.auto_response")).html_safe %>",
     autoNoResponse: "<%= j (settings[:auto_no_response].presence || t("decidim.decidim_awesome.config.intergram.auto_no_response")).html_safe %>",
-    mainColor: "<%= j (settings[:color].presence || "#E91E63").html_safe %>",
+    mainColor: "<%= j (settings[:color].presence || (current_organization.colors && current_organization.colors["primary"]) || "#E91E63").html_safe %>",
     alwaysUseFloatingButton: <%= settings[:use_floating_button] ? "true" : "false" %> // Use the mobile floating button also on large screens
   };
 </script>
-<script id="intergram" type="text/javascript" src="<%= awesome_config[:intergram_url] %>"></script>
+
+<% if settings[:chat_id].present? %>
+  <script id="intergram" type="text/javascript" src="<%= awesome_config[:intergram_url] %>"></script>
+<% end %>

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

@@ -0,0 +1,12 @@
+<% add_secondary_root_menu(:awesome_admin_menu) %>
+
+<%= append_stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>
+<%= append_javascript_pack_tag "decidim_admin_decidim_awesome", defer: true %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+
+  <div class="pokecode-credits"><%= t("credits", scope: "decidim.decidim_awesome", version: link_to(awesome_version, "https://github.com/decidim-ice/decidim-module-decidim_awesome/"), company: link_to("PokeCode", "https://pokecode.net")).html_safe %></div>
+<% end %>
+
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>