- <%= icon("inbox-stack", class: "text-status-#{status} icon icon-nohover") %>
+ <%= icon(status_icon(status), class: "text-status-#{status} icon icon-nohover") %>
<%= status %>
<%= jobs.count %>
diff --git a/app/views/operator/jobs/_job_tr.html.erb b/app/views/operator/jobs/_job_tr.html.erb
index 2515e67..e2dcaa9 100644
--- a/app/views/operator/jobs/_job_tr.html.erb
+++ b/app/views/operator/jobs/_job_tr.html.erb
@@ -60,31 +60,31 @@
<% if job.printing? || job.canceled? || job.paid? %>
- <%= button_to icon("inbox-stack", class: "icon", title: "Zurück in die Warteschlange"), operator_job_path(job), method: :patch, params: {:job => {status: :open}}, form_class: "inline" %>
+ <%= button_to icon(status_icon(:open), class: "icon", title: "Zurück in die Warteschlange"), operator_job_path(job), method: :patch, params: {:job => {status: :open}}, form_class: "inline" %>
<% else %>
- <%= icon("inbox-stack", class: "icon icon-disabled", title: "") %>
+ <%= icon(status_icon(:open), class: "icon icon-disabled", title: "") %>
<% end %>
<% if job.open? || job.canceled? || job.paid? %>
- <%= button_to icon("printer", class: "icon", title: "Drucken"), operator_job_path(job), method: :patch, params: {:job => {status: :printing}}, form_class: "inline" %>
+ <%= button_to icon(status_icon(:printing), class: "icon", title: "Drucken"), operator_job_path(job), method: :patch, params: {:job => {status: :printing}}, form_class: "inline" %>
<% else %>
- <%= icon("printer", class: "icon icon-disabled", title: "") %>
+ <%= icon(status_icon(:printing), class: "icon icon-disabled", title: "") %>
<% end %>
<% if job.printing? || job.paid? %>
<% job.printing? && turbo_confirm = 'Sind die Pläne gedruckt und die Seitenanzahl und QM korrekt?' %>
- <%= button_to icon("arrow-up-tray", class: "icon", title: "Pläne sind fertig gedruckt und bereit abgeholt zu werden."), operator_job_path(job), method: :patch, params: {:job => {status: :pickup}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
+ <%= button_to icon(status_icon(:pickup), class: "icon", title: "Pläne sind fertig gedruckt und bereit abgeholt zu werden."), operator_job_path(job), method: :patch, params: {:job => {status: :pickup}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
<% else %>
- <%= icon("arrow-up-tray", class: "icon icon-disabled", title: "") %>
+ <%= icon(status_icon(:pickup), class: "icon icon-disabled", title: "") %>
<% end %>
<% if job.pickup? || job.printing? %>
<% job.printing? && turbo_confirm = 'Sind die Pläne gedruckt und die Seitenanzahl und QM korrekt?' %>
- <%= button_to icon("banknotes", class: "icon", title: "Bezahlt"), operator_job_path(job), method: :patch, params: {:job => {status: :paid}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
+ <%= button_to icon(status_icon(:paid), class: "icon", title: "Bezahlt"), operator_job_path(job), method: :patch, params: {:job => {status: :paid}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
<% else %>
- <%= icon("banknotes", class: "icon icon-disabled ", title: "") %>
+ <%= icon(status_icon(:paid), class: "icon icon-disabled ", title: "") %>
<% end %>
<% if job.open? || job.printing? || job.pickup? %>
- <%= button_to icon("x-circle", class: "icon text-hsrm-red", title: "Abbrechen"), operator_job_path(job), method: :patch, params: {:job => {status: :canceled}}, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
+ <%= button_to icon(status_icon(:canceled), class: "icon text-hsrm-red", title: "Abbrechen"), operator_job_path(job), method: :patch, params: {:job => {status: :canceled}}, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
<% else %>
- <%= icon("x-circle", class: "icon icon-disabled", title: "Kann nicht mehr abgebrochen werden") %>
+ <%= icon(status_icon(:canceled), class: "icon icon-disabled", title: "Kann nicht mehr abgebrochen werden") %>
<% end %>
|
diff --git a/app/views/operator/jobs/index.html.erb b/app/views/operator/jobs/index.html.erb
index e3d3080..8cd5935 100644
--- a/app/views/operator/jobs/index.html.erb
+++ b/app/views/operator/jobs/index.html.erb
@@ -12,6 +12,7 @@
+ <%= icon(status_icon(:printing), class: "icon") %>
Printing
<%= render partial: 'start_next_job_btn', locals: { jobs: @openjobs } %>
@@ -43,6 +44,7 @@
+ <%= icon(status_icon(:pickup), class: "icon") %>
Pickup
@@ -72,6 +74,7 @@
+ <%= icon(status_icon(:open), class: "icon") %>
Open
@@ -101,6 +104,8 @@
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
index e928e0b..6d37afe 100644
--- a/config/tailwind.config.js
+++ b/config/tailwind.config.js
@@ -35,14 +35,19 @@ module.exports = {
safelist: [
"text-status-open",
"bg-status-open-light",
+ "border-status-open-light",
"text-status-printing",
"bg-status-printing-light",
+ "border-status-printing-light",
"text-status-pickup",
"bg-status-pickup-light",
+ "border-status-pickup-light",
"text-status-paid",
"bg-status-paid-light",
+ "border-status-paid-light",
"text-status-canceled",
"bg-status-canceled-light",
+ "border-status-canceled-light",
],
plugins: [
require("@tailwindcss/forms"),