Bläddra i källkod

WIP Popup Homepage

master
Florian Eisenmenger 2 år sedan
förälder
incheckning
1fe34cda08
5 ändrade filer med 43 tillägg och 0 borttagningar
  1. +9
    -0
      src/client/app/css/app.css
  2. +4
    -0
      src/client/app/js/app/core/Dict.js
  3. +10
    -0
      src/client/app/js/app/core/View.js
  4. +15
    -0
      src/client/app/js/app/state/Home.js
  5. +5
    -0
      src/client/app/tmpl/home-modal-not-activated.html

+ 9
- 0
src/client/app/css/app.css Visa fil

@@ -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;
}


+ 4
- 0
src/client/app/js/app/core/Dict.js Visa fil

@@ -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" : {
}

+ 10
- 0
src/client/app/js/app/core/View.js Visa fil

@@ -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 )
{


+ 15
- 0
src/client/app/js/app/state/Home.js Visa fil

@@ -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");
});
}
);
};


+ 5
- 0
src/client/app/tmpl/home-modal-not-activated.html Visa fil

@@ -0,0 +1,5 @@
<strong><%= _lc( 'HOME_MODAL_NOT_ACTIVATED_TEXT1' ) %> <!-- HIER DEN NAMEN DER GRUPPE EINFÜGEN -->.</strong><br /><br />
<%= _lc( 'HOME_MODAL_NOT_ACTIVATED_TEXT2' ) %>
<div class="button-like-modal-footer">
<a href="#/configuration/profile" class="btn btn-sm btn-secondary" data-id="not-activated"><%= _lc( 'HOME_MODAL_NOT_ACTIVATED_BUTTON' ) %></a>
</div>

Laddar…
Avbryt
Spara