refactor modal & remove needless initialization scripts

Crashillo · Crashillo · commit abb3bc4f1d88 · 2023-05-05T09:25:45.000+02:00
diff --git a/decidim-core/app/packs/src/decidim/redesigned_index.js b/decidim-core/app/packs/src/decidim/redesigned_index.js
@@ -244,7 +244,9 @@ const initializer = (element = document) => {
       }),
       ...(Boolean(elem.querySelector(`#dialog-desc-${dialog}`)) && {
         describedby: `dialog-desc-${dialog}`
-      })
+      }),
+      // allow passing config setup from data-attributes
+      ...elem.dataset
     });
 
     // in order to use the Dialog object somewhere else
diff --git a/decidim-core/app/packs/stylesheets/decidim/_redesigned_modal.scss b/decidim-core/app/packs/stylesheets/decidim/_redesigned_modal.scss
@@ -30,7 +30,7 @@
   }
 
   [data-dialog-title]{
-    @apply text-2xl text-black font-semibold;
+    @apply text-2xl text-black font-semibold focus:outline-none;
   }
 
   [data-dialog-actions]{
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections.js b/decidim-elections/app/packs/entrypoints/decidim_elections.js
@@ -1,5 +1,4 @@
 import "src/decidim/elections/election_log";
-import "src/decidim/elections/onboarding";
 import "src/decidim/elections/trustee/key_ceremony";
 import "src/decidim/elections/trustee/tally";
 import "src/decidim/elections/trustee/trustee_zone";
diff --git a/decidim-elections/app/packs/src/decidim/elections/onboarding.js b/decidim-elections/app/packs/src/decidim/elections/onboarding.js
diff --git a/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb b/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb
@@ -1,25 +1,17 @@
-<div class="reveal" data-reveal id="onboarding-modal">
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t("decidim.elections.votes.onboarding_modal.title") %></h3>
-    <button class="close-button" data-close aria-label="<%= t("decidim.elections.votes.onboarding_modal.close") %>">
-      <span aria-hidden="true">&times;</span>
-    </button>
+<%= decidim_modal id: "onboarding-modal", data: { "is-open": true } do %>
+  <div data-dialog-container>
+    <%= icon "error-warning-line" %>
+    <h3 class="h3" id="dialog-title-onboarding-modal" data-dialog-title>
+      <%= t("decidim.elections.votes.onboarding_modal.title") %>
+    </h3>
+    <p id="dialog-desc-onboarding-modal"><%= t("decidim.elections.votes.onboarding_modal.description") %></p>
   </div>
-  <p>
-    <%= t("decidim.elections.votes.onboarding_modal.description") %>
-  </p>
-  <div class="row mt-sm">
-    <div class="columns medium-8 medium-offset-2">
-      <%= link_to decidim.new_user_registration_path, class: "button button--sc expanded" do %>
-        <%= t("decidim.elections.votes.onboarding_modal.create_account") %>
-      <% end %>
-      <div class="text-center">
-        <button class="link" data-close type="button"><%= t("decidim.elections.votes.onboarding_modal.no_account") %></button>
-      </div>
-    </div>
+  <div data-dialog-actions>
+    <button data-dialog-close="onboarding-modal" class="button button__sm md:button__lg button__transparent-secondary">
+      <%= t("decidim.elections.votes.onboarding_modal.no_account") %>
+    </button>
+    <%= link_to decidim.new_user_registration_path, class: "button button__sm md:button__lg button__secondary" do %>
+      <%= t("decidim.elections.votes.onboarding_modal.create_account") %>
+    <% end %>
   </div>
-</div>
-
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_elections" %>
 <% end %>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[data-dialog-title]{`
`33`		`- @apply text-2xl text-black font-semibold;`
	`33`	`+ @apply text-2xl text-black font-semibold focus:outline-none;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`[data-dialog-actions]{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import "src/decidim/elections/election_log";`
`2`		`-import "src/decidim/elections/onboarding";`
`3`	`2`	`import "src/decidim/elections/trustee/key_ceremony";`
`4`	`3`	`import "src/decidim/elections/trustee/tally";`
`5`	`4`	`import "src/decidim/elections/trustee/trustee_zone";`