Browse Source

Adjust admin layout to fix issues when SSO is enabled

Signed-off-by: BlackDex <black.dex@gmail.com>
pull/7163/head
BlackDex 4 weeks ago
parent
commit
9393f946f8
No known key found for this signature in database GPG Key ID: 58C80A2AA6C765E1
  1. 15
      src/static/scripts/admin.css
  2. 2
      src/static/templates/admin/base.hbs
  3. 2
      src/static/templates/admin/diagnostics.hbs
  4. 2
      src/static/templates/admin/login.hbs
  5. 2
      src/static/templates/admin/organizations.hbs
  6. 2
      src/static/templates/admin/settings.hbs
  7. 4
      src/static/templates/admin/users.hbs

15
src/static/scripts/admin.css

@ -1,6 +1,17 @@
body { body {
padding-top: 75px; padding-top: 75px;
} }
/* Some extra width's for the main layout */
@media (min-width: 1600px) {
.container-xxl {
max-width: 1520px;
}
}
@media (min-width: 1800px) {
.container-xxl {
max-width: 1720px;
}
}
img { img {
width: 48px; width: 48px;
height: 48px; height: 48px;
@ -38,8 +49,8 @@ img {
max-width: 130px; max-width: 130px;
} }
#users-table .vw-actions, #orgs-table .vw-actions { #users-table .vw-actions, #orgs-table .vw-actions {
min-width: 155px; min-width: 170px;
max-width: 160px; max-width: 180px;
} }
#users-table .vw-org-cell { #users-table .vw-org-cell {
max-height: 120px; max-height: 120px;

2
src/static/templates/admin/base.hbs

@ -27,7 +27,7 @@
</symbol> </symbol>
</svg> </svg>
<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4 shadow fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4 shadow fixed-top">
<div class="container-xl"> <div class="container-xxl">
<a class="navbar-brand" href="{{urlpath}}/admin"><img class="vaultwarden-icon" src="{{urlpath}}/vw_static/vaultwarden-icon.png" alt="V">aultwarden Admin</a> <a class="navbar-brand" href="{{urlpath}}/admin"><img class="vaultwarden-icon" src="{{urlpath}}/vw_static/vaultwarden-icon.png" alt="V">aultwarden Admin</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">

2
src/static/templates/admin/diagnostics.hbs

@ -1,4 +1,4 @@
<main class="container-xl"> <main class="container-xxl">
<div id="diagnostics-block" class="my-3 p-3 rounded shadow"> <div id="diagnostics-block" class="my-3 p-3 rounded shadow">
<h6 class="border-bottom pb-2 mb-2">Diagnostics</h6> <h6 class="border-bottom pb-2 mb-2">Diagnostics</h6>

2
src/static/templates/admin/login.hbs

@ -1,4 +1,4 @@
<main class="container-xl"> <main class="container-xxl">
{{#if error}} {{#if error}}
<div class="align-items-center p-3 mb-3 text-opacity-50 text-dark bg-warning rounded shadow"> <div class="align-items-center p-3 mb-3 text-opacity-50 text-dark bg-warning rounded shadow">
<div> <div>

2
src/static/templates/admin/organizations.hbs

@ -1,4 +1,4 @@
<main class="container-xl"> <main class="container-xxl">
<div id="organizations-block" class="my-3 p-3 rounded shadow"> <div id="organizations-block" class="my-3 p-3 rounded shadow">
<h6 class="border-bottom pb-2 mb-3">Organizations</h6> <h6 class="border-bottom pb-2 mb-3">Organizations</h6>
<div class="table-responsive-xl small"> <div class="table-responsive-xl small">

2
src/static/templates/admin/settings.hbs

@ -1,4 +1,4 @@
<main class="container-xl"> <main class="container-xxl">
<div id="admin_token_warning" class="alert alert-warning alert-dismissible fade show d-none"> <div id="admin_token_warning" class="alert alert-warning alert-dismissible fade show d-none">
<button type="button" class="btn-close" data-bs-target="admin_token_warning" data-bs-dismiss="alert" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-target="admin_token_warning" data-bs-dismiss="alert" aria-label="Close"></button>
You are using a plain text `ADMIN_TOKEN` which is insecure.<br> You are using a plain text `ADMIN_TOKEN` which is insecure.<br>

4
src/static/templates/admin/users.hbs

@ -1,4 +1,4 @@
<main class="container-xl"> <main class="container-xxl">
<div id="users-block" class="my-3 p-3 rounded shadow"> <div id="users-block" class="my-3 p-3 rounded shadow">
<h6 class="border-bottom pb-2 mb-3">Registered Users</h6> <h6 class="border-bottom pb-2 mb-3">Registered Users</h6>
<div class="table-responsive-xl small"> <div class="table-responsive-xl small">
@ -43,7 +43,7 @@
</td> </td>
{{#if ../sso_enabled}} {{#if ../sso_enabled}}
<td> <td>
<span class="d-block">{{sso_identifier}}</span> <span class="d-block text-break text-wrap">{{sso_identifier}}</span>
</td> </td>
{{/if}} {{/if}}
<td> <td>

Loading…
Cancel
Save