diff --git a/src/client/app/js/app/core/Dict.js b/src/client/app/js/app/core/Dict.js index 661ab98..5c1dd96 100644 --- a/src/client/app/js/app/core/Dict.js +++ b/src/client/app/js/app/core/Dict.js @@ -576,6 +576,7 @@ app.core.Dict = { "HOME_MODAL_NOT_ACTIVATED_TEXT1" : "Herzlich Willkommen bei", "HOME_MODAL_NOT_ACTIVATED_TEXT2" : "Ihre Registrierung war erfolgreich. Der Gruppeninhaber wurde benachrichtigt und wird Sie in Kürze für die Gruppe freigeben. Bitte ergänzen Sie Ihre Adressdaten und Ihre Telefonnummer im Profil, sollten Rückfragen aufkommen. Vielen Dank.", "HOME_MODAL_NOT_ACTIVATED_BUTTON" : "Profil vervollständigen", + "HOME_MODAL_TERMS_NOT_ACCEPTED_TITLE" : "Nutzungsbedingungen akzeptieren", }, "en" : { } diff --git a/src/client/app/js/app/core/View.js b/src/client/app/js/app/core/View.js index 05d1475..a11b8b3 100644 --- a/src/client/app/js/app/core/View.js +++ b/src/client/app/js/app/core/View.js @@ -194,6 +194,7 @@ app.core.View = (function(){ cbOnConfirm = params.onConfirm || null, cbOnShow = params.onShow || null, cbOnHide = params.onHide || null, + prohibitCloseModal = params.hasOwnProperty( 'prohibitCloseModal' ) ? params.prohibitCloseModal : false, options = { show : true }, isAlert = ( params.hasOwnProperty( 'cancelButtonText' ) && params.cancelButtonText === null ); @@ -259,6 +260,10 @@ app.core.View = (function(){ }); $modal.modal( options ); + + if ( true === prohibitCloseModal ) { + $modal.off(); + } } , closeModal : function( fnOnHidden ) diff --git a/src/client/app/js/app/state/Home.js b/src/client/app/js/app/state/Home.js index f0ff159..c9fb240 100644 --- a/src/client/app/js/app/state/Home.js +++ b/src/client/app/js/app/state/Home.js @@ -1083,6 +1083,14 @@ app.state.Home = function() }); } + app.core.View.showModal({ + title: _lc('HOME_MODAL_TERMS_NOT_ACCEPTED_TITLE'), + body: app.core.View.getTemplate('home-modal-terms-not-accepted', {}), + hideButtons: true, + hideCloseBtn: true, + prohibitCloseModal: true, + }); + } ); }; diff --git a/src/client/app/tmpl/group-detail-edit.html b/src/client/app/tmpl/group-detail-edit.html index 7397cf2..fff13c5 100644 --- a/src/client/app/tmpl/group-detail-edit.html +++ b/src/client/app/tmpl/group-detail-edit.html @@ -119,7 +119,7 @@ <%= _lc( 'BTN_GROUP_TERMS_RESET' ) %>

- <%= _lc( 'GROUP_TERMS_RESET_DESCRIPTION' ) %> + <%= _lc( 'GROUP_TERMS_RESET_DESCRIPTION' ) %>

diff --git a/src/client/app/tmpl/group-member-management.html b/src/client/app/tmpl/group-member-management.html index ec6f864..4448256 100644 --- a/src/client/app/tmpl/group-member-management.html +++ b/src/client/app/tmpl/group-member-management.html @@ -3,7 +3,7 @@
-
+