Skip to content

Commit

Permalink
Merge pull request #756 from PRX/fix/headers
Browse files Browse the repository at this point in the history
Mismatched header fix
  • Loading branch information
cavis authored Aug 10, 2023
2 parents 118bba7 + 391236e commit 3167a3a
Show file tree
Hide file tree
Showing 23 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion app/views/episodes/_form_distribution.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0">
<div class="card-header-info">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>
<div class="card-body">

Expand Down
2 changes: 1 addition & 1 deletion app/views/episodes/_form_main.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t("helpers.label.episode.description") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t("helpers.label.episode.description") %></h2>
<%= help_text t(".help.description") %>
</div>
<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/episodes/_form_status.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0 mb-4">
<div class="card-header-<%= episode_status_class(episode) %>">
<h2 class="card-title h5"><%= t(".title_#{episode.publishing_status_was}") %></h5>
<h2 class="card-title h5"><%= t(".title_#{episode.publishing_status_was}") %></h2>
</div>

<div class="card-body row">
Expand Down
2 changes: 1 addition & 1 deletion app/views/episodes/_form_tags.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>

<div class="card-body">
Expand Down
4 changes: 2 additions & 2 deletions app/views/fake/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<div class="col-lg-4 d-grid gap-3">
<section class="card shadow border-0">
<div class="card-header-info">
<h2 class="card-title h5 fw-bold">Card Title</h5>
<h2 class="card-title h5 fw-bold">Card Title</h2>
</div>
<div class="card-body">
<%= image_tag "fake-podcast.png", width: 135, class: "d-flex mx-auto mb-2" %>
Expand Down Expand Up @@ -81,7 +81,7 @@

<div class="card shadow border-0">
<div class="card-header-success">
<h2 class="card-title h5 fw-bold">Look a card</h5>
<h2 class="card-title h5 fw-bold">Look a card</h2>
</div>
<div class="card-body">
<p class="card-text">Some card text.</p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/fake/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="col-lg-8">
<div class="card">
<div class="card-header">
<h2 class="card-title h5">On Fake = <%= @episode.title %></h5>
<h2 class="card-title h5">On Fake = <%= @episode.title %></h2>
</div>
<div class="card-body row">

Expand Down Expand Up @@ -69,7 +69,7 @@
<div class="col-lg-4">
<div class="card">
<div class="card-header bg-info">
<h2 class="card-title h5">Card Title</h5>
<h2 class="card-title h5">Card Title</h2>
</div>
<div class="card-body">
<%= image_tag "prx_logo.svg", width: 135, class: "d-flex mx-auto mb-2" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_ad_zones.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h2>
<%= help_text t(".help.ad_zones") %>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_audio_format.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4" data-controller="toggle-field">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h2>
<%= help_text t(".help.audio_format") %>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_auth.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4 <%= "d-none" if feed.public? %>" data-feed-tokens-target="showPrivate">
<div class="card shadow border-0">
<div class="card-header card-header-warning d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h2>
<%= help_text t(".help.auth_tokens") %>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_distribution.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0">
<div class="card-header-info">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>

<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_overrides.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>

<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_status.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0 mb-4">
<div class="card-header-primary">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>
<div class="card-footer d-flex align-items-center">
<% if feed.persisted? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/_form_tags.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t(".title") %></h2>
<%= help_text t(".help.categories") %>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/images/_complete.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0 prx-uploads">
<div class="card-header-info d-flex align-items-center">
<h2 class="card-title h5 flex-grow-1"><%= t("images.title.#{image.model_name.singular}") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t("images.title.#{image.model_name.singular}") %></h2>

<button type="button" class="prx-btn-help" data-bs-toggle="modal" data-bs-target="#image-modal-<%= image.id %>">
<span class="material-icons">info</span>
Expand Down
2 changes: 1 addition & 1 deletion app/views/images/_error.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0 prx-uploads">
<div class="card-header-info d-flex justify-content-between align-items-center">
<h2 class="card-title h5"><%= t("images.title.#{image.model_name.singular}") %></h5>
<h2 class="card-title h5"><%= t("images.title.#{image.model_name.singular}") %></h2>

<%= link_to delete_path, class: "btn btn-icon p-0" do %>
<span class="material-icons">delete</span>
Expand Down
2 changes: 1 addition & 1 deletion app/views/images/_new.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="card shadow border-0 prx-uploads mb-4" data-controller="upload" data-upload-disable-outlet="form">

<div class="card-header-info d-flex align-items-center">
<h2 class="card-title h5 flex-grow-1"><%= t("images.title.#{image.model_name.singular}") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t("images.title.#{image.model_name.singular}") %></h2>
<%= help_text t("images.help.#{image.model_name.singular}") %>
<%# delete buttons in header, after upload completes %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/imports/_form_status.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0">
<div class="card-header-success">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>

<div class="card-body row">
Expand Down
2 changes: 1 addition & 1 deletion app/views/podcast_engagement/_form_status.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0">
<div class="card-header-primary">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>
<div class="card-footer d-flex align-items-center">

Expand Down
2 changes: 1 addition & 1 deletion app/views/podcasts/_form_distribution.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% if podcast.persisted? %>
<div class="card shadow border-0">
<div class="card-header-info">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>

<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/podcasts/_form_main.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="col-12 mb-4">
<div class="card shadow border-0">
<div class="card-header card-header-light d-flex justify-content-between">
<h2 class="card-title h5 flex-grow-1"><%= t("helpers.label.podcast.description") %></h5>
<h2 class="card-title h5 flex-grow-1"><%= t("helpers.label.podcast.description") %></h2>
<%= help_text t(".help.description") %>
</div>
<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/podcasts/_form_status.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card shadow border-0 mb-4">
<div class="card-header-primary">
<h2 class="card-title h5"><%= t(".title") %></h5>
<h2 class="card-title h5"><%= t(".title") %></h2>
</div>
<div class="card-footer d-flex align-items-center">
<% if podcast.persisted? %>
Expand Down
4 changes: 4 additions & 0 deletions app/views/podcasts/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,7 @@
<%= paginate @podcasts, window: 2, outer_window: 1 %>
<%= page_entries_info @podcasts %>
<% end %>
<%= link_to main_app.new_podcast_path, class: "btn btn-success btn-fab" do %>
<span class="material-icons">add</span> <%= t(".create") %>
<% end %>
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ en:
<<: *form_status
title: Podcast Status
index:
create: New Podcast
search_podcasts: Search Podcasts
podcast:
create_episode: Create Episode
Expand Down

0 comments on commit 3167a3a

Please sign in to comment.