Skip to content

Commit

Permalink
Place Dashboard shared view partials under good_job namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
bensheldon committed Jul 26, 2021
1 parent a870c99 commit 0a57a10
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion engine/app/views/good_job/active_jobs/show.html.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= render 'shared/jobs_table', jobs: @jobs %>
<%= render 'good_job/shared/jobs_table', jobs: @jobs %>
4 changes: 2 additions & 2 deletions engine/app/views/good_job/dashboards/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="card my-3 p-6">
<%= render 'shared/chart', chart_data: @chart %>
<%= render 'good_job/shared/chart', chart_data: @chart %>
</div>

<div class='card mb-2'>
Expand Down Expand Up @@ -38,7 +38,7 @@
</div>

<% if @filter.jobs.present? %>
<%= render 'shared/jobs_table', jobs: @filter.jobs %>
<%= render 'good_job/shared/jobs_table', jobs: @filter.jobs %>

<nav aria-label="Job pagination" class="mt-3">
<ul class="pagination">
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</td>
<td>
<%= button_to job_path(job.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete job" do %>
<%= render "shared/icons/trash" %>
<%= render "good_job/shared/icons/trash" %>
<% end %>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions engine/app/views/layouts/good_job/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@

<% if notice %>
<div class="alert alert-success alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
<%= render "shared/icons/check", class: "flex-shrink-0 me-2" %>
<%= render "good_job/shared/icons/check", class: "flex-shrink-0 me-2" %>
<div><%= notice %></div>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
<% elsif alert %>
<div class="alert alert-warning alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
<%= render "shared/icons/check", class: "flex-shrink-0 me-2" %>
<%= render "good_job/shared/icons/check", class: "flex-shrink-0 me-2" %>
<div><%= alert %></div>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
Expand Down

0 comments on commit 0a57a10

Please sign in to comment.