Skip to content
Snippets Groups Projects
Commit 5eac412a authored by kbeyro's avatar kbeyro
Browse files

update list views

parent 14b67ab3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/appmarket/admin/configuration/configuration.module.ts
+ 11
− 9
View file @ 5eac412a
...@@ -9,20 +9,22 @@ import {PipesModule} from '../../../pipe/pipes.module'; ...@@ -9,20 +9,22 @@ import {PipesModule} from '../../../pipe/pipes.module';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {TranslateModule} from '@ngx-translate/core'; import {TranslateModule} from '@ngx-translate/core';
import {InternationalizationService} from "../../../service/internationalization.service"; import {InternationalizationService} from "../../../service/internationalization.service";
import {ClustersModule} from '../clusters/clusters.module';
@NgModule({ @NgModule({
declarations: [ declarations: [
ConfigurationDetailsComponent, ConfigurationDetailsComponent,
], ],
imports: [ imports: [
CommonModule, CommonModule,
RouterModule, RouterModule,
SharedModule, SharedModule,
AuthModule, AuthModule,
FormsModule, FormsModule,
PipesModule, PipesModule,
TranslateModule.forChild() TranslateModule.forChild(),
], ClustersModule
],
providers: [ providers: [
ConfigurationService, ConfigurationService,
InternationalizationService InternationalizationService
......
src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+ 82
− 77
View file @ 5eac412a
<div class="panel panel-default"> <div class="col-sm-12 col-sm-12 col-md-12" >
<div class="panel-heading">{{ 'PORTAL_CONFIGURATION.TITLE' | translate }}</div> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-heading">{{ 'PORTAL_CONFIGURATION.TITLE' | translate }}</div>
<form (submit)="save()" class="form-horizontal" #configurationForm="ngForm" *ngIf="this.configuration"> <div class="panel-body">
<div class="form-group"> <form (submit)="save()" class="form-horizontal" #configurationForm="ngForm" *ngIf="this.configuration">
<label for="setMaintenance" <div class="form-group">
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label> <label for="setMaintenance"
<div class="col-sm-10 pd-top-7"> class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label>
<input type="checkbox" id="setMaintenance" name="setMaintenance" <div class="col-sm-10 pd-top-7">
[(ngModel)]="this.configuration.maintenance" <input type="checkbox" id="setMaintenance" name="setMaintenance"
[checked]="this.configuration.maintenance === true"> [(ngModel)]="this.configuration.maintenance"
[checked]="this.configuration.maintenance === true">
</div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="SSOLoginAllowed"
<label for="SSOLoginAllowed" class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label>
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label> <div class="col-sm-10 pd-top-7">
<div class="col-sm-10 pd-top-7"> <input type="checkbox" id="SSOLoginAllowed" name="SSOLoginAllowed"
<input type="checkbox" id="SSOLoginAllowed" name="SSOLoginAllowed" [(ngModel)]="this.configuration.ssoLoginAllowed"
[(ngModel)]="this.configuration.ssoLoginAllowed" [checked]="this.configuration.ssoLoginAllowed === true">
[checked]="this.configuration.ssoLoginAllowed === true"> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="defaultLang"
<label for="defaultLang" class="col-sm-2 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label>
class="col-sm-2 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label> <div class="col-sm-3">
<div class="col-sm-3"> <select id="defaultLang" #langSelect class="form-control"
<select id="defaultLang" #langSelect class="form-control" (change)="this.configuration.defaultLanguage = langSelect.value">
(change)="this.configuration.defaultLanguage = langSelect.value"> <option *ngFor="let lang of languages" [value]="lang.language"
<option *ngFor="let lang of languages" [value]="lang.language" [selected]="lang.language === configuration.defaultLanguage">{{'LANGUAGE.' + lang.language.toUpperCase() + '_LABEL' | translate}}</option>
[selected]="lang.language === configuration.defaultLanguage">{{'LANGUAGE.' + lang.language.toUpperCase() + '_LABEL' | translate}}</option> </select>
</select> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="testInstance"
<label for="testInstance" class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label>
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label> <div class="col-sm-10 pd-top-7">
<div class="col-sm-10 pd-top-7"> <input type="checkbox" id="testInstance" name="testInstance"
<input type="checkbox" id="testInstance" name="testInstance" [(ngModel)]="this.configuration.testInstance"
[(ngModel)]="this.configuration.testInstance" [checked]="this.configuration.testInstance === true">
[checked]="this.configuration.testInstance === true"> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="sendAppInstanceFailureEmails"
<label for="sendAppInstanceFailureEmails" class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label>
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label> <div class="col-sm-10 pd-top-7">
<div class="col-sm-10 pd-top-7"> <input type="checkbox" id="sendAppInstanceFailureEmails" name="sendAppInstanceFailureEmails"
<input type="checkbox" id="sendAppInstanceFailureEmails" name="sendAppInstanceFailureEmails" [(ngModel)]="this.configuration.sendAppInstanceFailureEmails">
[(ngModel)]="this.configuration.sendAppInstanceFailureEmails"> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="registrationDomainSelectionEnabled"
<label for="registrationDomainSelectionEnabled" class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label>
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label> <div class="col-sm-10 pd-top-7">
<div class="col-sm-10 pd-top-7"> <input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled"
<input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled" [(ngModel)]="this.configuration.registrationDomainSelectionEnabled">
[(ngModel)]="this.configuration.registrationDomainSelectionEnabled"> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group">
<span class="control-label col-sm-2"> <span class="control-label col-sm-2">
<strong> <strong>
...@@ -64,33 +65,37 @@ ...@@ -64,33 +65,37 @@
</strong> </strong>
</span> </span>
<div class="col-sm-10 display-emails"> <div class="col-sm-10 display-emails">
<div *ngFor="let email of configuration.appInstanceFailureEmailList; let i=index; trackBy:trackByFn" <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"> class="col-lg-6 col-md-10 col-sm-12 pd-bottom-5 row email-row">
<div class="email-input"> <div class="email-input">
<input class="form-control" type="text" <input class="form-control" type="text"
id="appInstanceFailureEmailList.{{i}}" id="appInstanceFailureEmailList.{{i}}"
name="appInstanceFailureEmailList.{{i}}" name="appInstanceFailureEmailList.{{i}}"
[(ngModel)]="configuration.appInstanceFailureEmailList[i]"/> [(ngModel)]="configuration.appInstanceFailureEmailList[i]"/>
</div> </div>
<button role="button" type="button" class="btn btn-default" (click)="removeEmailEntry(email)"> <button role="button" type="button" class="btn btn-default" (click)="removeEmailEntry(email)">
Remove Remove
</button> </button>
</div> </div>
<div class="pd-left-15"> <div class="pd-left-15">
<button role="button" type="button" class="btn btn-success" (click)="addEmailEntry()">Add <button role="button" type="button" class="btn btn-success" (click)="addEmailEntry()">Add
</button> </button>
</div>
</div> </div>
</div>
</div> </div>
<button class="btn btn-primary" <button class="btn btn-primary"
type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button> type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
<div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg"> <div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg">
{{errorMsg}} {{errorMsg}}
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
<app-clusterdetails></app-clusterdetails>
src/app/appmarket/domains/list/domainslist.component.html
+ 1
− 1
View file @ 5eac412a
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</li> </li>
</ul> </ul>
</span> </span>
<input pInputText name="search" id="search" placeholder="Search" type="text" [(ngModel)]="searchValue"> <input pInputText class="flex" name="search" id="search" placeholder="Search" type="text" style="height: 34px" [(ngModel)]="searchValue">
</div> </div>
</div> </div>
<br> <br>
......
src/app/shared/shared.module.ts
+ 2
− 0
View file @ 5eac412a
...@@ -57,6 +57,7 @@ import { PreferencesComponent } from './users/preferences/preferences.component' ...@@ -57,6 +57,7 @@ import { PreferencesComponent } from './users/preferences/preferences.component'
import {TooltipModule} from 'primeng/tooltip'; import {TooltipModule} from 'primeng/tooltip';
import {DropdownModule} from 'primeng/dropdown'; import {DropdownModule} from 'primeng/dropdown';
import {SortableHeaderDirective} from '../service/sort-domain.directive'; import {SortableHeaderDirective} from '../service/sort-domain.directive';
import {InputTextModule} from 'primeng/inputtext';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -73,6 +74,7 @@ import {SortableHeaderDirective} from '../service/sort-domain.directive'; ...@@ -73,6 +74,7 @@ import {SortableHeaderDirective} from '../service/sort-domain.directive';
FormioModule, FormioModule,
TooltipModule, TooltipModule,
DropdownModule, DropdownModule,
InputTextModule,
], ],
declarations: [ declarations: [
RateComponent, RateComponent,
......
src/app/shared/users/list/userslist.component.html
+ 1
− 1
View file @ 5eac412a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{{ 'USERS.TITLE' | translate }}</h3> {{ 'USERS.TITLE' | translate }}</h3>
<div class="flex space-between"> <div class="flex space-between">
<div class="flex"> <div class="flex">
{{ 'DOMAINS.ITEMS_PER_PAGE' | translate }}: {{ 'USERS.ITEMS_PER_PAGE' | translate }}:
<span id="selectionItems" class="dropdown" style="vertical-align: middle; display: inline-block; margin-right: 1rem;"> <span id="selectionItems" class="dropdown" style="vertical-align: middle; display: inline-block; margin-right: 1rem;">
<button class="dropdown-toggle btn" data-toggle="dropdown" data-close-others="true"> <button class="dropdown-toggle btn" data-toggle="dropdown" data-close-others="true">
{{maxItemsOnPage}} {{maxItemsOnPage}}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment