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

Added various UI fixes

Browse source
This commit is contained in:
Alex Tselegidis 2015-08-13 20:33:47 +02:00
parent 809eab4ff2
commit 4e46417ee6
5 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/application/views/appointments/book.php
View file

@ -139,7 +139,7 @@
. '/index.php/appointments/cancel/' . $appointment_data['hash'] . '"> . '/index.php/appointments/cancel/' . $appointment_data['hash'] . '">
<input type="hidden" name="csrfToken" value="' . $this->security->get_csrf_hash() . '" /> <input type="hidden" name="csrfToken" value="' . $this->security->get_csrf_hash() . '" />
<textarea name="cancel_reason" style="display:none"></textarea> <textarea name="cancel_reason" style="display:none"></textarea>
<button id="cancel-appointment" class="btn btn-inverse">' . <button id="cancel-appointment" class="btn btn-default">' .
$this->lang->line('cancel') . '</button> $this->lang->line('cancel') . '</button>
</form> </form>
</div> </div>
@ -247,7 +247,8 @@
<button type="button" id="button-next-1" class="btn button-next btn-primary" <button type="button" id="button-next-1" class="btn button-next btn-primary"
data-step_index="1"> data-step_index="1">
<?php echo $this->lang->line('next'); ?> <?php echo $this->lang->line('next'); ?>
<i class="icon-forward icon-white"></i></button> <span class="glyphicon glyphicon-forward"></span>
</button>
</div> </div>
</div> </div>
@ -274,13 +275,14 @@
<div class="command-buttons"> <div class="command-buttons">
<button type="button" id="button-back-2" class="btn button-back" <button type="button" id="button-back-2" class="btn button-back"
data-step_index="2"><i class="icon-backward"></i> data-step_index="2">
<span class="glyphicon glyphicon-backward"></span>
<?php echo $this->lang->line('back'); ?> <?php echo $this->lang->line('back'); ?>
</button> </button>
<button type="button" id="button-next-2" class="btn button-next btn-primary" <button type="button" id="button-next-2" class="btn button-next btn-primary"
data-step_index="2"> data-step_index="2">
<?php echo $this->lang->line('next'); ?> <?php echo $this->lang->line('next'); ?>
<i class="icon-forward icon-white"></i> <span class="glyphicon glyphicon-forward"></span>
</button> </button>
</div> </div>
</div> </div>
@ -339,13 +341,13 @@
<div class="command-buttons"> <div class="command-buttons">
<button type="button" id="button-back-3" class="btn button-back" <button type="button" id="button-back-3" class="btn button-back"
data-step_index="3"><i class="icon-backward"></i> data-step_index="3"><span class="glyphicon glyphicon-backward"></span>
<?php echo $this->lang->line('back'); ?> <?php echo $this->lang->line('back'); ?>
</button> </button>
<button type="button" id="button-next-3" class="btn button-next btn-primary" <button type="button" id="button-next-3" class="btn button-next btn-primary"
data-step_index="3"> data-step_index="3">
<?php echo $this->lang->line('next'); ?> <?php echo $this->lang->line('next'); ?>
<i class="icon-forward icon-white"></i> <span class="glyphicon glyphicon-forward"></span>
</button> </button>
</div> </div>
</div> </div>
@ -365,12 +367,13 @@
<div class="command-buttons"> <div class="command-buttons">
<button type="button" id="button-back-4" class="btn button-back" <button type="button" id="button-back-4" class="btn button-back"
data-step_index="4"><i class="icon-backward"></i> data-step_index="4">
<span class="glyphicon glyphicon-backward"></span>
<?php echo $this->lang->line('back'); ?> <?php echo $this->lang->line('back'); ?>
</button> </button>
<form id="book-appointment-form" style="display:inline-block" method="post"> <form id="book-appointment-form" style="display:inline-block" method="post">
<button id="book-appointment-submit" type="button" class="btn btn-success"> <button id="book-appointment-submit" type="button" class="btn btn-success">
<i class="icon-ok icon-white"></i> <span class="glyphicon glyphicon-ok"></span>
<?php <?php
echo (!$manage_mode) ? $this->lang->line('confirm') echo (!$manage_mode) ? $this->lang->line('confirm')
: $this->lang->line('update'); : $this->lang->line('update');

2
src/application/views/appointments/book_success.php
View file

@ -48,7 +48,7 @@
if ($this->config->item('ea_google_sync_feature')) { if ($this->config->item('ea_google_sync_feature')) {
echo ' echo '
<button id="add-to-google-calendar" class="btn btn-primary"> <button id="add-to-google-calendar" class="btn btn-primary">
<i class="icon-plus icon-white"></i> <span class="glyphicon glyphicon-plus"></span>
' . $this->lang->line('add_to_google_calendar') . ' ' . $this->lang->line('add_to_google_calendar') . '
</button>'; </button>';
} }

4
src/application/views/backend/calendar.php
View file

@ -51,7 +51,7 @@
<button id="google-sync" class="btn btn-primary" <button id="google-sync" class="btn btn-primary"
title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>"> title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
<span class="glyphicon glyphicon-refresh"></span> <span class="glyphicon glyphicon-refresh"></span>
<?php echo $this->lang->line('synchronize'); ?> <span><?php echo $this->lang->line('synchronize'); ?></span>
</button> </button>
<button id="enable-sync" class="btn" data-toggle="button" <button id="enable-sync" class="btn" data-toggle="button"
@ -70,7 +70,7 @@
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE) { ?> <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE) { ?>
<div class="btn-group"> <div class="btn-group">
<button id="insert-appointment" class="btn btn-info" <button id="insert-appointment" class="btn btn-primary"
title="<?php echo $this->lang->line('new_appointment_hint'); ?>"> title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<?php echo $this->lang->line('appointment'); ?> <?php echo $this->lang->line('appointment'); ?>

9
src/assets/css/general.css
View file

@ -116,4 +116,11 @@ li.language:hover {
.ui-timepicker-rtl{ direction: rtl; } .ui-timepicker-rtl{ direction: rtl; }
.ui-timepicker-rtl dl { text-align: right; } .ui-timepicker-rtl dl { text-align: right; }
.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; } .ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
/* BOOTSTRAP THEME FIXES
------------------------------------------------------------------------- */
.btn-danger:active, .btn-danger.active, .open>.dropdown-toggle.btn-danger {
background-color: #E24C52;
}

4
src/assets/js/backend_calendar.js
View file

@ -267,7 +267,7 @@ var BackendCalendar = {
// If the user has already the sync enabled then apply the proper // If the user has already the sync enabled then apply the proper
// style changes. // style changes.
if ($('#select-filter-item option:selected').attr('google-sync') === 'true') { if ($('#select-filter-item option:selected').attr('google-sync') === 'true') {
$('#enable-sync').addClass('btn-success enabled'); $('#enable-sync').addClass('btn-danger enabled');
$('#enable-sync span:eq(1)').text(EALang['disable_sync']); $('#enable-sync span:eq(1)').text(EALang['disable_sync']);
$('#google-sync').prop('disabled', false); $('#google-sync').prop('disabled', false);
} else { } else {
@ -712,7 +712,7 @@ var BackendCalendar = {
// The user has granted access to his data. // The user has granted access to his data.
windowHandle.close(); windowHandle.close();
window.clearInterval(authInterval); window.clearInterval(authInterval);
$('#enable-sync').addClass('btn-success enabled'); $('#enable-sync').addClass('btn-danger enabled');
$('#enable-sync span:eq(1)').text(EALang['disable_sync']); $('#enable-sync span:eq(1)').text(EALang['disable_sync']);
$('#google-sync').prop('disabled', false); $('#google-sync').prop('disabled', false);
$('#select-filter-item option:selected').attr('google-sync', 'true'); $('#select-filter-item option:selected').attr('google-sync', 'true');