diff --git a/BookingSystem/templates/forms/categories.html b/BookingSystem/templates/forms/categories.html index 9e2f376..c62a424 100644 --- a/BookingSystem/templates/forms/categories.html +++ b/BookingSystem/templates/forms/categories.html @@ -1,5 +1,5 @@
+ onclick="cueAlert('Sukksess!', 'Kategoriene ble oppdatert.', 'success')">
diff --git a/BookingSystem/templates/inventar_add.html b/BookingSystem/templates/inventar_add.html index a0e751f..d25d2e1 100644 --- a/BookingSystem/templates/inventar_add.html +++ b/BookingSystem/templates/inventar_add.html @@ -99,7 +99,7 @@

Her kan du legge til nytt inventar. Legg gjerne til flere, så forlater du b error: function (response) { var msg = response.responseText; if (response.status === 502) { - msg = "Klarte ikke koble til Etikett tjeneren."; + msg = "Klarte ikke koble til etikett tjeneren."; } iziToast.error({ title: 'Utskrift', diff --git a/BookingSystem/templates/inventar_print.html b/BookingSystem/templates/inventar_print.html index 96cf86b..0208ff9 100644 --- a/BookingSystem/templates/inventar_print.html +++ b/BookingSystem/templates/inventar_print.html @@ -56,7 +56,7 @@

For {{ item.id }} ({{ item.name }})

error: function (response) { var msg = response.responseText; if (response.status === 502) { - msg = "Klarte ikke koble til Etikett tjeneren."; + msg = "Klarte ikke koble til etikett tjeneren."; } iziToast.error({ title: 'Utskrift', diff --git a/BookingSystem/templates/partials/css.html b/BookingSystem/templates/partials/css.html index 8e57d47..d4547aa 100644 --- a/BookingSystem/templates/partials/css.html +++ b/BookingSystem/templates/partials/css.html @@ -1,5 +1,4 @@ - - +{% include 'partials/css_student.html' %} @@ -24,11 +23,6 @@ border-radius: 1rem; } - header, main, footer { - padding-top: 1rem !important; - padding-bottom: 1rem !important; - } - .dropdown { position: relative; display: inline-block; diff --git a/BookingSystem/templates/partials/css_student.html b/BookingSystem/templates/partials/css_student.html new file mode 100644 index 0000000..a0902dc --- /dev/null +++ b/BookingSystem/templates/partials/css_student.html @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/BookingSystem/templates/partials/head.html b/BookingSystem/templates/partials/head.html index 7ebe763..3311712 100644 --- a/BookingSystem/templates/partials/head.html +++ b/BookingSystem/templates/partials/head.html @@ -1,6 +1,10 @@ +{% if session.user and session.user.is_admin %} {% include 'partials/css.html' %} - {% include 'partials/js.html' %} +{% else %} +{% include 'partials/css_student.html' %} +{% include 'partials/js_student.html' %} +{% endif %} Utstyrbase diff --git a/BookingSystem/templates/partials/js.html b/BookingSystem/templates/partials/js.html index 93428e5..e0cc295 100644 --- a/BookingSystem/templates/partials/js.html +++ b/BookingSystem/templates/partials/js.html @@ -1,3 +1,4 @@ +{% include 'partials/js_student.html' %} diff --git a/BookingSystem/templates/partials/js_student.html b/BookingSystem/templates/partials/js_student.html new file mode 100644 index 0000000..e69de29