From a43989982a9674d41914c2b766c46aade88f3540 Mon Sep 17 00:00:00 2001 From: podliashanyk <60876078+podliashanyk@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:53:35 +0200 Subject: [PATCH] Add proper logo and adapt color palette (#157) * Add logo file * Add flexible height in logo svg * Add logo to login page and navbar * Add zino colors to tailwind theme * Adapt color palette on login page, navbar and user menu * Replace slate color with zinc (is a correct alternative of zinogray) * Make view base darker * Replace sky, teal and blue colors with zinogreen * Smooth out zinogreen related colors on login and main pages --- .../accordion/event-actions-buttons.html | 4 +- .../accordion/event-attributes.html | 4 +- .../accordion/event-details-content.html | 2 +- .../components/accordion/event-details.html | 2 +- .../accordion/event-messages-block.html | 2 +- .../components/accordion/event-messages.html | 8 +- .../accordion/update-state-btn.html | 2 +- .../appbar-placeholder.html | 8 +- .../error-appbar-content.html | 2 +- .../success-appbar-content.html | 6 +- .../templates/components/footer/footer.html | 2 +- .../components/login/sign-in-form.html | 10 +-- .../templates/components/navbar/navbar.html | 10 ++- .../navbar/user-dropdown-menu-expanded.html | 4 +- .../navbar/user-menu-btn-expanded.html | 2 +- .../components/navbar/user-menu-btn.html | 2 +- .../popups/alerts/error/error-alert.html | 4 +- .../bulk-update-menu/bulk-update-buttons.html | 6 +- .../bulk-update-menu/bulk-update-menu.html | 2 +- .../popups/modals/forms/sort-table-form.html | 6 +- .../popups/modals/table-operation-modal.html | 12 +-- .../modals/update-event-status-modal.html | 18 ++-- .../update-singular-event-status-modal.html | 18 ++-- .../components/row/collapse-btn.html | 2 +- .../components/row/colored-data-cells.html | 4 +- .../templates/components/row/data-cells.html | 16 ++-- .../components/row/event-checked-box.html | 4 +- .../templates/components/row/event-row.html | 2 +- .../components/row/event-unchecked-box.html | 4 +- .../templates/components/row/expand-btn.html | 2 +- .../components/row/expanded-row.html | 2 +- .../components/row/modified-event-row.html | 6 +- .../components/row/table-row-skeleton.html | 4 +- .../components/table/events-table.html | 26 +++--- .../components/toolbar/column-toggle-btn.html | 6 +- .../components/toolbar/table-filter-btn.html | 6 +- .../components/toolbar/table-sort-btn.html | 6 +- src/howitz/templates/includes/configs.html | 26 ++++++ src/howitz/templates/includes/zino-logo.svg | 90 ++++++++++++++++--- src/howitz/templates/layouts/base.html | 6 +- src/howitz/templates/responses/502.html | 4 +- .../templates/responses/checked-box.html | 2 +- .../responses/collapse-error-alert.html | 2 +- .../templates/responses/collapse-row.html | 2 +- .../responses/expand-error-alert.html | 2 +- .../templates/responses/unchecked-box.html | 2 +- .../responses/update-event-response.html | 4 +- src/howitz/templates/views/login.html | 8 +- 48 files changed, 237 insertions(+), 137 deletions(-) diff --git a/src/howitz/templates/components/accordion/event-actions-buttons.html b/src/howitz/templates/components/accordion/event-actions-buttons.html index 674689ff..7c13543e 100644 --- a/src/howitz/templates/components/accordion/event-actions-buttons.html +++ b/src/howitz/templates/components/accordion/event-actions-buttons.html @@ -11,7 +11,7 @@ hx-target="#event-accordion-row-{{ id }}" hx-swap="outerHTML show:#event-msg-feed-{{ id }}:bottom" hx-indicator="#row-{{ id }}-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Poll @@ -22,7 +22,7 @@ hx-target="#event-accordion-row-{{ id }}" hx-swap="outerHTML show:#event-msg-feed-{{ id }}:bottom" hx-indicator="#row-{{ id }}-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Clear Flapping {% endif %} diff --git a/src/howitz/templates/components/accordion/event-attributes.html b/src/howitz/templates/components/accordion/event-attributes.html index 978089d0..53281e44 100644 --- a/src/howitz/templates/components/accordion/event-attributes.html +++ b/src/howitz/templates/components/accordion/event-attributes.html @@ -1,9 +1,9 @@ -
{{ msg.log }}
+
Connected to Zino diff --git a/src/howitz/templates/components/feedback/connection-status-bar/error-appbar-content.html b/src/howitz/templates/components/feedback/connection-status-bar/error-appbar-content.html index b3dd833a..ad0004b9 100644 --- a/src/howitz/templates/components/feedback/connection-status-bar/error-appbar-content.html +++ b/src/howitz/templates/components/feedback/connection-status-bar/error-appbar-content.html @@ -14,7 +14,7 @@ style="clip-path: polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)">
Connection timed out diff --git a/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html b/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html index db85220c..8a25ebe1 100644 --- a/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html +++ b/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html @@ -2,15 +2,15 @@ + class="relative isolate flex justify-center gap-x-6 bg-zinogreen-900 overflow-hidden px-6 py-0.5"> - - diff --git a/src/howitz/templates/components/footer/footer.html b/src/howitz/templates/components/footer/footer.html index d8cb760f..f068e199 100644 --- a/src/howitz/templates/components/footer/footer.html +++ b/src/howitz/templates/components/footer/footer.html @@ -1,5 +1,5 @@ diff --git a/src/howitz/templates/components/login/sign-in-form.html b/src/howitz/templates/components/login/sign-in-form.html index b88aaf51..7b0f5608 100644 --- a/src/howitz/templates/components/login/sign-in-form.html +++ b/src/howitz/templates/components/login/sign-in-form.html @@ -9,9 +9,9 @@ hx-target-403="form p" > - Username + Username + class="mt-2 block w-full rounded-md border-0 py-1.5 bg-zinc-950 text-white shadow-sm ring-1 ring-inset ring-zinc-300 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-zinogreen-600 sm:text-sm sm:leading-6"> - Password + Password + class="mt-2 block w-full rounded-md border-0 py-1.5 bg-zinc-950 text-white shadow-sm ring-1 ring-inset ring-zinc-300 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-zinogreen-600 sm:text-sm sm:leading-6"> + class="flex w-full justify-center rounded-md bg-zinogreen-600 my-10 px-3 py-1.5 text-sm font-semibold leading-6 text-black shadow-sm hover:bg-zinogreen-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-zinogreen-600"> Sign in {% with color='white' %} {% include "/components/feedback/spinner/spinner.html" %} diff --git a/src/howitz/templates/components/navbar/navbar.html b/src/howitz/templates/components/navbar/navbar.html index 456f56e5..4488f89c 100644 --- a/src/howitz/templates/components/navbar/navbar.html +++ b/src/howitz/templates/components/navbar/navbar.html @@ -1,18 +1,20 @@ - + - {% include "/includes/zino-logo.svg" %} + {% with height='16' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %} Dashboard diff --git a/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html b/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html index f7d84a1b..e7d9168c 100644 --- a/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html +++ b/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html @@ -1,4 +1,4 @@ - @@ -10,7 +10,7 @@ Log + class="block px-4 py-2 text-sm text-white hover:bg-zinc-800">Log out diff --git a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html index d8164beb..51fec701 100644 --- a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html +++ b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html @@ -1,5 +1,5 @@ Expand alert {% include "/components/popups/alerts/error/maximize-icon.svg" %} @@ -28,7 +28,7 @@ hx-get="/get_none" hx-target="#error-alert-{{ alert_id }}" hx-swap="delete" - class="ms-auto -my-1.5 bg-opacity-20 bg-white text-gray-400 hover:text-gray-100 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" + class="ms-auto -my-1.5 bg-opacity-20 bg-white text-zinc-400 hover:text-zinc-100 rounded-lg focus:ring-2 focus:ring-zinc-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" aria-label="Close alert"> Close alert {% include "/components/popups/alerts/close-icon.svg" %} diff --git a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html index 6b9fa693..da2420b8 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html @@ -5,7 +5,7 @@ hx-get="/show_update_status_modal" hx-target="body" hx-swap="beforeend" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Update Status @@ -17,7 +17,7 @@ hx-trigger="click" id="bulk-poll-events" hx-indicator="#bulk-poll-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Poll @@ -29,7 +29,7 @@ hx-trigger="click" id="bulk-clear-flapping" hx-indicator="#bulk-clear-flapping-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Clear Flapping {% endif %} diff --git a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html index fee9d9f7..f96646f6 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html @@ -1,5 +1,5 @@ + class="sticky bottom-0 z-20 flex flex-row items-center justify-between w-full max-h-fit p-2 border-t bg-zinc-700 border-zinc-600"> {% include "/components/popups/bulk-update-menu/bulk-update-progress.html" %} diff --git a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html index 6bd3f8a1..41a6411e 100644 --- a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html +++ b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html @@ -12,12 +12,12 @@ + class="h-4 w-4 bg-zinogreen-100/40 border-white text-zinogreen-600 focus:ring-zinogreen-600"> {{ sort.display_name }} - {{ sort.description }} + {{ sort.description }} {% endfor %} @@ -33,7 +33,7 @@ hx-target="#eventlist-list" hx-swap="innerHTML" hx-indicator="#bulk-update-indicator" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-sky-700 hover:bg-sky-800 focus:outline-none focus:ring-sky-900"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-zinogreen-700 hover:bg-zinogreen-800 focus:outline-none focus:ring-zinogreen-900"> Save diff --git a/src/howitz/templates/components/popups/modals/table-operation-modal.html b/src/howitz/templates/components/popups/modals/table-operation-modal.html index b5332225..a858ae9e 100644 --- a/src/howitz/templates/components/popups/modals/table-operation-modal.html +++ b/src/howitz/templates/components/popups/modals/table-operation-modal.html @@ -7,7 +7,7 @@ hx-swap-oob="true" > @@ -15,12 +15,12 @@ - - + {{ modal_title }} - + @@ -36,10 +36,10 @@ - + + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/popups/modals/update-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-event-status-modal.html index 89587df4..c4e0c239 100644 --- a/src/howitz/templates/components/popups/modals/update-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-event-status-modal.html @@ -6,7 +6,7 @@ hx-target-error="body" > - + Update selected events - + @@ -39,7 +39,7 @@ Update s + class="border text-sm rounded-lg block w-full p-2.5 bg-zinc-700 border-zinc-600 placeholder-zinc-400 text-white focus:ring-zinogreen-500 focus:border-zinogreen-500"> Open @@ -61,11 +61,11 @@ Update s - + Your comment @@ -76,7 +76,7 @@ Update s hx-trigger="click" hx-indicator="#bulk-update-indicator" hx-target-400="#generic-400-error" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Update events @@ -93,7 +93,7 @@ Update s - + @@ -101,7 +101,7 @@ Update s hx-get="/get_none" hx-target="#bulk-update-event-status-modal" hx-swap="delete" - class="mt-3 inline-flex w-full justify-center rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-slate-600 sm:mt-0 sm:w-auto"> + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html index b022953c..633d835b 100644 --- a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html @@ -6,7 +6,7 @@ hx-target-error="body" > - + Update event #{{ id }} - + @@ -39,7 +39,7 @@ Update e + class="border text-sm rounded-lg block w-full p-2.5 bg-zinc-700 border-zinc-600 placeholder-zinc-400 text-white focus:ring-zinogreen-500 focus:border-zinogreen-500"> Open @@ -61,11 +61,11 @@ Update e - + Your comment @@ -76,7 +76,7 @@ Update e hx-swap="outerHTML show:#ol-event-{{ id }}:bottom" hx-indicator="#bulk-update-indicator" hx-target-400="#generic-400-error" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Update event @@ -92,7 +92,7 @@ Update e - + @@ -100,7 +100,7 @@ Update e hx-get="/get_none" hx-target="#update-event-{{ id }}-status-modal" hx-swap="delete" - class="mt-3 inline-flex w-full justify-center rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-slate-600 sm:mt-0 sm:w-auto"> + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/row/collapse-btn.html b/src/howitz/templates/components/row/collapse-btn.html index 6089a890..a55901e0 100644 --- a/src/howitz/templates/components/row/collapse-btn.html +++ b/src/howitz/templates/components/row/collapse-btn.html @@ -1,6 +1,6 @@ + {{ event.op_state }} @@ -8,7 +8,7 @@ - + {{ event.adm_state }} diff --git a/src/howitz/templates/components/row/data-cells.html b/src/howitz/templates/components/row/data-cells.html index 993e5bc4..70b5226f 100644 --- a/src/howitz/templates/components/row/data-cells.html +++ b/src/howitz/templates/components/row/data-cells.html @@ -1,16 +1,16 @@ -{{ event.id }} +{{ event.id }} {% if event.color != "" and event.color is not none %} {% with color=event.color %} {% include "/components/row/colored-data-cells.html" %} {% endwith %} {% else %} -{{ +{{ event.op_state }} -{{ event.adm_state }} +{{ event.adm_state }} {% endif %} -{{ event.age }} -{{ event.downtime }} -{{ event.router }} -{{ event.port }} -{{ event.description }} +{{ event.age }} +{{ event.downtime }} +{{ event.router }} +{{ event.port }} +{{ event.description }} diff --git a/src/howitz/templates/components/row/event-checked-box.html b/src/howitz/templates/components/row/event-checked-box.html index 6cbfbc77..d4b899ca 100644 --- a/src/howitz/templates/components/row/event-checked-box.html +++ b/src/howitz/templates/components/row/event-checked-box.html @@ -4,7 +4,7 @@ class="flex items-center"> {% include "/components/accordion/event-details-content.html" %} @@ -41,7 +41,7 @@ {% else %} {% with id=event.event.id, event=event.event, is_selected=event.selected %} {% for n in range(10) %} - + {% endfor %} diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html index aa41fb8e..e257b552 100644 --- a/src/howitz/templates/components/table/events-table.html +++ b/src/howitz/templates/components/table/events-table.html @@ -1,22 +1,22 @@ - - - - # - OP-STATE - ADM-STATE - AGE - DOWNTIME - ROUTER - PORT - DESCRIPTION - + + + + # + OP-STATE + ADM-STATE + AGE + DOWNTIME + ROUTER + PORT + DESCRIPTION + - - @@ -14,7 +14,7 @@ Toggle columns diff --git a/src/howitz/templates/components/toolbar/table-filter-btn.html b/src/howitz/templates/components/toolbar/table-filter-btn.html index 60f4c783..47bc2841 100644 --- a/src/howitz/templates/components/toolbar/table-filter-btn.html +++ b/src/howitz/templates/components/toolbar/table-filter-btn.html @@ -1,11 +1,11 @@ - - @@ -14,7 +14,7 @@ Filter events diff --git a/src/howitz/templates/components/toolbar/table-sort-btn.html b/src/howitz/templates/components/toolbar/table-sort-btn.html index b0589f0f..46ed7fc3 100644 --- a/src/howitz/templates/components/toolbar/table-sort-btn.html +++ b/src/howitz/templates/components/toolbar/table-sort-btn.html @@ -1,5 +1,5 @@ - - @@ -18,7 +18,7 @@ Sort events diff --git a/src/howitz/templates/includes/configs.html b/src/howitz/templates/includes/configs.html index 713e64df..2e899ab8 100644 --- a/src/howitz/templates/includes/configs.html +++ b/src/howitz/templates/includes/configs.html @@ -2,3 +2,29 @@ + + + \ No newline at end of file diff --git a/src/howitz/templates/includes/zino-logo.svg b/src/howitz/templates/includes/zino-logo.svg index 02888069..515f48e0 100644 --- a/src/howitz/templates/includes/zino-logo.svg +++ b/src/howitz/templates/includes/zino-logo.svg @@ -1,10 +1,80 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/howitz/templates/layouts/base.html b/src/howitz/templates/layouts/base.html index f606ed0e..2287afad 100644 --- a/src/howitz/templates/layouts/base.html +++ b/src/howitz/templates/layouts/base.html @@ -1,7 +1,7 @@ Howitz | {% block page_title %}{% endblock %} @@ -16,10 +16,10 @@ - {% include "includes/configs.html" %} - {% include "includes/scripts.html" %} + {% include "includes/configs.html" %} + {% include "includes/style.html" %} diff --git a/src/howitz/templates/responses/502.html b/src/howitz/templates/responses/502.html index bbb53108..08b5a516 100644 --- a/src/howitz/templates/responses/502.html +++ b/src/howitz/templates/responses/502.html @@ -1,11 +1,11 @@ {% block content %} 502 Bad Gateway - {{ err_msg }} + {{ err_msg }} {% endblock %} diff --git a/src/howitz/templates/responses/checked-box.html b/src/howitz/templates/responses/checked-box.html index e4aa9e3e..95873224 100644 --- a/src/howitz/templates/responses/checked-box.html +++ b/src/howitz/templates/responses/checked-box.html @@ -2,7 +2,7 @@ class="flex items-center"> Expand alert {% include "/components/popups/alerts/error/maximize-icon.svg" %} diff --git a/src/howitz/templates/responses/collapse-row.html b/src/howitz/templates/responses/collapse-row.html index a0ce6faf..6a2f3fe1 100644 --- a/src/howitz/templates/responses/collapse-row.html +++ b/src/howitz/templates/responses/collapse-row.html @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/src/howitz/templates/responses/expand-error-alert.html b/src/howitz/templates/responses/expand-error-alert.html index d5a09cd9..f4748780 100644 --- a/src/howitz/templates/responses/expand-error-alert.html +++ b/src/howitz/templates/responses/expand-error-alert.html @@ -12,7 +12,7 @@ hx-get="/alert/{{ alert_id }}/show-minimized-error" hx-target="#error-msg-{{ alert_id }}-maximized" hx-swap="delete" - class="ms-auto -my-1.5 bg-opacity-20 bg-white text-gray-400 hover:text-gray-100 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" + class="ms-auto -my-1.5 bg-opacity-20 bg-white text-zinc-400 hover:text-zinc-100 rounded-lg focus:ring-2 focus:ring-zinc-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" aria-label="Collapse alert"> Collapse alert {% include "/components/popups/alerts/error/minimize-icon.svg" %} diff --git a/src/howitz/templates/responses/unchecked-box.html b/src/howitz/templates/responses/unchecked-box.html index 70747c0e..43354c72 100644 --- a/src/howitz/templates/responses/unchecked-box.html +++ b/src/howitz/templates/responses/unchecked-box.html @@ -1,7 +1,7 @@ {% include "/components/accordion/event-details-content.html" %} diff --git a/src/howitz/templates/views/login.html b/src/howitz/templates/views/login.html index 93085fd9..2dab218d 100644 --- a/src/howitz/templates/views/login.html +++ b/src/howitz/templates/views/login.html @@ -10,12 +10,14 @@ Login page - + - {% include "/includes/zino-logo.svg"%} + {% with height='40' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %} - Sign in to Zino + Sign in to Zino
+ class="flex w-full justify-center rounded-md bg-zinogreen-600 my-10 px-3 py-1.5 text-sm font-semibold leading-6 text-black shadow-sm hover:bg-zinogreen-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-zinogreen-600"> Sign in {% with color='white' %} {% include "/components/feedback/spinner/spinner.html" %} diff --git a/src/howitz/templates/components/navbar/navbar.html b/src/howitz/templates/components/navbar/navbar.html index 456f56e5..4488f89c 100644 --- a/src/howitz/templates/components/navbar/navbar.html +++ b/src/howitz/templates/components/navbar/navbar.html @@ -1,18 +1,20 @@ - + - {% include "/includes/zino-logo.svg" %} + {% with height='16' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %} Dashboard diff --git a/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html b/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html index f7d84a1b..e7d9168c 100644 --- a/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html +++ b/src/howitz/templates/components/navbar/user-dropdown-menu-expanded.html @@ -1,4 +1,4 @@ - @@ -10,7 +10,7 @@ Log + class="block px-4 py-2 text-sm text-white hover:bg-zinc-800">Log out diff --git a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html index d8164beb..51fec701 100644 --- a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html +++ b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html @@ -1,5 +1,5 @@ Expand alert {% include "/components/popups/alerts/error/maximize-icon.svg" %} @@ -28,7 +28,7 @@ hx-get="/get_none" hx-target="#error-alert-{{ alert_id }}" hx-swap="delete" - class="ms-auto -my-1.5 bg-opacity-20 bg-white text-gray-400 hover:text-gray-100 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" + class="ms-auto -my-1.5 bg-opacity-20 bg-white text-zinc-400 hover:text-zinc-100 rounded-lg focus:ring-2 focus:ring-zinc-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" aria-label="Close alert"> Close alert {% include "/components/popups/alerts/close-icon.svg" %} diff --git a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html index 6b9fa693..da2420b8 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html @@ -5,7 +5,7 @@ hx-get="/show_update_status_modal" hx-target="body" hx-swap="beforeend" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Update Status @@ -17,7 +17,7 @@ hx-trigger="click" id="bulk-poll-events" hx-indicator="#bulk-poll-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Poll @@ -29,7 +29,7 @@ hx-trigger="click" id="bulk-clear-flapping" hx-indicator="#bulk-clear-flapping-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-black focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Clear Flapping {% endif %} diff --git a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html index fee9d9f7..f96646f6 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html @@ -1,5 +1,5 @@ + class="sticky bottom-0 z-20 flex flex-row items-center justify-between w-full max-h-fit p-2 border-t bg-zinc-700 border-zinc-600"> {% include "/components/popups/bulk-update-menu/bulk-update-progress.html" %} diff --git a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html index 6bd3f8a1..41a6411e 100644 --- a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html +++ b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html @@ -12,12 +12,12 @@ + class="h-4 w-4 bg-zinogreen-100/40 border-white text-zinogreen-600 focus:ring-zinogreen-600"> {{ sort.display_name }} - {{ sort.description }} + {{ sort.description }} {% endfor %} @@ -33,7 +33,7 @@ hx-target="#eventlist-list" hx-swap="innerHTML" hx-indicator="#bulk-update-indicator" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-sky-700 hover:bg-sky-800 focus:outline-none focus:ring-sky-900"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-zinogreen-700 hover:bg-zinogreen-800 focus:outline-none focus:ring-zinogreen-900"> Save diff --git a/src/howitz/templates/components/popups/modals/table-operation-modal.html b/src/howitz/templates/components/popups/modals/table-operation-modal.html index b5332225..a858ae9e 100644 --- a/src/howitz/templates/components/popups/modals/table-operation-modal.html +++ b/src/howitz/templates/components/popups/modals/table-operation-modal.html @@ -7,7 +7,7 @@ hx-swap-oob="true" > @@ -15,12 +15,12 @@ - - + {{ modal_title }} - + @@ -36,10 +36,10 @@ - + + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/popups/modals/update-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-event-status-modal.html index 89587df4..c4e0c239 100644 --- a/src/howitz/templates/components/popups/modals/update-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-event-status-modal.html @@ -6,7 +6,7 @@ hx-target-error="body" > - + Update selected events - + @@ -39,7 +39,7 @@ Update s + class="border text-sm rounded-lg block w-full p-2.5 bg-zinc-700 border-zinc-600 placeholder-zinc-400 text-white focus:ring-zinogreen-500 focus:border-zinogreen-500"> Open @@ -61,11 +61,11 @@ Update s - + Your comment @@ -76,7 +76,7 @@ Update s hx-trigger="click" hx-indicator="#bulk-update-indicator" hx-target-400="#generic-400-error" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Update events @@ -93,7 +93,7 @@ Update s - + @@ -101,7 +101,7 @@ Update s hx-get="/get_none" hx-target="#bulk-update-event-status-modal" hx-swap="delete" - class="mt-3 inline-flex w-full justify-center rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-slate-600 sm:mt-0 sm:w-auto"> + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html index b022953c..633d835b 100644 --- a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html @@ -6,7 +6,7 @@ hx-target-error="body" > - + Update event #{{ id }} - + @@ -39,7 +39,7 @@ Update e + class="border text-sm rounded-lg block w-full p-2.5 bg-zinc-700 border-zinc-600 placeholder-zinc-400 text-white focus:ring-zinogreen-500 focus:border-zinogreen-500"> Open @@ -61,11 +61,11 @@ Update e - + Your comment @@ -76,7 +76,7 @@ Update e hx-swap="outerHTML show:#ol-event-{{ id }}:bottom" hx-indicator="#bulk-update-indicator" hx-target-400="#generic-400-error" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Update event @@ -92,7 +92,7 @@ Update e - + @@ -100,7 +100,7 @@ Update e hx-get="/get_none" hx-target="#update-event-{{ id }}-status-modal" hx-swap="delete" - class="mt-3 inline-flex w-full justify-center rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-slate-600 sm:mt-0 sm:w-auto"> + class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-700 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto"> Close diff --git a/src/howitz/templates/components/row/collapse-btn.html b/src/howitz/templates/components/row/collapse-btn.html index 6089a890..a55901e0 100644 --- a/src/howitz/templates/components/row/collapse-btn.html +++ b/src/howitz/templates/components/row/collapse-btn.html @@ -1,6 +1,6 @@ + {{ event.op_state }} @@ -8,7 +8,7 @@ - + {{ event.adm_state }} diff --git a/src/howitz/templates/components/row/data-cells.html b/src/howitz/templates/components/row/data-cells.html index 993e5bc4..70b5226f 100644 --- a/src/howitz/templates/components/row/data-cells.html +++ b/src/howitz/templates/components/row/data-cells.html @@ -1,16 +1,16 @@ -{{ event.id }} +{{ event.id }} {% if event.color != "" and event.color is not none %} {% with color=event.color %} {% include "/components/row/colored-data-cells.html" %} {% endwith %} {% else %} -{{ +{{ event.op_state }} -{{ event.adm_state }} +{{ event.adm_state }} {% endif %} -{{ event.age }} -{{ event.downtime }} -{{ event.router }} -{{ event.port }} -{{ event.description }} +{{ event.age }} +{{ event.downtime }} +{{ event.router }} +{{ event.port }} +{{ event.description }} diff --git a/src/howitz/templates/components/row/event-checked-box.html b/src/howitz/templates/components/row/event-checked-box.html index 6cbfbc77..d4b899ca 100644 --- a/src/howitz/templates/components/row/event-checked-box.html +++ b/src/howitz/templates/components/row/event-checked-box.html @@ -4,7 +4,7 @@ class="flex items-center"> {% include "/components/accordion/event-details-content.html" %} @@ -41,7 +41,7 @@ {% else %} {% with id=event.event.id, event=event.event, is_selected=event.selected %} {% for n in range(10) %} - + {% endfor %} diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html index aa41fb8e..e257b552 100644 --- a/src/howitz/templates/components/table/events-table.html +++ b/src/howitz/templates/components/table/events-table.html @@ -1,22 +1,22 @@ - - - - # - OP-STATE - ADM-STATE - AGE - DOWNTIME - ROUTER - PORT - DESCRIPTION - + + + + # + OP-STATE + ADM-STATE + AGE + DOWNTIME + ROUTER + PORT + DESCRIPTION + - - @@ -14,7 +14,7 @@ Toggle columns diff --git a/src/howitz/templates/components/toolbar/table-filter-btn.html b/src/howitz/templates/components/toolbar/table-filter-btn.html index 60f4c783..47bc2841 100644 --- a/src/howitz/templates/components/toolbar/table-filter-btn.html +++ b/src/howitz/templates/components/toolbar/table-filter-btn.html @@ -1,11 +1,11 @@ - - @@ -14,7 +14,7 @@ Filter events diff --git a/src/howitz/templates/components/toolbar/table-sort-btn.html b/src/howitz/templates/components/toolbar/table-sort-btn.html index b0589f0f..46ed7fc3 100644 --- a/src/howitz/templates/components/toolbar/table-sort-btn.html +++ b/src/howitz/templates/components/toolbar/table-sort-btn.html @@ -1,5 +1,5 @@ - - @@ -18,7 +18,7 @@ Sort events diff --git a/src/howitz/templates/includes/configs.html b/src/howitz/templates/includes/configs.html index 713e64df..2e899ab8 100644 --- a/src/howitz/templates/includes/configs.html +++ b/src/howitz/templates/includes/configs.html @@ -2,3 +2,29 @@ + + + \ No newline at end of file diff --git a/src/howitz/templates/includes/zino-logo.svg b/src/howitz/templates/includes/zino-logo.svg index 02888069..515f48e0 100644 --- a/src/howitz/templates/includes/zino-logo.svg +++ b/src/howitz/templates/includes/zino-logo.svg @@ -1,10 +1,80 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/howitz/templates/layouts/base.html b/src/howitz/templates/layouts/base.html index f606ed0e..2287afad 100644 --- a/src/howitz/templates/layouts/base.html +++ b/src/howitz/templates/layouts/base.html @@ -1,7 +1,7 @@ Howitz | {% block page_title %}{% endblock %} @@ -16,10 +16,10 @@ - {% include "includes/configs.html" %} - {% include "includes/scripts.html" %} + {% include "includes/configs.html" %} + {% include "includes/style.html" %} diff --git a/src/howitz/templates/responses/502.html b/src/howitz/templates/responses/502.html index bbb53108..08b5a516 100644 --- a/src/howitz/templates/responses/502.html +++ b/src/howitz/templates/responses/502.html @@ -1,11 +1,11 @@ {% block content %} 502 Bad Gateway - {{ err_msg }} + {{ err_msg }} {% endblock %} diff --git a/src/howitz/templates/responses/checked-box.html b/src/howitz/templates/responses/checked-box.html index e4aa9e3e..95873224 100644 --- a/src/howitz/templates/responses/checked-box.html +++ b/src/howitz/templates/responses/checked-box.html @@ -2,7 +2,7 @@ class="flex items-center"> Expand alert {% include "/components/popups/alerts/error/maximize-icon.svg" %} diff --git a/src/howitz/templates/responses/collapse-row.html b/src/howitz/templates/responses/collapse-row.html index a0ce6faf..6a2f3fe1 100644 --- a/src/howitz/templates/responses/collapse-row.html +++ b/src/howitz/templates/responses/collapse-row.html @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/src/howitz/templates/responses/expand-error-alert.html b/src/howitz/templates/responses/expand-error-alert.html index d5a09cd9..f4748780 100644 --- a/src/howitz/templates/responses/expand-error-alert.html +++ b/src/howitz/templates/responses/expand-error-alert.html @@ -12,7 +12,7 @@ hx-get="/alert/{{ alert_id }}/show-minimized-error" hx-target="#error-msg-{{ alert_id }}-maximized" hx-swap="delete" - class="ms-auto -my-1.5 bg-opacity-20 bg-white text-gray-400 hover:text-gray-100 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" + class="ms-auto -my-1.5 bg-opacity-20 bg-white text-zinc-400 hover:text-zinc-100 rounded-lg focus:ring-2 focus:ring-zinc-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" aria-label="Collapse alert"> Collapse alert {% include "/components/popups/alerts/error/minimize-icon.svg" %} diff --git a/src/howitz/templates/responses/unchecked-box.html b/src/howitz/templates/responses/unchecked-box.html index 70747c0e..43354c72 100644 --- a/src/howitz/templates/responses/unchecked-box.html +++ b/src/howitz/templates/responses/unchecked-box.html @@ -1,7 +1,7 @@ {% include "/components/accordion/event-details-content.html" %} diff --git a/src/howitz/templates/views/login.html b/src/howitz/templates/views/login.html index 93085fd9..2dab218d 100644 --- a/src/howitz/templates/views/login.html +++ b/src/howitz/templates/views/login.html @@ -10,12 +10,14 @@ Login page - + - {% include "/includes/zino-logo.svg"%} + {% with height='40' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %} - Sign in to Zino + Sign in to Zino
{{ sort.description }}
Toggle columns
Filter events
Sort events
Bad Gateway
{{ err_msg }}