diff --git a/src/app/appmarket/admin/configuration/details/configurationdetails.component.html b/src/app/appmarket/admin/configuration/details/configurationdetails.component.html index eb7367d76829dbc292e3efdea5f336dc6cb838d2..88eab2f854b50262c29235fa6f525437813ef728 100644 --- a/src/app/appmarket/admin/configuration/details/configurationdetails.component.html +++ b/src/app/appmarket/admin/configuration/details/configurationdetails.component.html @@ -5,8 +5,8 @@ <form (submit)="save()" class="form-horizontal" #configurationForm="ngForm" *ngIf="this.configuration"> <div class="form-group"> <label for="setMaintenance" - class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label> - <div class="col-sm-10 pd-top-7"> + class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label> + <div class="col-sm-9 pd-top-7"> <input type="checkbox" id="setMaintenance" name="setMaintenance" [(ngModel)]="this.configuration.maintenance" [checked]="this.configuration.maintenance === true"> @@ -14,8 +14,8 @@ </div> <div class="form-group"> <label for="SSOLoginAllowed" - class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label> - <div class="col-sm-10 pd-top-7"> + class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label> + <div class="col-sm-9 pd-top-7"> <input type="checkbox" id="SSOLoginAllowed" name="SSOLoginAllowed" [(ngModel)]="this.configuration.ssoLoginAllowed" [checked]="this.configuration.ssoLoginAllowed === true"> @@ -23,7 +23,7 @@ </div> <div class="form-group"> <label for="defaultLang" - class="col-sm-2 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label> + class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label> <div class="col-sm-3"> <select id="defaultLang" #langSelect class="form-control" (change)="this.configuration.defaultLanguage = langSelect.value"> @@ -34,8 +34,8 @@ </div> <div class="form-group"> <label for="testInstance" - class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label> - <div class="col-sm-10 pd-top-7"> + class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label> + <div class="col-sm-9 pd-top-7"> <input type="checkbox" id="testInstance" name="testInstance" [(ngModel)]="this.configuration.testInstance" [checked]="this.configuration.testInstance === true"> @@ -43,29 +43,22 @@ </div> <div class="form-group"> <label for="sendAppInstanceFailureEmails" - class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label> - <div class="col-sm-10 pd-top-7"> + class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label> + <div class="col-sm-9 pd-top-7"> <input type="checkbox" id="sendAppInstanceFailureEmails" name="sendAppInstanceFailureEmails" [(ngModel)]="this.configuration.sendAppInstanceFailureEmails"> </div> </div> - <div class="form-group"> - <label for="registrationDomainSelectionEnabled" - class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label> - <div class="col-sm-10 pd-top-7"> - <input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled" - [(ngModel)]="this.configuration.registrationDomainSelectionEnabled"> - </div> - </div> + <div class="form-group"> - <span class="control-label col-sm-2"> - <strong> - {{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS_LIST' | translate }} - </strong> - </span> + <span class="control-label col-sm-3"> + <strong> + {{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS_LIST' | translate }} + </strong> + </span> - <div class="col-sm-10 display-emails"> + <div class="col-sm-9 display-emails"> <div *ngFor="let email of configuration.appInstanceFailureEmailList; let i=index; trackBy:trackByFn" class="col-lg-6 col-md-10 col-sm-12 pd-bottom-5 row email-row"> <div class="email-input"> @@ -84,9 +77,37 @@ </button> </div> </div> + </div> + <div class="form-group"> + <label for="registrationDomainSelectionEnabled" + class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label> + <div class="col-sm-9 pd-top-7"> + <input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled" + [(ngModel)]="this.configuration.registrationDomainSelectionEnabled"> + </div> + </div> + + <div class="form-group"> + <label for="bulkDomainsAllowForSsoAccounts" + class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS' | translate}}</label> + <div class="col-sm-9 pd-top-7"> + <input type="checkbox" id="bulkDomainsAllowForSsoAccounts" name="bulkDomainsAllowForSsoAccounts" + [(ngModel)]="this.configuration.bulkDomainsAllowForSsoAccounts" + [checked]="this.configuration.bulkDomainsAllowForSsoAccounts === true"> + </div> + </div> + <div class="form-group"> + <label for="bulkDomainsSendEmailForNewAccounts" + class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS' | translate}}</label> + <div class="col-sm-9 pd-top-7"> + <input type="checkbox" id="bulkDomainsSendEmailForNewAccounts" name="bulkDomainsSendEmailForNewAccounts" + [(ngModel)]="this.configuration.bulkDomainsSendEmailForNewAccounts" + [checked]="this.configuration.bulkDomainsSendEmailForNewAccounts === true"> + </div> </div> + <button class="btn btn-primary" type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button> <div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg"> diff --git a/src/app/model/configuration.ts b/src/app/model/configuration.ts index b4fd4297feab41ae1384f8b416e3424c3c5f3cc1..cdd7538021577c89feb424105293040dc43cd301 100644 --- a/src/app/model/configuration.ts +++ b/src/app/model/configuration.ts @@ -6,5 +6,7 @@ export class Configuration { public testInstance: boolean; public sendAppInstanceFailureEmails: boolean; public registrationDomainSelectionEnabled: boolean; + public bulkDomainsAllowForSsoAccounts: boolean; + public bulkDomainsSendEmailForNewAccounts: boolean; public appInstanceFailureEmailList: string[] = []; }