Skip to content

Commit

Permalink
Feature/bootsrap 4 to 5 (#106)
Browse files Browse the repository at this point in the history
* Upgrade bootstrap

* change color and classes for checkbox (in progress)

* add variable and flex to head selectors

* Feature/dependencies (#107)

* Bump @types/jasminewd2 from 2.0.8 to 2.0.9 (#105)

Bumps [@types/jasminewd2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasminewd2) from 2.0.8 to 2.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasminewd2)

---
updated-dependencies:
- dependency-name: "@types/jasminewd2"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jasmine-core from 3.6.0 to 3.7.1 (#104)

Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 3.6.0 to 3.7.1.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](jasmine/jasmine@v3.6.0...v3.7.1)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump datatables.net-dt from 1.10.24 to 1.10.25 (#103)

Bumps [datatables.net-dt](https://github.com/DataTables/Dist-DataTables-DataTables) from 1.10.24 to 1.10.25.
- [Release notes](https://github.com/DataTables/Dist-DataTables-DataTables/releases)
- [Commits](DataTables/Dist-DataTables-DataTables@1.10.24...1.10.25)

---
updated-dependencies:
- dependency-name: datatables.net-dt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump core-js from 3.9.1 to 3.14.0 (#102)

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.9.1 to 3.14.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.14.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @types/file-saver from 2.0.1 to 2.0.2 (#101)

Bumps [@types/file-saver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/file-saver) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/file-saver)

---
updated-dependencies:
- dependency-name: "@types/file-saver"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @angular-devkit/build-angular from 12.0.3 to 12.0.4 (#100)

Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 12.0.3 to 12.0.4.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](angular/angular-cli@v12.0.3...v12.0.4)

---
updated-dependencies:
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update dependencies

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update pr limit for dependabot

* update server

* Update Cypress WF

* update norms e2e test

* update norms e2e test

* update application e2e test

* update application e2e test

* fix cypress test

* fix cypress test

* fix cypress test

* increase timeout cypress

* increase timeout cypress

* Bump rxjs from 6.6.6 to 6.6.7 (#119)

Bumps [rxjs](https://github.com/reactivex/rxjs) from 6.6.6 to 6.6.7.
- [Release notes](https://github.com/reactivex/rxjs/releases)
- [Changelog](https://github.com/ReactiveX/rxjs/blob/6.6.7/CHANGELOG.md)
- [Commits](ReactiveX/rxjs@6.6.6...6.6.7)

---
updated-dependencies:
- dependency-name: rxjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump karma-jasmine-html-reporter from 1.5.4 to 1.6.0 (#117)

Bumps [karma-jasmine-html-reporter](https://github.com/dfederm/karma-jasmine-html-reporter) from 1.5.4 to 1.6.0.
- [Release notes](https://github.com/dfederm/karma-jasmine-html-reporter/releases)
- [Commits](dfederm/karma-jasmine-html-reporter@v1.5.4...v1.6.0)

---
updated-dependencies:
- dependency-name: karma-jasmine-html-reporter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @angular/cli from 12.0.3 to 12.0.4 (#114)

Bumps [@angular/cli](https://github.com/angular/angular-cli) from 12.0.3 to 12.0.4.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](angular/angular-cli@v12.0.3...v12.0.4)

---
updated-dependencies:
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @types/node from 15.12.1 to 15.12.2 (#112)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.12.1 to 15.12.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump karma from 6.3.3 to 6.3.4 (#122)

Bumps [karma](https://github.com/karma-runner/karma) from 6.3.3 to 6.3.4.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](karma-runner/karma@v6.3.3...v6.3.4)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ts-node from 9.1.1 to 10.0.0 (#110)

Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 9.1.1 to 10.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](TypeStrong/ts-node@v9.1.1...v10.0.0)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Feature/dependencies (#123)

* Bump ngx-pagination from 5.1.0 to 5.1.1 (#120)

Bumps [ngx-pagination](https://github.com/michaelbromley/ngx-pagination) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/michaelbromley/ngx-pagination/releases)
- [Changelog](https://github.com/michaelbromley/ngx-pagination/blob/master/CHANGELOG.md)
- [Commits](https://github.com/michaelbromley/ngx-pagination/commits)

---
updated-dependencies:
- dependency-name: ngx-pagination
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump angular-svg-icon from 11.2.0 to 12.0.0 (#118)

Bumps [angular-svg-icon](https://github.com/czeckd/angular-svg-icon) from 11.2.0 to 12.0.0.
- [Release notes](https://github.com/czeckd/angular-svg-icon/releases)
- [Commits](czeckd/angular-svg-icon@v11.2.0...v12.0.0)

---
updated-dependencies:
- dependency-name: angular-svg-icon
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @cypress/webpack-preprocessor from 5.6.0 to 5.9.0 (#115)

Bumps [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress) from 5.6.0 to 5.9.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js)
- [Commits](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.6.0...@cypress/webpack-preprocessor-v5.9.0)

---
updated-dependencies:
- dependency-name: "@cypress/webpack-preprocessor"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jsrsasign from 10.2.0 to 10.3.0 (#113)

Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.2.0 to 10.3.0.
- [Release notes](https://github.com/kjur/jsrsasign/releases)
- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
- [Commits](kjur/jsrsasign@10.2.0...10.3.0)

---
updated-dependencies:
- dependency-name: jsrsasign
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @briebug/cypress-schematic from 4.4.0 to 5.0.0 (#111)

Bumps [@briebug/cypress-schematic](https://github.com/briebug/cypress-schematic) from 4.4.0 to 5.0.0.
- [Release notes](https://github.com/briebug/cypress-schematic/releases)
- [Commits](briebug/cypress-schematic@v4.4.0...v5.0.0)

---
updated-dependencies:
- dependency-name: "@briebug/cypress-schematic"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump tslib from 2.1.0 to 2.3.0 (#109)

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.1.0 to 2.3.0.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](microsoft/tslib@2.1.0...2.3.0)

---
updated-dependencies:
- dependency-name: tslib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ts-loader from 8.0.17 to 9.2.3 (#108)

Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.0.17 to 9.2.3.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](TypeStrong/ts-loader@v8.0.17...v9.2.3)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jasmine-spec-reporter from 5.0.2 to 7.0.0 (#87)

Bumps [jasmine-spec-reporter](https://github.com/bcaudan/jasmine-spec-reporter) from 5.0.2 to 7.0.0.
- [Release notes](https://github.com/bcaudan/jasmine-spec-reporter/releases)
- [Changelog](https://github.com/bcaudan/jasmine-spec-reporter/blob/master/CHANGELOG.md)
- [Commits](bcaudan/jasmine-spec-reporter@v5.0.2...v7.0.0)

---
updated-dependencies:
- dependency-name: jasmine-spec-reporter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @ckeditor/ckeditor5-angular from 1.2.3 to 2.0.1 (#86)

Bumps [@ckeditor/ckeditor5-angular](https://github.com/ckeditor/ckeditor5-angular) from 1.2.3 to 2.0.1.
- [Release notes](https://github.com/ckeditor/ckeditor5-angular/releases)
- [Changelog](https://github.com/ckeditor/ckeditor5-angular/blob/master/CHANGELOG.md)
- [Commits](ckeditor/ckeditor5-angular@v1.2.3...v2.0.1)

---
updated-dependencies:
- dependency-name: "@ckeditor/ckeditor5-angular"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Upgrade bootstrap

* update button color variant

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dtrouillet and dependabot[bot] authored Jun 14, 2021
1 parent 5f64712 commit db84073
Show file tree
Hide file tree
Showing 32 changed files with 102 additions and 92 deletions.
5 changes: 3 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"angular-resize-event": "^2.1.0",
"angular-svg-icon": "^12.0.0",
"apexcharts": "^3.27.1",
"bootstrap": "github:twbs/bootstrap#bd27834",
"bootstrap": "^5.0.1",
"core-js": "^3.14.0",
"datatables.net": "^1.10.25",
"datatables.net-dt": "^1.10.25",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h4 class="modal-title" id="modal-basic-title">{{'ACCREDITATION.REQUEST_TITLE' |
</div>
<div class="mb-2">
<label class="form-label">{{'ACCREDITATION.RIGHTS' | translate}}</label>
<div class="form-selectgroup form-selectgroup-pills mr-1">
<div class="form-selectgroup form-selectgroup-pills me-1">
<label class="form-selectgroup-item">
<input type="checkbox" id="wantManage" name="wantManage" [(ngModel)]="request.wantManage" class="form-selectgroup-input" checked>
<span class="form-selectgroup-box">{{'ACCREDITATION.MANAGERIGHT' | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h2 id="tableTitle" class="page-title">
</h2>
</div>
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
<div class="col-auto ms-auto d-print-none">
<div class="d-flex">
<a href="javascript:void(0)" class="btn btn-primary mr-3 cursor-pointer" (click)="requestAccreditation()">
<a href="javascript:void(0)" class="btn btn-primary me-3 cursor-pointer" (click)="requestAccreditation()">
<ebad-icon name="plus"></ebad-icon>
{{'ACCREDITATION.NEW_REQUEST' | translate}}
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin-applications/admin-applications.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h2 id="tableTitle" class="page-title">
</h2>
</div>
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
<div class="col-auto ms-auto d-print-none">
<div class="d-flex">
<a *ngIf="addApplicationEnabled" href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary mr-3" (click)="onClickAddApplication()" id="addApplication">
<a *ngIf="addApplicationEnabled" href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary me-3" (click)="onClickAddApplication()" id="addApplication">
<ebad-icon name="plus"></ebad-icon>
Nouvelle application
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4 class="modal-title" id="modal-basic-title">{{title}} - {{application.name}}<
<td>{{user.login}}</td>
<td>{{user.firstName}}</td>
<td>{{user.lastName}}</td>
<td><button class="btn btn-primary btn-sm" (click)="deleteUser(user)">Supprimer</button></td>
<td><span><button class="btn btn-primary btn-sm" (click)="deleteUser(user)">Supprimer</button></span></td>
</tr>
</table>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin-news/admin-news.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h2 class="page-title">
</h2>
</div>
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
<div class="col-auto ms-auto d-print-none">
<div class="d-flex">
<a href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary mr-3" (click)="onClickAddNew()">
<a href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary me-3" (click)="onClickAddNew()">
<ebad-icon name="plus"></ebad-icon>
Nouvelle actualités
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin-norms/admin-norms.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ <h2 id="tableTitle" class="page-title">
Normes
</h2>
</div>
<div class="col-auto ml-auto d-print-none">
<div class="col-auto ms-auto d-print-none">
<div class="d-flex">
<a href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary mr-3" id="addNormAction" (click)="onClickAddNorm()">
<a href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary me-3" id="addNormAction" (click)="onClickAddNorm()">
<ebad-icon name="plus"></ebad-icon>
Nouvelle norme
</a>
Expand Down
6 changes: 3 additions & 3 deletions src/app/admin-users/admin-users.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h2 class="page-title">
<div class="text-muted text-h5 mt-2">{{peoplesPage.from}} - {{peoplesPage.to}} sur {{peoplesPage.of}} personnes</div>
</div>
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
<div class="col-auto ms-auto d-print-none">
<div class="d-flex">
<input #input type="search" class="form-control d-inline-block w-9 mr-3" placeholder="Search user&hellip;"/>
<input #input type="search" class="form-control d-inline-block w-9 me-3" placeholder="Search user&hellip;"/>
<a href="javascript:void(0)" style="cursor: pointer" class="btn btn-primary" (click)="onClickAddUser()">
<ebad-icon name="plus"></ebad-icon>
New user
Expand Down Expand Up @@ -61,5 +61,5 @@ <h3 class="mb-0"><a>{{user.firstName}} {{user.lastName}}</a></h3>
</div>

<div class="d-flex">
<pagination-controls class="pagination ml-auto" (pageChange)="changePage($event)"></pagination-controls>
<pagination-controls class="pagination ms-auto" (pageChange)="changePage($event)"></pagination-controls>
</div>
24 changes: 10 additions & 14 deletions src/app/admin-users/modal-roles/modal-roles.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,17 @@ <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
</button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="user">ROLE_USER</label>
<div class="input-group">
<input type="checkbox" id="user" class="form-control"
name="user"
[(ngModel)]="roles.roleUser">
</div>
<div class="form-check">
<input type="checkbox" id="user" class="form-check-input form-control"
name="user"
[(ngModel)]="roles.roleUser">
<label for="user" class="form-check-label ms-5">Role Utilisateur</label>
</div>
<div class="form-group">
<label for="admin">ROLE_ADMIN</label>
<div class="input-group">
<input type="checkbox" id="admin" class="form-control"
name="admin"
[(ngModel)]="roles.roleAdmin">
</div>
<div class="form-check">
<input type="checkbox" id="admin" class="form-check-input form-control"
name="admin"
[(ngModel)]="roles.roleAdmin">
<label for="admin" class="form-check-label ms-5">Role Administrateur</label>
</div>
</div>
<div class="modal-footer">
Expand Down
2 changes: 1 addition & 1 deletion src/app/files/files.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ngx-file-drop showBrowseBtn="true"
browseBtnLabel="{{'FILE.BROWSE' | translate}}"
(onFileDrop)="dropped($event)">
<span class="mr-2">{{'FILE.DRAG_AND_DROP' | translate}}</span>
<span class="me-2">{{'FILE.DRAG_AND_DROP' | translate}}</span>
</ngx-file-drop>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/files/modal-rename/modal-rename.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h4 class="modal-title" id="modal-basic-title">{{'FILE.RENAME_FILE' | translate:
<label for="kindFile">{{'FILE.FILE_KIND' | translate}}</label>
<div class="input-group">
<select name="kindFile" id="kindFile"
class="custom-select custom-select-sm ml-sm-2" [(ngModel)]="fileKindSelected">
class="custom-select custom-select-sm ms-sm-2" [(ngModel)]="fileKindSelected">
<option *ngFor="let fileKind of fileKinds" [ngValue]="fileKind">{{fileKind.name}}</option>
</select>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div>{{'HOME.STATS.BATCHS_COUNT' | translate}}</div>
</div>
<div class="d-flex align-items-baseline">
<div class="h1 mb-0 mr-2" [countUp]="statistics?.batchsNbrs" [options]="optionsCountUp">0</div>
<div class="h1 mb-0 me-2" [countUp]="statistics?.batchsNbrs" [options]="optionsCountUp">0</div>
</div>
</div>
</div>
Expand All @@ -31,7 +31,7 @@
<div>{{'HOME.STATS.EXECUTION_TIME' | translate}}</div>
</div>
<div class="d-flex align-items-baseline">
<div class="h1 mb-3 mr-2" [countUp]="statistics?.avgExecutionTime" [options]="optionsCountUpMs">0</div>
<div class="h1 mb-3 me-2" [countUp]="statistics?.avgExecutionTime" [options]="optionsCountUpMs">0</div>
</div>
<apx-chart #chartComponentAvgTime class="chart-sm" [autoUpdateSeries]="true" [series]="seriesAvgTime" [chart]="chart[1]" [stroke]="stroke" [xaxis]="xaxis" [colors]="colors" [fill]="fill" [labels]="labels" [legend]="legend"></apx-chart>

Expand All @@ -45,7 +45,7 @@
<div>{{'HOME.STATS.BATCHS_RUNNED' | translate}}</div>
</div>
<div class="d-flex align-items-baseline">
<div class="h1 mb-3 mr-2" [countUp]="statistics?.batchsRunnedNbrs" [options]="optionsCountUp">0</div>
<div class="h1 mb-3 me-2" [countUp]="statistics?.batchsRunnedNbrs" [options]="optionsCountUp">0</div>
</div>
<apx-chart #chartComponentBatchRunnedNbr class="chart-sm" [series]="seriesBatchsNbr" [chart]="chart[2]" [stroke]="stroke" [xaxis]="xaxis" [colors]="colors" [fill]="fill" [labels]="labels" [legend]="legend"></apx-chart>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h3 class="mb-0"><a>{{user.user.firstName}} {{user.user.lastName}}</a></h3>
</div>
</div>
<div class="d-flex">
<pagination-controls class="pagination ml-auto" (pageChange)="changePage($event)"></pagination-controls>
<pagination-controls class="pagination ms-auto" (pageChange)="changePage($event)"></pagination-controls>
</div>


4 changes: 2 additions & 2 deletions src/app/manage-batchs/manage-batchs.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<span header>
<a id="addBatchAction" href="javascript:void(0)" style="cursor: pointer"
*ngIf="applicationSelected"
class="btn btn-primary mr-3" (click)="onClickAddBatch()">
class="btn btn-primary me-3" (click)="onClickAddBatch()">
<ebad-icon name="plus"></ebad-icon>
Nouveau batch
</a>
Expand Down Expand Up @@ -43,7 +43,7 @@
{{batch.path}}
</td>
<td class="align-middle" *ngIf="columns[3].visible">
<span *ngFor="let env of batch.environnements" class="badge bg-green-lt mr-1" >{{env.name}}</span>
<span *ngFor="let env of batch.environnements" class="badge bg-green-lt me-1" >{{env.name}}</span>
</td>
<td class="text-center" *ngIf="columns[4].visible">
<a (click)="editBatch(batch)" href="javascript:void(0)" class="btn btn-secondary btn-sm">Edit</a>
Expand Down
2 changes: 1 addition & 1 deletion src/app/manage-chains/manage-chains.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-env-app-head-selector preTitle="Gestion des chaines" [title]="environmentSelected?.name" (environmentChanged)="environmentChanged($event)" [showEnvironment]="true" [isModarable]="true">
<span header>
<a href="javascript:void(0)" *ngIf="environmentSelected" style="cursor: pointer"
class="btn btn-primary mr-3" (click)="onClickAddChain()">
class="btn btn-primary me-3" (click)="onClickAddChain()">
<ebad-icon name="plus"></ebad-icon>
Nouvelle chaine
</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<app-env-app-head-selector preTitle="Gestion des répertoires" [title]="environmentSelected?.name" (environmentChanged)="environmentChanged($event)" [showEnvironment]="true" [isModarable]="true">
<span header>
<a id="addFolder" href="javascript:void(0)" *ngIf="environmentSelected" style="cursor: pointer"
class="btn btn-primary mr-3" (click)="onClickAddDirectory()">
class="btn btn-primary me-3" (click)="onClickAddDirectory()">
<ebad-icon name="plus"></ebad-icon>
Nouveau répertoire
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[showEnvironment]="false" [isModarable]="true">
<span header>
<a id="addEnvAction" href="javascript:void(0)" *ngIf="addEnvironmentEnabled && applicationSelected" style="cursor: pointer"
class="btn btn-primary mr-3" (click)="onClickAddEnvironment()">
class="btn btn-primary me-3" (click)="onClickAddEnvironment()">
<ebad-icon name="plus"></ebad-icon>
Nouvel environnement
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/app/manage-naming/manage-naming.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[isModarable]="true">
<span header>
<a href="javascript:void(0)" *ngIf="applicationSelected" style="cursor: pointer"
class="btn btn-primary mr-3" (click)="onClickAddNaming()">
class="btn btn-primary me-3" (click)="onClickAddNaming()">
<ebad-icon name="plus"></ebad-icon>
Nouveau nommage
</a>
Expand Down
14 changes: 7 additions & 7 deletions src/app/profile/profile.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h2 class="mb-3">Emmy Levet</h2>
<span class="avatar avatar-xl"
style="background-image: url(./img/avatars/002f.jpg)"></span>

<div class="media-body ml-4">
<div class="media-body ms-4">
<h3>Flossi Uttley</h3>
<p class="text-muted mb-0">Engineer I</p>

Expand Down Expand Up @@ -160,7 +160,7 @@ <h3 class="card-title">My Profile</h3>
<li class="list-group-item py-4">
<div class="d-flex">
<div>
<span class="avatar mr-3"
<span class="avatar me-3"
style="background-image: url(./img/avatars/000f.jpg)"></span>

</div>
Expand All @@ -183,7 +183,7 @@ <h4>Emmy Levet</h4>
<ul class="list-unstyled">
<li class="d-flex mt-4">
<div>
<span class="avatar mr-3"
<span class="avatar me-3"
style="background-image: url(./img/avatars/002f.jpg)"></span>

</div>
Expand All @@ -198,7 +198,7 @@ <h4>Emmy Levet</h4>
</li>
<li class="d-flex mt-4">
<div>
<span class="avatar mr-3">HS</span>
<span class="avatar me-3">HS</span>

</div>
<div class="flex-fill">
Expand All @@ -216,7 +216,7 @@ <h4>Emmy Levet</h4>
<li class="list-group-item py-4">
<div class="d-flex">
<div>
<span class="avatar mr-3"
<span class="avatar me-3"
style="background-image: url(./img/avatars/006m.jpg)"></span>

</div>
Expand All @@ -239,7 +239,7 @@ <h4>Lorry Mion</h4>
<li class="list-group-item py-4">
<div class="d-flex">
<div>
<span class="avatar mr-3"
<span class="avatar me-3"
style="background-image: url(./img/avatars/009m.jpg)"></span>

</div>
Expand All @@ -260,7 +260,7 @@ <h4>Geoffry Flaunders</h4>
<ul class="list-unstyled">
<li class="d-flex mt-4">
<div>
<span class="avatar mr-3"
<span class="avatar me-3"
style="background-image: url(./img/avatars/001f.jpg)"></span>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/schedulings/schedulings.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span header>
<a id="addBatchAction" href="javascript:void(0)" style="cursor: pointer"
*ngIf="environmentSelected"
class="btn btn-primary mr-3" (click)="onClickAddScheduling()">
class="btn btn-primary me-3" (click)="onClickAddScheduling()">
<ebad-icon name="plus"></ebad-icon>
{{'SCHEDULING.ADD' | translate}}
</a>
Expand Down
6 changes: 3 additions & 3 deletions src/app/shared/actuality-block/actuality-block.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ <h3 class="card-title"><a>{{oneNew.title}}</a></h3>
<div class="text-muted" [innerHTML]="oneNew.content"></div>
<div class="d-flex align-items-center pt-5 mt-auto">
<span class="avatar avatar-md">AD</span>
<div class="ml-3">
<div class="ms-3">
<a class="text-body">{{oneNew.createdBy}}</a>
<small class="d-block text-muted">{{oneNew.createdDate | date: 'dd/MM/yyyy - hh:mm:ss'}}</small>
</div>
<div class="ml-auto">
<a class="icon d-none d-md-inline-block ml-3 text-muted">
<div class="ms-auto">
<a class="icon d-none d-md-inline-block ms-3 text-muted">
<ebad-icon name="heart"></ebad-icon>
</a>
</div>
Expand Down
18 changes: 9 additions & 9 deletions src/app/shared/head-selector/head-selector.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ <h2 class="page-title">
{{title}}
</h2>
</div>
<div class="col-auto ml-auto d-print-none">
<div class="d-flex">
<form class="form-inline">
<select [name]="select.id" *ngFor="let select of selects; let indexSelect = index"
(change)="onSelect($event, indexSelect)" id="{{select.id}}" class="form-select mr-3">
<option *ngFor="let option of select.options; let indexOption = index"
[value]="indexOption" [selected]="option.selected">{{option.label}}</option>
</select>
<div class="d-flex align-items-center col-auto ms-auto d-print-none">
<form class="d-flex">
<div class="p-2" *ngFor="let select of selects; let indexSelect = index">
<select [name]="select.id"
(change)="onSelect($event, indexSelect)" id="{{select.id}}" class="form-select me-3">
<option *ngFor="let option of select.options; let indexOption = index"
[value]="indexOption" [selected]="option.selected">{{option.label}}</option>
</select>
</div>
</form>
<ng-content select="[header]"></ng-content>
</div>
</div>
</div>
</div>
Loading

0 comments on commit db84073

Please sign in to comment.