diff --git a/app/views/default_admin_sets/_form.html.erb b/app/views/default_admin_sets/_form.html.erb index a7f574e2b..79457223e 100644 --- a/app/views/default_admin_sets/_form.html.erb +++ b/app/views/default_admin_sets/_form.html.erb @@ -39,6 +39,6 @@
<%= 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' %>
<% end %> diff --git a/app/views/default_admin_sets/edit.html.erb b/app/views/default_admin_sets/edit.html.erb index c7fea0713..92a52635d 100644 --- a/app/views/default_admin_sets/edit.html.erb +++ b/app/views/default_admin_sets/edit.html.erb @@ -1,11 +1,11 @@
-
+

Edit Admin Set Worktype

-
-
+
+
<%= render 'form', default_admin_set: @default_admin_set %> diff --git a/app/views/default_admin_sets/index.html.erb b/app/views/default_admin_sets/index.html.erb index 01b9a686d..64b21d00e 100644 --- a/app/views/default_admin_sets/index.html.erb +++ b/app/views/default_admin_sets/index.html.erb @@ -1,26 +1,25 @@ -<% if @default_admin_sets.nil? %>

<%= notice %>

-
-
-

Assign Admin Set Worktype

+
+

Admin Set Worktype

-
-
+<% if @default_admin_sets.nil? %> + +
+

You must create an admin set before selecting a default.

+ <% else %> -

<%= notice %>

-
-
-

Admin Set Worktypes

+
+

A listing of the admin sets chosen for each work type or work type-department combination.

-
+
Add new admin set worktype @@ -28,8 +27,8 @@
-
-
+
+
diff --git a/app/views/default_admin_sets/new.html.erb b/app/views/default_admin_sets/new.html.erb index a00e56e78..741ca7fb7 100644 --- a/app/views/default_admin_sets/new.html.erb +++ b/app/views/default_admin_sets/new.html.erb @@ -1,11 +1,11 @@
-
+

New Admin Set Worktype

-
-
+
+
<%= render 'form', default_admin_set: @default_admin_set %>
admin set worktypes <%= application_name %>