Skip to content

Commit

Permalink
Fix styling in the worktype assignment pages. Refactor header a littl…
Browse files Browse the repository at this point in the history
…e bit to cut down on duplication and get the title more consistent (#1024)
  • Loading branch information
bbpennel authored Oct 11, 2023
1 parent 5bb14d9 commit 9632fd7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion app/views/default_admin_sets/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@

<div class="actions pull-right">
<%= f.submit 'Save', class: 'btn btn-primary' %>
<%= link_to 'Cancel', default_admin_sets_path, class: 'btn btn-default' %>
<%= link_to 'Cancel', default_admin_sets_path, class: 'btn btn-outline-secondary' %>
</div>
<% end %>
6 changes: 3 additions & 3 deletions app/views/default_admin_sets/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="row">
<div class="col-xs-12 main-header">
<div class="col-12 main-header">
<h1><span class="fa fa-edit"></span> Edit Admin Set Worktype</h1>
</div>
</div>

<div class="panel panel-default">
<div class="panel-body">
<div class="card card-default">
<div class="card-body">

<%= render 'form', default_admin_set: @default_admin_set %>

Expand Down
25 changes: 12 additions & 13 deletions app/views/default_admin_sets/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
<% if @default_admin_sets.nil? %>
<p id="notice"><%= notice %></p>

<div class="row">
<div class="col-xs-12 main-header">
<h1><span class="fa fa-archive"></span> Assign Admin Set Worktype</h1>
<div class="col-12 main-header">
<h1><span class="fa fa-archive"></span> Admin Set Worktype</h1>
</div>
</div>

<div class="panel panel-default">
<div class="panel-body">
<% if @default_admin_sets.nil? %>

<div class="card card-default">
<div class="card-body">
<p>You must create an admin set before selecting a default.</p>
</div>
</div>

<% else %>
<p id="notice"><%= notice %></p>

<div class="row">
<div class="col-xs-12 main-header">
<h1><span class="fa fa-archive"></span> Admin Set Worktypes</h1>
<div class="row mb-2 pl-2">
<div class="col-12">
<h4>A listing of the admin sets chosen for each work type or work type-department combination.</h4>

<div class="pull-right">
<div class="float-right">
<a href="<%= new_default_admin_set_path %>" class="btn btn-primary">
<span class="fa fa-edit"></span> Add new admin set worktype
</a>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-body">
<div class="card card-default">
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped datatable">
<caption class="sr-only">admin set worktypes <%= application_name %></caption>
Expand Down
6 changes: 3 additions & 3 deletions app/views/default_admin_sets/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="row">
<div class="col-xs-12 main-header">
<div class="col-12 main-header">
<h1><span class="fa fa-edit"></span> New Admin Set Worktype</h1>
</div>
</div>

<div class="panel panel-default">
<div class="panel-body">
<div class="card card-default">
<div class="card-body">

<%= render 'form', default_admin_set: @default_admin_set %>

Expand Down

0 comments on commit 9632fd7

Please sign in to comment.