mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-25 09:23:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix some icons and styles

Browse source
This commit is contained in:
Janina Phillips 2020-06-18 14:23:16 -04:00
parent 0b3d97ff1f
commit 1bd2647b77
6 changed files with 41 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.npmrc Normal file
View file

@ -0,0 +1 @@
registry=https://registry.npmjs.org

37
application/views/backend/calendar.php
View file

@ -67,50 +67,47 @@
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?> <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
<div class="btn-group"> <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
<button class="btn btn-light" type="button" id="insert-appointment"> <button class="btn btn-light" type="button" id="insert-appointment">
<span class="glyphicon glyphicon-plus"></span> <i class="fas fa-plus"></i>
<?= lang('appointment') ?> <?= lang('appointment') ?>
</button> </button>
<button type="button" class="btn btn-light dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <div class="btn-group" role="group">
<span class="sr-only">Toggle Dropdown</span> <button id="btnGroupDrop1" type="button" class="btn btn-light dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</button> </button>
<ul class="dropdown-menu"> <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
<li> <a class="dropdown-item" href="#" id="insert-unavailable">
<a href="#" id="insert-unavailable">
<?= lang('unavailable') ?> <?= lang('unavailable') ?>
</a> </a>
</li> <a class="dropdown-item" href="#" id="insert-extra-period">
<li>
<a href="#" id="insert-extra-period">
<?= lang('extra_period') ?> <?= lang('extra_period') ?>
</a> </a>
</li> </div>
</ul> </div>
</div> </div>
<?php endif ?> <?php endif ?>
<button id="reload-appointments" class="btn btn-light" title="<?= lang('reload_appointments_hint') ?>"> <button id="reload-appointments" class="btn btn-light" title="<?= lang('reload_appointments_hint') ?>">
<span class="glyphicon glyphicon-repeat"></span> <i class="fas fa-redo-alt"></i>
</button> </button>
<?php if($calendar_view === 'default'): ?> <?php if($calendar_view === 'default'): ?>
<a class="btn btn-light" href="<?= site_url('backend?view=table') ?>" <a class="btn btn-light" href="<?= site_url('backend?view=table') ?>"
title="<?= lang('table') ?>"> title="<?= lang('table') ?>">
<span class="glyphicon glyphicon-list-alt"></span> <i class="far fa-list-alt"></i>
</a> </a>
<?php endif ?> <?php endif ?>
<?php if($calendar_view === 'table'): ?> <?php if($calendar_view === 'table'): ?>
<a class="btn btn-light" href="<?= site_url('backend?view=default') ?>" <a class="btn btn-light" href="<?= site_url('backend?view=default') ?>"
title="<?= lang('default') ?>"> title="<?= lang('default') ?>">
<span class="glyphicon glyphicon-calendar"></span> <i class="fas fa-calendar-alt"></i>
</a> </a>
<?php endif ?> <?php endif ?>
<button id="toggle-fullscreen" class="btn btn-light"> <button id="toggle-fullscreen" class="btn btn-light">
<span class="glyphicon glyphicon-fullscreen"></span> <i class="fas fa-expand-arrows-alt"></i>
</button> </button>
</div> </div>
</div> </div>
@ -334,7 +331,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert hidden"></div> <div class="modal-message alert d-none"></div>
<form> <form>
<fieldset> <fieldset>
@ -399,7 +396,7 @@
<h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3> <h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert hidden"></div> <div class="modal-message alert d-none"></div>
<form> <form>
<fieldset> <fieldset>

10
assets/css/backend.css
View file

@ -314,6 +314,16 @@ body legend {
text-align: right; text-align: right;
} }
#calendar-actions > .btn-group {
width: auto;
}
@media all and (max-width: 470px) {
#calendar-actions > .btn-group {
width: 100%;
}
}
#calendar-page #calendar-actions > .btn { #calendar-page #calendar-actions > .btn {
margin: 5px 0; margin: 5px 0;
} }

24
assets/css/general.css
View file

@ -80,7 +80,6 @@ body .ui-widget.ui-widget-content {
body #ui-datepicker-div { body #ui-datepicker-div {
margin-top: 4px; margin-top: 4px;
z-index: 4 !important;
} }
body .ui-datepicker .ui-widget-header { body .ui-datepicker .ui-widget-header {
@ -123,9 +122,9 @@ html body .ui-datepicker td a.ui-state-active {
font-weight: bold !important; font-weight: bold !important;
background: #3DD481 !important; background: #3DD481 !important;
border-radius: 50px; border-radius: 50px;
width: 22px; width: 24px;
height: 22px; height: 24px;
line-height: 1.3; line-height: 1.2;
margin: 4px; margin: 4px;
} }
@ -396,23 +395,6 @@ li.language:hover {
max-height: 250px; max-height: 250px;
} }
.has-error .control-label,
.has-error label {
color: #dc3545;
}
.has-error .form-control {
border-color: #dc3545;
}
a {
color: #17a2b8;
}
a:hover {
color: #0a6977;
}
body .popover-content strong { body .popover-content strong {
min-width: 80px; display:inline-block; min-width: 80px; display:inline-block;
} }

14
assets/js/backend_calendar_default_view.js
View file

@ -54,7 +54,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
* Hides the open popover element. * Hides the open popover element.
*/ */
$calendarPage.on('click', '.close-popover', function () { $calendarPage.on('click', '.close-popover', function () {
$(this).parents('.popover').popover('destroy'); $(this).parents('.popover').popover('dispose');
}); });
/** /**
@ -63,10 +63,12 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
* Enables the edit dialog of the selected calendar event. * Enables the edit dialog of the selected calendar event.
*/ */
$calendarPage.on('click', '.edit-popover', function () { $calendarPage.on('click', '.edit-popover', function () {
$(this).parents('.popover').popover('destroy'); $(this).parents('.popover').popover('dispose');
var $dialog; var $dialog;
console.log(lastFocusedEventData.data)
if (lastFocusedEventData.data.is_unavailable === '0') { if (lastFocusedEventData.data.is_unavailable === '0') {
var appointment = lastFocusedEventData.data; var appointment = lastFocusedEventData.data;
$dialog = $('#manage-appointment'); $dialog = $('#manage-appointment');
@ -130,7 +132,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
* deletion then an AJAX call is made to the server and deletes the appointment from the database. * deletion then an AJAX call is made to the server and deletes the appointment from the database.
*/ */
$calendarPage.on('click', '.delete-popover', function () { $calendarPage.on('click', '.delete-popover', function () {
$(this).parents('.popover').popover('destroy'); $(this).parents('.popover').popover('dispose');
var url; var url;
var data; var data;
@ -277,7 +279,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
* above the calendar item. * above the calendar item.
*/ */
function calendarEventClick(event, jsEvent, view) { function calendarEventClick(event, jsEvent, view) {
$('.popover').popover('destroy'); // Close all open popovers. $('.popover').popover('dispose'); // Close all open popovers.
var $html; var $html;
var displayEdit; var displayEdit;
@ -694,6 +696,8 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('#notification').hide('bind'); $('#notification').hide('bind');
} }
console.log(event.data)
if (event.data.is_unavailable === '0') { if (event.data.is_unavailable === '0') {
// Prepare appointment data. // Prepare appointment data.
var appointment = GeneralFunctions.clone(event.data); var appointment = GeneralFunctions.clone(event.data);
@ -834,7 +838,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
// Remove all open popovers. // Remove all open popovers.
$('.close-popover').each(function (index, closePopoverButton) { $('.close-popover').each(function (index, closePopoverButton) {
$(closePopoverButton).parents('.popover').popover('destroy'); $(closePopoverButton).parents('.popover').popover('dispose');
}); });
// Add new pop overs. // Add new pop overs.

2
assets/js/general_functions.js
View file

@ -284,7 +284,7 @@ window.GeneralFunctions = window.GeneralFunctions || {};
}; };
$.post(url, data) $.post(url, data)
done(function () { .done(function () {
document.location.reload(true); document.location.reload(true);
}) })
.fail(GeneralFunctions.ajaxFailureHandler); .fail(GeneralFunctions.ajaxFailureHandler);