Skip to content

Commit

Permalink
standardise modal footers (#1753)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwp91
bwp91 committed Nov 20, 2023
1 parent c8e505c commit f8c68b8
Show file tree
Hide file tree
Showing 73 changed files with 612 additions and 361 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to homebridge-config-ui-x will be documented in this file.
### UI Changes

- Add Child Bridge Pin Code (#1739)
- standardise modal footers (#1753)

### Other Changes

Expand Down
54 changes: 27 additions & 27 deletions package-lock.json
View file

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

12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
"@fastify/swagger": "8.12.0",
"@homebridge/node-pty-prebuilt-multiarch": "0.11.11",
"@nestjs/axios": "3.0.1",
"@nestjs/common": "10.2.9",
"@nestjs/core": "10.2.9",
"@nestjs/common": "10.2.10",
"@nestjs/core": "10.2.10",
"@nestjs/jwt": "10.2.0",
"@nestjs/passport": "10.0.2",
"@nestjs/platform-fastify": "10.2.9",
"@nestjs/platform-socket.io": "10.2.9",
"@nestjs/platform-fastify": "10.2.10",
"@nestjs/platform-socket.io": "10.2.10",
"@nestjs/swagger": "7.1.16",
"@nestjs/websockets": "10.2.9",
"@nestjs/websockets": "10.2.10",
"@oznu/hap-client": "1.9.0",
"axios": "1.6.2",
"class-transformer": "0.5.1",
Expand All @@ -94,7 +94,7 @@
"unzipper": "0.10.14"
},
"devDependencies": {
"@nestjs/testing": "^10.2.9",
"@nestjs/testing": "^10.2.10",
"@types/fs-extra": "^11.0.4",
"@types/jest": "^29.5.8",
"@types/lodash": "^4.14.201",
Expand Down
12 changes: 6 additions & 6 deletions ui/package-lock.json
View file

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

13 changes: 11 additions & 2 deletions ui/src/app/core/accessories/info-modal/info-modal.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title">{{ service.customName || service.serviceName }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -71,4 +71,13 @@ <h5 class="modal-title">{{ service.customName || service.serviceName }}</h5>
</tbody>
</table>
</div>
</div>
<div class="modal-footer justify-content-between">
<div class="text-left"></div>
<div class="text-center">
<button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
{{ 'form.button_close' | translate }}
</button>
</div>
<div class="text-right"></div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -33,4 +33,4 @@ <h5 class="mb-0">{{ 'accessories.control.label_rotation_speed' | translate }}</h
</div>

</div>
</div>
</div>
2 changes: 1 addition & 1 deletion ui/src/app/core/accessories/types/door/door.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/fan/fan.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -34,4 +34,4 @@ <h5 class="mb-0">{{ 'accessories.control.label_rotation_speed' | translate }}</h
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -34,4 +34,4 @@ <h5 class="mb-0">{{ 'accessories.control.label_rotation_speed' | translate }}</h
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -63,4 +63,4 @@ <h5>{{ 'accessories.control.label_target_temperature' | translate }}</h5>
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ...ore/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -65,4 +65,4 @@ <h5>{{ 'accessories.control.label_target_humidity' | translate }}</h5>
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -34,4 +34,4 @@ <h5 class="mb-0">{{ 'accessories.control.label_brightness' | translate }}</h5>
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand All @@ -25,4 +25,4 @@ <h5 class="modal-title" [innerText]="service.customName || service.serviceName">
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/speaker/speaker.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -33,4 +33,4 @@ <h5 class="mb-0">{{ 'accessories.control.label_speaker_volume' | translate }}</h
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down Expand Up @@ -39,4 +39,4 @@ <h5>{{ 'accessories.control.label_target_temperature' | translate }}</h5>
</nouislider>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ui/src/app/core/accessories/types/valve/valve.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h5 class="modal-title" [innerText]="service.customName || service.values.ConfiguredName || service.serviceName">
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand All @@ -16,4 +16,4 @@ <h5 class="modal-title" [innerText]="service.customName || service.values.Config
</select>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion ui/src/app/core/accessories/types/window/window.manage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"
(click)="activeModal.dismiss('Cross click')">
(click)="activeModal.dismiss('Dismiss')">
<span aria-hidden="true">&times;</span>
</button>
</div>
Expand Down
Loading

0 comments on commit f8c68b8

Please sign in to comment.