From b26a012046726f2aa7034d21a3dd2332b690b2c9 Mon Sep 17 00:00:00 2001 From: Brandon Hundt Date: Tue, 25 Jul 2023 15:31:14 -0500 Subject: [PATCH] fix(sticky): move around html to support modals --- app/views/episodes/_form.html.erb | 5 +- app/views/episodes/_form_status.html.erb | 126 +++++++++--------- app/views/feeds/_form.html.erb | 7 +- app/views/feeds/_form_status.html.erb | 60 +++++---- app/views/podcast_engagement/_form.html.erb | 6 +- .../podcast_engagement/_form_status.html.erb | 24 ++-- app/views/podcasts/_form.html.erb | 6 +- app/views/podcasts/_form_status.html.erb | 64 ++++----- 8 files changed, 149 insertions(+), 149 deletions(-) diff --git a/app/views/episodes/_form.html.erb b/app/views/episodes/_form.html.erb index f0fe4b447..22e92d424 100644 --- a/app/views/episodes/_form.html.erb +++ b/app/views/episodes/_form.html.erb @@ -15,10 +15,7 @@
-
- <%= render "form_status", episode: episode, form: form %> - <%= render "form_distribution", episode: episode, form: form %> -
+ <%= render "form_status", episode: episode, form: form %>
<% end %> diff --git a/app/views/episodes/_form_status.html.erb b/app/views/episodes/_form_status.html.erb index fd77e2689..36481d432 100644 --- a/app/views/episodes/_form_status.html.erb +++ b/app/views/episodes/_form_status.html.erb @@ -1,81 +1,85 @@ -
-
-
<%= t(".title_#{episode.publishing_status_was}") %>
-
+
+
+
+
<%= t(".title_#{episode.publishing_status_was}") %>
+
-
-
-
- <% invalid_class = episode.errors[:base].present? ? "is-invalid" : "" %> +
+
+
+ <% invalid_class = episode.errors[:base].present? ? "is-invalid" : "" %> - <% if episode.publishing_status_was == 'published' %> - <%= form.hidden_field :publishing_status, value: "published" %> -
-

- <%= t("helpers.label.episode.publishing_statuses.published") %> -

-
- <% else %> - <%= form.select :publishing_status, episode_publishing_status_options, {}, class: "form-select #{invalid_class}" %> - <% end %> + <% if episode.publishing_status_was == 'published' %> + <%= form.hidden_field :publishing_status, value: "published" %> +
+

+ <%= t("helpers.label.episode.publishing_statuses.published") %> +

+
+ <% else %> + <%= form.select :publishing_status, episode_publishing_status_options, {}, class: "form-select #{invalid_class}" %> + <% end %> - <%= form.label :publishing_status, class: invalid_class %> + <%= form.label :publishing_status, class: invalid_class %> - <% if episode.errors[:base].present? %> -
<%= episode.errors[:base].to_sentence.capitalize %>
- <% end %> + <% if episode.errors[:base].present? %> +
<%= episode.errors[:base].to_sentence.capitalize %>
+ <% end %> +
-
-
-
- <%= form.time_field :released_at, value: episode.published_or_released_date %> - <%= form.label :released_at %> +
+
+ <%= form.time_field :released_at, value: episode.published_or_released_date %> + <%= form.label :released_at %> +
-
-
- <% if episode.persisted? %> -

<%= t(".updated_at_hint") %>
<%= l(episode.updated_at) %>

+
+ <% if episode.persisted? %> +

<%= t(".updated_at_hint") %>
<%= l(episode.updated_at) %>

- <% if policy(episode).update? %> -
- <%= link_to t(".discard"), edit_episode_path(episode), class: "btn btn-discard-changed invisible", data: {action: "unsaved#discard", unsaved_target: "discard"} %> + <% if policy(episode).update? %> +
+ <%= link_to t(".discard"), edit_episode_path(episode), class: "btn btn-discard-changed invisible", data: {action: "unsaved#discard", unsaved_target: "discard"} %> -
- <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> - <%= form.submit t(".update"), class: "btn btn-#{episode_status_class(episode)}", data: data %> +
+ <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> + <%= form.submit t(".update"), class: "btn btn-#{episode_status_class(episode)}", data: data %> - <% if episode.published? || policy(episode).destroy? %> - -
    - <% if episode.published? && !episode.published_at_changed? %> -
  • <%= link_to t(".unpublish"), episode_path(episode, episode: {publishing_status: "draft"}), method: :put, class: "dropdown-item bg-danger text-white" %>
    • - <% elsif policy(episode).destroy? %> -
  • - -
    • - <% end %> -
- <% end %> + <% if episode.published? || policy(episode).destroy? %> + +
    + <% if episode.published? && !episode.published_at_changed? %> +
  • <%= link_to t(".unpublish"), episode_path(episode, episode: {publishing_status: "draft"}), method: :put, class: "dropdown-item bg-danger text-white" %>
    • + <% elsif policy(episode).destroy? %> +
  • + +
    • + <% end %> +
+ <% end %> +
-
- <% end %> + <% end %> - <% else %> -

<%= t(".new_hint") %>

+ <% else %> +

<%= t(".new_hint") %>

- <% if policy(episode).create? %> - <% data = {disable_with: t(".creating"), upload_with: t(".uploading")} %> - <%= form.submit t(".create"), class: "btn btn-warning", data: data %> + <% if policy(episode).create? %> + <% data = {disable_with: t(".creating"), upload_with: t(".uploading")} %> + <%= form.submit t(".create"), class: "btn btn-warning", data: data %> + <% end %> <% end %> - <% end %> +
+ + <%= render "form_distribution", episode: episode, form: form %>
- -
-
- <%= render "form_status", podcast: podcast, feed: feed, form: form %> -
-
+ <%= render "form_status", podcast: podcast, feed: feed, form: form %>
<% end %> diff --git a/app/views/feeds/_form_status.html.erb b/app/views/feeds/_form_status.html.erb index 9bd235c02..bfb1e4c1f 100644 --- a/app/views/feeds/_form_status.html.erb +++ b/app/views/feeds/_form_status.html.erb @@ -1,36 +1,40 @@ -
-
-
<%= t(".title") %>
-
-
- <% if feed.persisted? %> -

<%= t(".updated_at_hint") %>
<%= l(feed.updated_at) %>

+
+
+
+
+
<%= t(".title") %>
+
+
+ <% if feed.persisted? %> +

<%= t(".updated_at_hint") %>
<%= l(feed.updated_at) %>

- <% if policy(feed).update? %> - <%= link_to t(".discard"), podcast_feed_path(podcast, feed), class: "btn btn-discard-changed invisible me-2", data: {action: "unsaved#discard", unsaved_target: "discard"} %> + <% if policy(feed).update? %> + <%= link_to t(".discard"), podcast_feed_path(podcast, feed), class: "btn btn-discard-changed invisible me-2", data: {action: "unsaved#discard", unsaved_target: "discard"} %> -
- <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> - <%= form.submit t(".update"), class: "btn btn-primary", data: data %> +
+ <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> + <%= form.submit t(".update"), class: "btn btn-primary", data: data %> - <% if policy(feed).destroy? %> - -
    -
  • - -
    • -
+
    +
  • + +
    • +
+ <% end %> +
<% end %> -
- <% end %> - <% else %> -

<%= t(".new_hint") %>

- <%= form.submit t(".create"), class: "btn btn-primary" %> - <% end %> + <% else %> +

<%= t(".new_hint") %>

+ <%= form.submit t(".create"), class: "btn btn-primary" %> + <% end %> +
+
diff --git a/app/views/podcast_engagement/_form.html.erb b/app/views/podcast_engagement/_form.html.erb index f3998de1d..2113d8324 100644 --- a/app/views/podcast_engagement/_form.html.erb +++ b/app/views/podcast_engagement/_form.html.erb @@ -12,11 +12,7 @@
-
-
- <%= render "form_status", podcast: podcast, form: form %> -
-
+ <%= render "form_status", podcast: podcast, form: form %>
diff --git a/app/views/podcast_engagement/_form_status.html.erb b/app/views/podcast_engagement/_form_status.html.erb index 1103c2244..5b32949ca 100644 --- a/app/views/podcast_engagement/_form_status.html.erb +++ b/app/views/podcast_engagement/_form_status.html.erb @@ -1,14 +1,18 @@ -
-
-
<%= t(".title") %>
-
-
+
+
+
+
+
<%= t(".title") %>
+
+
-

<%= t(".updated_at_hint") %>
<%= l(podcast.updated_at) %>

+

<%= t(".updated_at_hint") %>
<%= l(podcast.updated_at) %>

- <%= link_to t(".discard"), podcast_engagement_path(podcast), class: "btn btn-discard-changed invisible me-2", data: {action: "unsaved#discard", unsaved_target: "discard"} %> + <%= link_to t(".discard"), podcast_engagement_path(podcast), class: "btn btn-discard-changed invisible me-2", data: {action: "unsaved#discard", unsaved_target: "discard"} %> - <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> - <%= form.submit t(".update"), class: "btn btn-primary", data: data %> + <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> + <%= form.submit t(".update"), class: "btn btn-primary", data: data %> +
+
-
+
\ No newline at end of file diff --git a/app/views/podcasts/_form.html.erb b/app/views/podcasts/_form.html.erb index 6ce7ace4e..a076cccd8 100644 --- a/app/views/podcasts/_form.html.erb +++ b/app/views/podcasts/_form.html.erb @@ -11,11 +11,7 @@
-
-
- <%= render "form_status", podcast: podcast, form: form %> -
-
+ <%= render "form_status", podcast: podcast, form: form %>
<% end %> diff --git a/app/views/podcasts/_form_status.html.erb b/app/views/podcasts/_form_status.html.erb index 5d8e89bba..b86b91325 100644 --- a/app/views/podcasts/_form_status.html.erb +++ b/app/views/podcasts/_form_status.html.erb @@ -1,39 +1,43 @@ -
-
-
<%= t(".title") %>
-
-
- <% if podcast.persisted? %> -

<%= t(".updated_at_hint") %>
<%= l(podcast.updated_at) %>

+
+
+
+
+
<%= t(".title") %>
+
+
+ <% if podcast.persisted? %> +

<%= t(".updated_at_hint") %>
<%= l(podcast.updated_at) %>

- <% if policy(podcast).update? %> - <% data = {action: "unsaved#discard", unsaved_target: "discard"} %> - <%= link_to t(".discard"), edit_podcast_path(podcast), class: "btn btn-discard-changed invisible me-2", data: data %> + <% if policy(podcast).update? %> + <% data = {action: "unsaved#discard", unsaved_target: "discard"} %> + <%= link_to t(".discard"), edit_podcast_path(podcast), class: "btn btn-discard-changed invisible me-2", data: data %> -
- <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> - <%= form.submit t(".update"), class: "btn btn-primary", data: data %> +
+ <% data = {disable_with: t(".updating"), upload_with: t(".uploading")} %> + <%= form.submit t(".update"), class: "btn btn-primary", data: data %> - <% if policy(podcast).destroy? %> - -
    -
  • - -
    • -
+
    +
  • + +
    • +
+ <% end %> +
<% end %> -
- <% end %> - <% else %> -

<%= t(".new_hint") %>

+ <% else %> +

<%= t(".new_hint") %>

- <% data = {disable_with: t(".creating"), upload_with: t(".uploading")} %> - <%= form.submit t(".create"), class: "btn btn-primary", data: data %> - <% end %> + <% data = {disable_with: t(".creating"), upload_with: t(".uploading")} %> + <%= form.submit t(".create"), class: "btn btn-primary", data: data %> + <% end %> +
+