diff --git a/src/client/app/css/app.css b/src/client/app/css/app.css index cf10f98..c925fe5 100644 --- a/src/client/app/css/app.css +++ b/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; diff --git a/src/client/app/tmpl/group-terms.html b/src/client/app/tmpl/group-terms.html index 5ee6562..ea73c61 100644 --- a/src/client/app/tmpl/group-terms.html +++ b/src/client/app/tmpl/group-terms.html @@ -19,7 +19,8 @@

<%= _lc( 'GROUP_TERMS_DESCRIPTION' ) %>

-

<%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %>

+

<%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %>

+ <% if ( group.getTermsConditionsActive() ) { %>
diff --git a/src/server/server/control/TB_Server_Control_Auth.php b/src/server/server/control/TB_Server_Control_Auth.php index 6cbc8e7..2d1dbca 100644 --- a/src/server/server/control/TB_Server_Control_Auth.php +++ b/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();