rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

(ui) Small fix on modals

Browse Source
This commit is contained in:
Vincent 2023-11-08 11:14:10 +01:00
parent f15af0292b
commit dfea3f744d
6 changed files with 102 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/frontend/src/stylesheets/app.components.scss
View File

@ -77,6 +77,21 @@
}
}
.modal-footer.btn-stack {
display: flex;
flex-direction: column;
gap: 1rem;
&::after,
&::before {
content: none;
}
& > * {
margin: 0 !important;
}
}
.modal-backdrop {
height: 100%;
}

14
app/frontend/templates/admin/calendar/eventModal.html
View File

@ -82,18 +82,18 @@
<p class="text-center font-sbold" translate>{{ 'app.admin.calendar.divide_this_availability' }}</p>
<div class="row">
<div class="col-md-5">
<div class="input-group">
<input type="number" class="form-control" ng-model="slots_nb" step="1" min="1" required="true" />
<span class="input-group-addon" translate>{{ 'app.admin.calendar.slots' }}</span>
<div class="form-group">
<input id="slots_nb" type="number" class="form-control" ng-model="slots_nb" step="1" min="1" required="true" />
<label for="slots_nb" translate>{{ 'app.admin.calendar.slots' }}</label>
</div>
</div>
<p class="col-md-2 middle-of-inputs" translate>
{{ 'app.admin.calendar.slots_of' }}
</p>
<div class="col-md-5">
<div class="input-group">
<input type="number" class="form-control" ng-model="availability.slot_duration" min="1" required="true" />
<span class="input-group-addon" translate>{{ 'app.admin.calendar.minutes' }}</span>
<div class="form-group">
<input id="slot_duration" type="number" class="form-control" ng-model="availability.slot_duration" min="1" required="true" />
<label for="slot_duration" translate>{{ 'app.admin.calendar.minutes' }}</label>
</div>
</div>
</div>
@ -223,7 +223,7 @@
<p class="text-center font-sbold" translate>{{ 'app.admin.calendar.summary' }}</p>
<div class="row">
<span>{{ 'app.admin.calendar.about_to_create' | translate:{NUMBER:occurrences.length,TYPE:availability.available_type} }}</span>
<ul>
<ul style="max-height: 25vh; overflow: auto;">
<li ng-repeat="slot in occurrences">{{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}</li>
</ul>
<div class="alert alert-info text-xs" ng-show="availability.slot_duration">

4
app/frontend/templates/admin/events/index.html
View File

@ -17,8 +17,9 @@
</section>
</div>
</div>
</section>
<section class="m-lg events-management"
<section class="m-lg events-management"
ui-tour="events"
ui-tour-backdrop="true"
ui-tour-template-url="'/shared/tour-step-template.html'"
@ -49,5 +50,4 @@
<ng-include src="'/admin/events/monitoring.html'"></ng-include>
</div>
</div>
</section>
</section>

5
app/frontend/templates/events/index.html
View File

@ -17,9 +17,9 @@
</section>
</div>
</div>
</section>
<section class="events-list-page">
<section class="events-list-page">
<events-editorial-block on-error="onError"></events-editorial-block>
<div class="row">
@ -73,5 +73,4 @@
</div>
</div>
</section>
</section>

2
app/frontend/templates/shared/confirm_modify_slot_modal.html
View File

@ -7,7 +7,7 @@
<p ng-show="object.user && currentUser.id !== object.user.id" translate translate-values="{NAME: object.user.name}">{{ 'app.shared.confirm_modify_slot_modal.do_you_want_to_change_NAME_s_booking_slot_initially_planned_at' }}</p>
<p><strong>{{object.start | amDateFormat: 'LL'}} : {{object.start | amDateFormat:'LT'}} - {{object.end | amDateFormat:'LT'}}</strong></p>
</div>
<div class="modal-footer">
<div class="modal-footer btn-stack">
<button class="btn btn-warning" ng-class="{'m-b':object.cancelable&&object.movable}" ng-click="ok('cancel')" ng-show="object.cancelable" translate>{{ 'app.shared.confirm_modify_slot_modal.cancel_this_reservation' }}</button>
<button class="btn btn-info" ng-click="ok('move')" ng-show="object.movable" translate>{{ 'app.shared.confirm_modify_slot_modal.i_want_to_change_date' }}</button>
<button class="btn btn-default" ng-click="cancel()" translate>{{ 'app.shared.buttons.cancel' }}</button>

2
app/frontend/templates/shared/deviseModal.html
View File

@ -1,6 +1,6 @@
<div class="" id="loginModal">
<div class="modal-header">
<img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="{{logo.custom_asset_file_attributes.attachment}}" class="modal-logo"/>
<img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="" class="modal-logo"/>
<i class="fa fa-times close-modal-button" ng-click="dismiss()"></i>
<h1 translate translate-default="Login">
{{ 'app.public.common.connection' }}