From e88a602baf6613aa81744d3ae4d719e9335ed670 Mon Sep 17 00:00:00 2001 From: Melina Gamboa Date: Tue, 8 Jun 2021 20:59:11 +0200 Subject: [PATCH 1/5] Changed users table groups field --- admin/src/admin/static/js/users.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/src/admin/static/js/users.js b/admin/src/admin/static/js/users.js index edd8d4b..c09ca77 100644 --- a/admin/src/admin/static/js/users.js +++ b/admin/src/admin/static/js/users.js @@ -148,9 +148,9 @@ $(document).ready(function() { // ' \ }, { "data": "first", "width": "10px"}, - { "data": "last", "width": "200px"}, + { "data": "last", "width": "150px"}, { "data": "email", "width": "10px"}, - { "data": "keycloak_groups", "width": "10px" }, + { "data": "keycloak_groups", "width": "50px" }, { "data": "roles", "width": "10px" }, ], "order": [[6, 'asc']], @@ -177,7 +177,11 @@ $(document).ready(function() { { "targets": 8, "render": function ( data, type, full, meta ) { - return "
  • " + full.keycloak_groups.join("
  • ") + "
    • " + grups = '' + full.keycloak_groups.forEach(element => { + grups += '' + element + '' + }) + return grups }}, ] } ); From 80990552b30f06727d1c165324f8ca375fdd72e6 Mon Sep 17 00:00:00 2001 From: Melina Gamboa Date: Tue, 8 Jun 2021 20:36:08 +0200 Subject: [PATCH 2/5] Flash error messages --- admin/src/admin/static/templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/admin/static/templates/login.html b/admin/src/admin/static/templates/login.html index 7b89630..216e05a 100644 --- a/admin/src/admin/static/templates/login.html +++ b/admin/src/admin/static/templates/login.html @@ -73,7 +73,7 @@ title: "{{ nav }}", text: "{{ message }}", hide: true, - /~ icon: 'fa fa-alert-sign', + // icon: 'fa fa-alert-sign', opacity: 1, type: "error", addclass: "pnotify-center" From 22184907632ca7e1a99a988c529521bc010de32f Mon Sep 17 00:00:00 2001 From: Melina Gamboa Date: Tue, 8 Jun 2021 20:00:47 +0200 Subject: [PATCH 3/5] Password style changes --- .../templates/pages/modals/users_modals.html | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/admin/src/admin/static/templates/pages/modals/users_modals.html b/admin/src/admin/static/templates/pages/modals/users_modals.html index 1909e54..e298bcf 100644 --- a/admin/src/admin/static/templates/pages/modals/users_modals.html +++ b/admin/src/admin/static/templates/pages/modals/users_modals.html @@ -114,18 +114,24 @@
    -
    -
    - This is a proposed password.
    - Change it for the one desired for this user.
    - REMEMBER TO COPY THIS PASSWORD AS IT IS THE ONLY TIME YOU WILL SEE IT +
    +
    +

    REMEMBER TO COPY THIS PASSWORD AS IT IS THE ONLY TIME YOU WILL SEE IT

    +
    -
    -
    - - - +
    +
    +
    + This is a proposed password. Change it for the desired one for this user.
    +
    +
    +
    +
    + + + +
    From ec23d2ecb7534d56ef62ff404d0a436f869a4011 Mon Sep 17 00:00:00 2001 From: Melina Gamboa Date: Tue, 8 Jun 2021 19:20:50 +0200 Subject: [PATCH 4/5] Only keycloak roles and enabled checkbox added --- .../templates/pages/modals/users_modals.html | 22 ++++++++++++++++--- .../admin/static/templates/pages/users.html | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/admin/src/admin/static/templates/pages/modals/users_modals.html b/admin/src/admin/static/templates/pages/modals/users_modals.html index e298bcf..3daef4d 100644 --- a/admin/src/admin/static/templates/pages/modals/users_modals.html +++ b/admin/src/admin/static/templates/pages/modals/users_modals.html @@ -17,6 +17,22 @@
    +
    +
    +
    + +
    + +
    +
    +
    +

    User info

    @@ -63,7 +79,7 @@
    -
    + +
    +
    @@ -203,6 +203,7 @@
    +
    @@ -213,7 +214,7 @@
    - +
    --> -
    +
    -