Merge branch 'master' into beta

src/client/app/css/app.css

@@ -542,6 +542,11 @@ body.body-auth .action-button {
     display: block;
 }
 
+.group-terms {
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 15px;
+}
+
 .button-like-modal-footer {
     border-top: 1px solid #e9ecef;
     padding: 0.5rem;

src/client/app/tmpl/group-terms.html

@@ -19,7 +19,8 @@
                     <p>
                         <strong><%= _lc( 'GROUP_TERMS_DESCRIPTION' ) %></strong>
                     </p>
-                    <p><%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %></p>
+                    <div class="group-terms"><p><%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %></p></div>
+
                     <% if ( group.getTermsConditionsActive() ) {    %>
                         <div class="form-group">
                             <div class="custom-control custom-checkbox my-1 mr-sm-2">

src/server/server/control/TB_Server_Control_Auth.php

@@ -708,7 +708,9 @@ class TB_Server_Control_Auth
                     'team_id' => $team->id,
                     'role' => TB_Shared_Ent_TeamData_Profile::ROLE_TRAINER,
                     'is_anonymous' => 0,
-                    'join_dt' => TB_Server_Utils_Helper::getUTCNowDateTime()
+                    'join_dt' => TB_Server_Utils_Helper::getUTCNowDateTime(),
+                    'status' => TB_Shared_Ent_TeamData_Profile::STATUS_ACTIVE,
+                    'terms_accepted' => 0
                 ));
                 $profile->teams_js = $teamsJson;
                 $profile->save();