From 5e4cb0fc6caa32534f53b4b784bc7d9562246342 Mon Sep 17 00:00:00 2001 From: darta Date: Fri, 4 Feb 2022 07:09:40 +0000 Subject: [PATCH] fix(admin): topbar and system menu --- .../static/templates/pages/dashboard.html | 7 +- admin/src/admin/static/templates/sidebar.html | 13 + .../api/src/api/static/_templates/admin.html | 110 +++-- .../src/api/static/_templates/admin_old.html | 391 ++++++++++++++++++ docker/api/src/api/static/_templates/sso.html | 110 +++-- .../src/api/static/_templates/sso_old.html | 330 +++++++++++++++ 6 files changed, 896 insertions(+), 65 deletions(-) create mode 100644 docker/api/src/api/static/_templates/admin_old.html create mode 100644 docker/api/src/api/static/_templates/sso_old.html diff --git a/admin/src/admin/static/templates/pages/dashboard.html b/admin/src/admin/static/templates/pages/dashboard.html index 1f96a31..63d2cfe 100644 --- a/admin/src/admin/static/templates/pages/dashboard.html +++ b/admin/src/admin/static/templates/pages/dashboard.html @@ -119,17 +119,22 @@
- + +

It will appear in Moodle's (Aules/Aulas) background. We recomend using a grey color.

+

It will appear in main top bar menú and Moodle's (Aules/Aulas) buttons. We recomend using a corporate color.

+

It will appear in some secondary buttons in Moodle. We recommend white, unless corporate color is clear.

diff --git a/admin/src/admin/static/templates/sidebar.html b/admin/src/admin/static/templates/sidebar.html index 4b62e3d..0cb71f2 100644 --- a/admin/src/admin/static/templates/sidebar.html +++ b/admin/src/admin/static/templates/sidebar.html @@ -15,7 +15,20 @@
  • Import
  • Customization
  • Legal
    • + + + + {% if current_user.role == 'admin' %} +

    System Admin

    +
    + + {% endif %} +
    • About
      • diff --git a/docker/api/src/api/static/_templates/admin.html b/docker/api/src/api/static/_templates/admin.html index 5c76f77..ff1a5d7 100644 --- a/docker/api/src/api/static/_templates/admin.html +++ b/docker/api/src/api/static/_templates/admin.html @@ -63,6 +63,7 @@ position: relative; } + /* MEGAMENÚ */ #header #navbar-menu-apps #menu-apps-btn { cursor: pointer; position: relative; @@ -71,7 +72,7 @@ #header #navbar-menu-apps #menu-apps-btn #dropdownMenuAppsButton { cursor: pointer; height: 16px; - margin-right: 16px; + padding: 0px 15px; } #header @@ -141,15 +142,6 @@ font-size: 19px; } - #header #navbar-menu-apps .dropdown-menu ul li.app a.app-link .text { - text-align: center; - margin-top: 4px; - height: 26px; - font-size: 13px; - line-height: 15px; - overflow-wrap: anywhere; - } - #header #header-left, #header .header-left, #header #header-right, @@ -158,6 +150,26 @@ align-items: center; } + #navbar-menu-apps:hover #dropdownMenuApps { + display: block; + } + + /* AVATAR IMAGE AND DROPDOWN */ + #avatarimg { + border-radius: 50%; + flex-shrink: 0; + } + + .icon { + font-size: 26px; + line-height: 1em; + width: 40px; + } + + .dropdown { + left: -115px; + } + #navbar-nextcloud #user_avatar .avatardiv img { height: 39px; width: 39px; @@ -165,9 +177,33 @@ margin-right: 10px; } - .avatar>img, .avatardiv>img { - border-radius: 50%; - flex-shrink: 0; + /* Dropdown Content (Hidden by Default) */ + .dropdown-content { + display: none; + position: absolute; + min-width: 160px; + z-index: 1; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 5px; + background-color: white; + } + + /* Links inside the dropdown */ + .dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; + } + + /* Change color of dropdown links on hover */ + .dropdown-content a:hover { + background-color: #ddd; + } + + /* Show the dropdown menu on hover */ + #user_avatar:hover .dropdown-content { + display: block; } {% endblock %} @@ -179,7 +215,7 @@