new home popup / styling

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

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 )

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,
+                });
+
             }
         );
     };

src/client/app/tmpl/group-detail-edit.html

@@ -119,7 +119,7 @@
                             <%= _lc( 'BTN_GROUP_TERMS_RESET' ) %>
                         </button>
                         <p>
-                            <small><%= _lc( 'GROUP_TERMS_RESET_DESCRIPTION' ) %></small>
+                            <small><span class="fa fa-exclamation-triangle"></span> <%= _lc( 'GROUP_TERMS_RESET_DESCRIPTION' ) %></small>
                         </p>
                     </div>
                     <div class="form-group">

src/client/app/tmpl/group-member-management.html

@@ -3,7 +3,7 @@
     <div class="col-sm-12">
         <div class="card">
             <div class="card-header">
-                <div class="row">
+                <div class="row" style="padding-bottom: 10px;">
                     <div class="col">
                         <label><%= _lc( 'GROUP' ) %></label>
                         <select class="form-control form-control-sm"

src/client/app/tmpl/gui-navbar-notification-dropdown.html

@@ -35,7 +35,7 @@
     <%= _lc( 'NOTIFICATION_EMPTY' ) %>
 </p>
 <% }    %>
-<div>
+<div style="padding: 0 0.7rem;">
     <button data-id="btn-mark-all-notifications-as-read"
             class="btn btn-link btn-sm btn-primary dropdown-item text-center">
         <%= _lc( 'MARK_ALL_NOTIFICATION_AS_READ' ) %>

src/client/app/tmpl/home-modal-terms-not-accepted.html

@@ -0,0 +1 @@
+INHALT<br /><br />