diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
index 8666d2f..001a22c 100644
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -2,12 +2,35 @@
@tailwind components;
@tailwind utilities;
-/*
-
@layer components {
+ .btn {
+ @apply px-4 py-2 font-semibold text-white transition-colors duration-100 bg-opacity-100 shadow bg-hsrm-gray-light hover:bg-opacity-75 ;
+ }
.btn-primary {
- @apply py-2 px-4 bg-blue-200;
+ @apply bg-hsrm-red hover:bg-hsrm-red-light;
+ }
+ .badge {
+ @apply text-sm font-medium text-center font-bold rounded-lg uppercase bg-gray-300 bg-opacity-50 px-2 py-1.5 shadow;
+ }
+ .badge-hover {
+ @apply p-1 hover:bg-opacity-75;
+ }
+ .badge-xl {
+ @apply text-2xl;
+ }
+ .badge-status {
+ @apply block w-24;
+ }
+ .icon {
+ @apply inline text-hsrm-gray size-7 drop-shadow hover:text-opacity-75;
+ }
+ .icon-disabled {
+ @apply text-opacity-25 hover:text-opacity-25;
+ }
+ .icon-nohover {
+ @apply hover:text-opacity-100;
+ }
+ .card-status {
+ @apply uppercase bg-opacity-50 shadow-lg min-h-20 hover:bg-opacity-70;
}
}
-
-*/
diff --git a/app/views/jobs/_job_tr.html.erb b/app/views/jobs/_job_tr.html.erb
index 19bf5c4..4ccc9f4 100644
--- a/app/views/jobs/_job_tr.html.erb
+++ b/app/views/jobs/_job_tr.html.erb
@@ -1,63 +1,63 @@
-
-
-
+
+ |
+
<%= job.id %>
|
-
+ |
<% if job.pdf.attached? %>
<%= image_tag(url_for(job.pdf.blob.preview(resize_to_limit: [100, 100])), class: "shadow") %>
<%#= image_tag job.pdf.preview(resize_to_limit: [50, 50]), class: "mx-auto" %>
<% end %>
|
-
+ |
<%= job.costumer_fullname %>
|
-
+ |
<% if job.pdf.attached? %>
<%= truncate(job.pdf.filename.to_s, length: 45) %>
<% end %>
|
-
-
+ |
+
<%= job.number_of_plans_a0 %>
|
-
-
+ |
+
<%= job.number_of_plans_a1 %>
|
-
-
+ |
+
<%= job.number_of_plans_a2 %>
|
-
-
+ |
+
<%= job.number_of_plans_a3 %>
|
-
-
+ |
+
<%= job.costum_qm_plan.round(2) %> m²
|
-
-
+ |
+
<%= job.cost.round(2) %> €
|
-
-
+ |
+
<%= job.status %>
|
-
+ |
<% if job.open? %>
- <%= button_to icon("x-circle", class: "text-hsrm-red size-8 inline", title: "Abbrechen"), cancel_job_path(job), method: :patch, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
+ <%= button_to icon("x-circle", class: "icon size-10 text-hsrm-red", title: "Abbrechen"), cancel_job_path(job), method: :patch, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
<% else %>
- <%= icon("x-circle", class: "text-hsrm-gray text-opacity-50 size-8 inline drop-shadow", title: "Kann nicht mehr abgebrochen werden") %>
+ <%= icon("x-circle", class: "icon icon-disabled size-10", title: "Kann nicht mehr abgebrochen werden") %>
<% end %>
|
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb
index b66c12f..403ca3a 100644
--- a/app/views/jobs/index.html.erb
+++ b/app/views/jobs/index.html.erb
@@ -2,26 +2,26 @@
<%#= render partial: 'layouts/flash' %>
<% content_for :title, "Current Print Jobs" %>
-
- Aktuelle Plottaufträge <%= Date.today.strftime("%d.%m.%Y") %>
+
+ Aktuelle Plottaufträge <%= Date.today.strftime("%d.%m.%Y") %>
<%= link_to "Plottauftrag aufgeben", new_job_path, class: "px-3 py-2 bg-hsrm-red drop-shadow-lg transition-colors hover:bg-hsrm-red-light text-white block font-medium" %>
- | ID |
- Vorschau |
- Auftraggeber |
- PDF |
- A0 |
- A1 |
- A2 |
- A3 |
- no DIN |
- Kosten |
- Status |
- Action |
+ ID |
+ Vorschau |
+ Auftraggeber |
+ PDF |
+ A0 |
+ A1 |
+ A2 |
+ A3 |
+ no DIN |
+ Kosten |
+ Status |
+ Action |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e2ecc78..4f10460 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
|