From 1fe34cda084b3fdccffee98a06052f5c29cb8b9b Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Fri, 7 Jul 2023 16:56:18 +0200 Subject: [PATCH] WIP Popup Homepage --- src/client/app/css/app.css | 9 +++++++++ src/client/app/js/app/core/Dict.js | 4 ++++ src/client/app/js/app/core/View.js | 10 ++++++++++ src/client/app/js/app/state/Home.js | 15 +++++++++++++++ src/client/app/tmpl/home-modal-not-activated.html | 5 +++++ 5 files changed, 43 insertions(+) create mode 100644 src/client/app/tmpl/home-modal-not-activated.html diff --git a/src/client/app/css/app.css b/src/client/app/css/app.css index ff52b1c..53d8c3d 100644 --- a/src/client/app/css/app.css +++ b/src/client/app/css/app.css @@ -542,6 +542,15 @@ body.body-auth .action-button { display: block; } +.button-like-modal-footer { + border-top: 1px solid #e9ecef; + padding: 0.5rem; + display: flex; + align-items: center; + justify-content: flex-end; + margin: 2rem -1rem -2rem -1rem; +} + ::-webkit-input-placeholder { font-style: italic; } diff --git a/src/client/app/js/app/core/Dict.js b/src/client/app/js/app/core/Dict.js index 894bc29..ac4d3e0 100644 --- a/src/client/app/js/app/core/Dict.js +++ b/src/client/app/js/app/core/Dict.js @@ -552,6 +552,10 @@ app.core.Dict = { "MEMBER_STATUS_CHANGED" : "Status erfolgreich geändert.", "GROUP_DETAIL_NOTE_INACTIVE_OR_NOT_APPROVED" : "Du bist bereits Mitglied dieser Gruppe, deine volle Mitgliedschaft muss von einem Admin aktiviert werden. Aktuell kannst du noch keine Gruppentermine sehen oder an ihnen teilnehmen.", "GROUP_DETAIL_STATUS" : "Dein Gruppenstatus", + "HOME_MODAL_NOT_ACTIVATED_TITLE" : "Herzlich Willkommen", + "HOME_MODAL_NOT_ACTIVATED_TEXT1" : "Herzlich Willkommen bei", + "HOME_MODAL_NOT_ACTIVATED_TEXT2" : "Ihre Registrierung war erfolgreich, bitte vervollständigen Sie schon Ihr Profil, damit der Gruppeninhaber Ihre Anmeldung bestätigen kann. Sie werden benachrichtigt, sobald die Freigabe erfolgt ist.", + "HOME_MODAL_NOT_ACTIVATED_BUTTON" : "Profil vervollständigen", }, "en" : { } diff --git a/src/client/app/js/app/core/View.js b/src/client/app/js/app/core/View.js index 71bd21a..05d1475 100644 --- a/src/client/app/js/app/core/View.js +++ b/src/client/app/js/app/core/View.js @@ -189,6 +189,8 @@ app.core.View = (function(){ okBtnText = params.okButtonText || _lc( 'MODAL_BTN_OK' ), cancelBtnText = params.cancelButtonText || _lc( 'MODAL_BTN_CANCEL' ), showOnlyCloseButton = params.hasOwnProperty( 'showOnlyCloseButton' ) ? params.showOnlyCloseButton : false, + hideButtons = params.hasOwnProperty( 'hideButtons' ) ? params.hideButtons : false, + hideCloseBtn = params.hasOwnProperty( 'hideCloseBtn' ) ? params.hideCloseBtn : false, cbOnConfirm = params.onConfirm || null, cbOnShow = params.onShow || null, cbOnHide = params.onHide || null, @@ -236,6 +238,14 @@ app.core.View = (function(){ { $modal.find( '[data-id="modal-general-btn-ok"]' ).first().show(); } + if ( true === hideButtons ) + { + $modal.find( '.modal-footer' ).hide(); + } + if ( true === hideCloseBtn ) + { + $modal.find( '.modal-header .close' ).hide(); + } $modal.on( 'shown.bs.modal', function( e ) { diff --git a/src/client/app/js/app/state/Home.js b/src/client/app/js/app/state/Home.js index 7920029..b2cf2a3 100644 --- a/src/client/app/js/app/state/Home.js +++ b/src/client/app/js/app/state/Home.js @@ -1036,6 +1036,21 @@ app.state.Home = function() } ); + // TODO: Nur, wenn nicht aktiviert + app.core.View.showModal({ + title: _lc('HOME_MODAL_NOT_ACTIVATED_TITLE'), + body: app.core.View.getTemplate('home-modal-not-activated'), + hideButtons: true, + hideCloseBtn: true, + cancelButtonText: _lc('HOME_MODAL_NOT_ACTIVATED_BUTTON') + }); + + $("body").on( 'click', '[data-id="not-activated"]', function(e) + { + e.preventDefault(); + app.core.View.closeModal(); + window.location.href = $(this).attr("href"); + }); } ); }; diff --git a/src/client/app/tmpl/home-modal-not-activated.html b/src/client/app/tmpl/home-modal-not-activated.html new file mode 100644 index 0000000..23c4f68 --- /dev/null +++ b/src/client/app/tmpl/home-modal-not-activated.html @@ -0,0 +1,5 @@ +<%= _lc( 'HOME_MODAL_NOT_ACTIVATED_TEXT1' ) %> .

+<%= _lc( 'HOME_MODAL_NOT_ACTIVATED_TEXT2' ) %> +