mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-22 07:52:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix some bugs

Browse source
This commit is contained in:
Janina Phillips 2020-06-19 11:17:31 -04:00
parent 101316a72f
commit 63072ead77
5 changed files with 82 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
application/views/appointments/book.php
View file

@ -252,23 +252,34 @@
<textarea id="notes" maxlength="500" class="form-control" rows="3"></textarea> <textarea id="notes" maxlength="500" class="form-control" rows="3"></textarea>
</div> </div>
</div> </div>
</div>
</div>
<?php if ($display_terms_and_conditions): ?> <?php if ($display_terms_and_conditions): ?>
<label> <label>
<input type="checkbox" class="required" id="accept-to-terms-and-conditions"> <input type="checkbox" class="required" id="accept-to-terms-and-conditions">
<?= strtr(lang('read_and_agree_to_terms_and_conditions'), <?= strtr(lang('read_and_agree_to_terms_and_conditions'),
[ [
'{$link}' => '<a href="#" data-toggle="modal" data-target="#terms-and-conditions-modal">', '{$link}' => '<a href="#" data-toggle="modal" data-target="#terms-and-conditions-modal">',
'{/$link}' => '</a>' '{/$link}' => '</a>'
]) ])
?> ?>
</label> </label>
<br> <?php endif ?>
<?php endif ?>
<?php if ($display_privacy_policy): ?> <?php if ($display_privacy_policy): ?>
<label> <!-- <label>
<input type="checkbox" class="required" id="accept-to-privacy-policy"> <input type="checkbox" class="required" id="accept-to-privacy-policy">
<?= strtr(lang('read_and_agree_to_privacy_policy'),
[
'{$link}' => '<a href="#" data-toggle="modal" data-target="#privacy-policy-modal">',
'{/$link}' => '</a>'
])
?>
</label> -->
<div class="form-check">
<input type="checkbox" class="required form-check-input" id="accept-to-privacy-policy">
<label class="form-check-label" for="defaultCheck1">
<?= strtr(lang('read_and_agree_to_privacy_policy'), <?= strtr(lang('read_and_agree_to_privacy_policy'),
[ [
'{$link}' => '<a href="#" data-toggle="modal" data-target="#privacy-policy-modal">', '{$link}' => '<a href="#" data-toggle="modal" data-target="#privacy-policy-modal">',
@ -276,12 +287,10 @@
]) ])
?> ?>
</label> </label>
<br>
<?php endif ?>
<span id="form-message" class="text-danger"><?= lang('fields_are_required') ?></span>
</div> </div>
</div> <?php endif ?>
<span id="form-message" class="text-danger d-block"><?= lang('fields_are_required') ?></span>
<div class="command-buttons"> <div class="command-buttons">
<button type="button" id="button-back-3" class="btn button-back btn-light" <button type="button" id="button-back-3" class="btn button-back btn-light"

8
assets/css/frontend.css
View file

@ -66,7 +66,10 @@ body {
#book-appointment-wizard .wizard-frame { #book-appointment-wizard .wizard-frame {
padding: 10px 20px; padding: 10px 20px;
height: 560px; height: 570px;
display: flex;
flex-direction: column;
justify-content: space-between;
} }
#book-appointment-wizard .wizard-frame .frame-container { #book-appointment-wizard .wizard-frame .frame-container {
@ -86,7 +89,8 @@ body {
} }
#book-appointment-wizard .wizard-frame .command-buttons { #book-appointment-wizard .wizard-frame .command-buttons {
float: right; display: flex;
justify-content: flex-end;
} }
#book-appointment-wizard .wizard-frame .command-buttons .btn { #book-appointment-wizard .wizard-frame .command-buttons .btn {

15
assets/css/general.css
View file

@ -132,9 +132,9 @@ body .ui-datepicker td a.ui-state-highlight {
background: #80E3AD !important; background: #80E3AD !important;
border-radius: 67px; border-radius: 67px;
color: #FFF !important; color: #FFF !important;
width: 22px; width: 24px;
height: 22px; height: 24px;
line-height: 1.3; line-height: 1.2;
margin: 4px; margin: 4px;
} }
@ -406,3 +406,12 @@ body .popover-content button {
body .popover-content a { body .popover-content a {
margin-right: 5px; margin-right: 5px;
} }
.has-error .control-label,
.has-error label {
color: #dc3545;
}
.has-error .form-control {
border-color: #dc3545;
}

39
assets/js/backend_users.js
View file

@ -66,16 +66,19 @@ window.BackendUsers = window.BackendUsers || {};
$('<div/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox',
'html': [ 'html': [
$('<label/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox form-check',
'html': [ 'html': [
$('<input/>', { $('<input/>', {
'class': 'form-check-input',
'type': 'checkbox', 'type': 'checkbox',
'data-id': service.id 'data-id': service.id
}), }),
$('<span/>', { $('<label/>', {
'text': service.name 'class': 'form-check-label',
}) 'text': service.name,
'for': service.id
}),
] ]
}) })
] ]
@ -87,16 +90,19 @@ window.BackendUsers = window.BackendUsers || {};
$('<div/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox',
'html': [ 'html': [
$('<label/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox form-check',
'html': [ 'html': [
$('<input/>', { $('<input/>', {
'class': 'form-check-input',
'type': 'checkbox', 'type': 'checkbox',
'data-id': provider.id 'data-id': provider.id
}), }),
$('<span/>', { $('<label/>', {
'text': provider.first_name + ' ' + provider.last_name 'class': 'form-check-label',
}) 'text': provider.first_name + ' ' + provider.last_name,
'for': provider.id
}),
] ]
}) })
] ]
@ -156,19 +162,22 @@ window.BackendUsers = window.BackendUsers || {};
$('<div/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox',
'html': [ 'html': [
$('<label/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox form-check',
'html': [ 'html': [
$('<input/>', { $('<input/>', {
'class': 'form-check-input',
'type': 'checkbox', 'type': 'checkbox',
'data-id': provider.id, 'data-id': provider.id,
'prop': { 'prop': {
'disabled': true 'disabled': true
} }
}), }),
$('<span/>', { $('<label/>', {
'text': provider.first_name + ' ' + provider.last_name 'class': 'form-check-label',
}) 'text': provider.first_name + ' ' + provider.last_name,
'for': provider.id
}),
] ]
}) })
] ]

22
assets/js/working_plan.js
View file

@ -64,19 +64,19 @@
$('<td/>', { $('<td/>', {
'html': [ 'html': [
$('<div/>', { $('<div/>', {
'class': 'checkbox', 'class': 'checkbox form-check',
'html': [ 'html': [
$('<input/>', {
'class': 'form-check-input',
'type': 'checkbox',
'id': index
}),
$('<label/>', { $('<label/>', {
'html': [ 'class': 'form-check-label',
$('<input/>', { 'text': dayDisplayName,
'type': 'checkbox', 'for': index
'id': index }),
}),
$('<span/>', {
'text': dayDisplayName
})
]
})
] ]
}) })
] ]