This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8f082f66fae54f29cd9d3b6bfca0005e0020b471 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Tue Jun 4 13:56:25 2019 +0300 [DLAB-386]: manage role form card fixes --- .../administration/project/project.component.scss | 18 --- .../administration/project/project.component.ts | 3 +- .../app/administration/roles/roles.component.html | 128 +++++++++++---------- 3 files changed, 66 insertions(+), 83 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss deleted file mode 100644 index 7220975..0000000 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 6a1f7a9..c41ab27 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -34,8 +34,7 @@ export interface Project { @Component({ selector: 'dlab-project', - templateUrl: './project.component.html', - styleUrls: ['./project.component.scss'] + templateUrl: './project.component.html' }) export class ProjectComponent implements OnInit, OnDestroy { projectList: Project[] = []; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index 8ea280d..fe499ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -27,70 +27,72 @@ <div></div> </div> - <mat-horizontal-stepper #stepper *ngIf="stepperView" class="stepper ani"> - <mat-step> - <ng-template matStepLabel>Groups</ng-template> - <div class="inner-step mat-reset"> - <input [validator]="groupValidarion()" type="text" placeholder="Enter group name" [(ngModel)]="setupGroup" - #setupGroupName="ngModel"> - <div class="danger_color" *ngIf="setupGroupName.errors?.patterns && setupGroupName.dirty">Group name can only - contain letters, numbers, hyphens and '_'</div> - <div class="danger_color" *ngIf="setupGroupName.errors?.duplicate && setupGroupName.dirty">Group name already - exists</div> - </div> - <div class="text-center m-bott-10"> - <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> - <button mat-raised-button matStepperNext class="butt">Next<i - class="material-icons">keyboard_arrow_right</i></button> - </div> - </mat-step> - <mat-step> - <ng-template matStepLabel>Roles</ng-template> - <div class="inner-step mat-reset"> - <div class="selector-wrapper"> - <mat-form-field> - <mat-select multiple [compareWith]="compareObjects" name="roles" [(value)]="setupRoles" - placeholder="Select roles"> - <mat-option class="multiple-select" disabled> - <a class="select ani" (click)="selectAllOptions(setupRoles, rolesList)"> - <i class="material-icons">playlist_add_check</i> All - </a> - <a class="deselect ani" (click)="selectAllOptions(setupRoles)"> - <i class="material-icons">clear</i> None - </a> - </mat-option> - <mat-option *ngFor="let role of rolesList" [value]="role"> - {{ role }} - </mat-option> - </mat-select> - <button class="caret"> - <i class="material-icons">keyboard_arrow_down</i> - </button> - </mat-form-field> + <mat-card *ngIf="stepperView" class="m-top-10"> + <mat-horizontal-stepper #stepper class="stepper ani"> + <mat-step> + <ng-template matStepLabel>Groups</ng-template> + <div class="inner-step mat-reset"> + <input [validator]="groupValidarion()" type="text" placeholder="Enter group name" [(ngModel)]="setupGroup" + #setupGroupName="ngModel"> + <div class="danger_color" *ngIf="setupGroupName.errors?.patterns && setupGroupName.dirty">Group name can only + contain letters, numbers, hyphens and '_'</div> + <div class="danger_color" *ngIf="setupGroupName.errors?.duplicate && setupGroupName.dirty">Group name already + exists</div> + </div> + <div class="text-center m-bott-10"> + <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> + <button mat-raised-button matStepperNext class="butt">Next<i + class="material-icons">keyboard_arrow_right</i></button> + </div> + </mat-step> + <mat-step> + <ng-template matStepLabel>Roles</ng-template> + <div class="inner-step mat-reset"> + <div class="selector-wrapper"> + <mat-form-field> + <mat-select multiple [compareWith]="compareObjects" name="roles" [(value)]="setupRoles" + placeholder="Select roles"> + <mat-option class="multiple-select" disabled> + <a class="select ani" (click)="selectAllOptions(setupRoles, rolesList)"> + <i class="material-icons">playlist_add_check</i> All + </a> + <a class="deselect ani" (click)="selectAllOptions(setupRoles)"> + <i class="material-icons">clear</i> None + </a> + </mat-option> + <mat-option *ngFor="let role of rolesList" [value]="role"> + {{ role }} + </mat-option> + </mat-select> + <button class="caret"> + <i class="material-icons">keyboard_arrow_down</i> + </button> + </mat-form-field> + </div> + </div> + <div class="text-center m-bott-10"> + <button mat-raised-button matStepperPrevious class="butt"><i + class="material-icons">keyboard_arrow_left</i>Back</button> + <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> + <button mat-raised-button matStepperNext class="butt">Next<i + class="material-icons">keyboard_arrow_right</i></button> + </div> + </mat-step> + <mat-step> + <ng-template matStepLabel>Users</ng-template> + <div class="inner-step mat-reset"> + <input type="text" placeholder="Enter user login" [(ngModel)]="setupUser"> + </div> + <div class="text-center m-bott-10"> + <button mat-raised-button matStepperPrevious class="butt"><i + class="material-icons">keyboard_arrow_left</i>Back</button> + <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> + <button mat-raised-button (click)="manageAction('create', 'group')" class="butt butt-success" + [disabled]="!setupGroup || setupGroupName.errors?.pattern || !setupRoles.length > 0">Create</button> </div> - </div> - <div class="text-center m-bott-10"> - <button mat-raised-button matStepperPrevious class="butt"><i - class="material-icons">keyboard_arrow_left</i>Back</button> - <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> - <button mat-raised-button matStepperNext class="butt">Next<i - class="material-icons">keyboard_arrow_right</i></button> - </div> - </mat-step> - <mat-step> - <ng-template matStepLabel>Users</ng-template> - <div class="inner-step mat-reset"> - <input type="text" placeholder="Enter user login" [(ngModel)]="setupUser"> - </div> - <div class="text-center m-bott-10"> - <button mat-raised-button matStepperPrevious class="butt"><i - class="material-icons">keyboard_arrow_left</i>Back</button> - <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> - <button mat-raised-button (click)="manageAction('create', 'group')" class="butt butt-success" - [disabled]="!setupGroup || setupGroupName.errors?.pattern || !setupRoles.length > 0">Create</button> - </div> - </mat-step> - </mat-horizontal-stepper> + </mat-step> + </mat-horizontal-stepper> + </mat-card> <mat-divider></mat-divider> <div *ngIf="groupsData.length" class="ani"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
