mirror of
https://github.com/alextselegidis/easyappointments.git
synced 2024-11-25 17:33:19 +03:00
UI fixes for the app.
This commit is contained in:
Alex Tselegidis
parent
a8b8850b33
commit
88cc9f1574
8 changed files with 1081 additions and 1073 deletions
|
|
@ -29,15 +29,15 @@
|
|||
<div id="filter-customers" class="filter-records column col-md-4">
|
||||
<form class="input-append">
|
||||
<input class="key span12" type="text" />
|
||||
<button class="filter btn btn-default btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-default btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('customers'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('customers'); ?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<input id="customer-id" type="hidden" />
|
||||
|
||||
<div class="col-md-6" style="margin-left: 0;">
|
||||
<h2><?php echo $this->lang->line('details'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('details'); ?></h3>
|
||||
<div id="form-message" class="alert" style="display:none;"></div>
|
||||
|
||||
<div class="form-group">
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
</div>
|
||||
|
||||
<div class="col-md-5">
|
||||
<h2><?php echo $this->lang->line('appointments'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('appointments'); ?></h3>
|
||||
<div id="customer-appointments"></div>
|
||||
<div id="appointment-details"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -35,18 +35,19 @@
|
|||
?>
|
||||
<div id="services" class="tab-content">
|
||||
<?php // FILTER SERVICES ?>
|
||||
<div class="row">
|
||||
<div id="filter-services" class="filter-records column col-md-4">
|
||||
<form class="input-append">
|
||||
<input class="key span12" type="text" />
|
||||
<button class="filter btn btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<span class="glyphglyphicon glyphicon glyphglyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<span class="glyphglyphicon glyphicon glyphglyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('services'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('services'); ?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
|
|
@ -79,7 +80,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<h2><?php echo $this->lang->line('details'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('details'); ?></h3>
|
||||
<div class="form-message alert" style="display:none;"></div>
|
||||
|
||||
<input type="hidden" id="service-id" />
|
||||
|
|
@ -120,6 +121,7 @@
|
|||
<?php echo $this->lang->line('fields_are_required'); ?></em>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
// --------------------------------------------------------------
|
||||
|
|
@ -132,15 +134,15 @@
|
|||
<div id="filter-categories" class="filter-records column col-md-4">
|
||||
<form class="input-append">
|
||||
<input class="key" type="text" />
|
||||
<button class="filter btn btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('categories'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('categories'); ?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
|
|
@ -173,7 +175,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<h2><?php echo $this->lang->line('details'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('details'); ?></h3>
|
||||
<div class="form-message alert" style="display:none;"></div>
|
||||
|
||||
<input type="hidden" id="category-id" />
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@
|
|||
// --------------------------------------------------------------
|
||||
?>
|
||||
<div id="about" class="tab-content">
|
||||
<h2>Easy!Appointments</h2>
|
||||
<h3>Easy!Appointments</h3>
|
||||
<p>
|
||||
<?php echo $this->lang->line('about_ea_info'); ?>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -64,15 +64,15 @@
|
|||
<div id="filter-admins" class="filter-records column col-md-4">
|
||||
<form class="input-append">
|
||||
<input class="key" type="text" />
|
||||
<button class="filter btn btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('admins'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('admins'); ?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
|
|
@ -83,11 +83,11 @@
|
|||
<span class="glyphicon glyphicon-plus"></span>
|
||||
<?php echo $this->lang->line('add'); ?>
|
||||
</button>
|
||||
<button id="edit-admin" class="btn" disabled="disabled">
|
||||
<button id="edit-admin" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-pencil"></span>
|
||||
<?php echo $this->lang->line('edit'); ?>
|
||||
</button>
|
||||
<button id="delete-admin" class="btn" disabled="disabled">
|
||||
<button id="delete-admin" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-remove"></span>
|
||||
<?php echo $this->lang->line('delete'); ?>
|
||||
</button>
|
||||
|
|
@ -98,14 +98,14 @@
|
|||
<span class="glyphicon glyphicon-ok"></span>
|
||||
<?php echo $this->lang->line('save'); ?>
|
||||
</button>
|
||||
<button id="cancel-admin" class="btn">
|
||||
<button id="cancel-admin" class="btn btn-default">
|
||||
<span class="glyphicon glyphicon-ban-circle"></span>
|
||||
<?php echo $this->lang->line('cancel'); ?>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2><?php echo $this->lang->line('details'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('details'); ?></h3>
|
||||
|
||||
<div class="form-message alert" style="display:none;"></div>
|
||||
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
|
||||
<br>
|
||||
|
||||
<button type="button" id="admin-notifications" class="btn" data-toggle="button">
|
||||
<button type="button" id="admin-notifications" class="btn btn-default" data-toggle="button">
|
||||
<span class="glyphicon glyphicon-envelope"></span>
|
||||
<span><?php echo $this->lang->line('receive_notifications'); ?></span>
|
||||
</button>
|
||||
|
|
@ -201,30 +201,30 @@
|
|||
<div id="filter-providers" class="filter-records column col-md-7">
|
||||
<form class="input-append">
|
||||
<input class="key" type="text" />
|
||||
<button class="filter btn btn-sm" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-sm" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear'); ?>">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('providers'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('providers'); ?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
<div class="details column col-md-7">
|
||||
<div>
|
||||
<div class="pull-left">
|
||||
<div class="add-edit-delete-group btn-group">
|
||||
<button id="add-provider" class="btn btn-primary">
|
||||
<span class="glyphicon glyphicon-plus"></span>
|
||||
<?php echo $this->lang->line('add'); ?>
|
||||
</button>
|
||||
<button id="edit-provider" class="btn" disabled="disabled">
|
||||
<button id="edit-provider" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-pencil"></span>
|
||||
<?php echo $this->lang->line('edit'); ?>
|
||||
</button>
|
||||
<button id="delete-provider" class="btn" disabled="disabled">
|
||||
<button id="delete-provider" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-remove"></span>
|
||||
<?php echo $this->lang->line('delete'); ?>
|
||||
</button>
|
||||
|
|
@ -235,7 +235,7 @@
|
|||
<span class="glyphicon glyphicon-ok"></span>
|
||||
<?php echo $this->lang->line('save'); ?>
|
||||
</button>
|
||||
<button id="cancel-provider" class="btn">
|
||||
<button id="cancel-provider" class="btn btn-default">
|
||||
<span class="glyphicon glyphicon-ban-circle"></span>
|
||||
<?php echo $this->lang->line('cancel'); ?>
|
||||
</button>
|
||||
|
|
@ -253,7 +253,7 @@
|
|||
<div class="form-message alert" style="display:none;"></div>
|
||||
|
||||
<div class="details-view provider-view">
|
||||
<h2><?php echo $this->lang->line('details'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('details'); ?></h3>
|
||||
|
||||
<input type="hidden" id="provider-id" class="record-id" />
|
||||
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
|
||||
<br>
|
||||
|
||||
<button type="button" id="provider-notifications" class="btn" data-toggle="button">
|
||||
<button type="button" id="provider-notifications" class="btn btn-default" data-toggle="button">
|
||||
<span class="glyphicon glyphicon-envelope"></span>
|
||||
<span><?php echo $this->lang->line('receive_notifications'); ?></span>
|
||||
</button>
|
||||
|
|
@ -341,7 +341,7 @@
|
|||
</div>
|
||||
|
||||
<div class="working-plan-view provider-view" style="display: none;">
|
||||
<h2><?php echo $this->lang->line('working_plan'); ?></h2>
|
||||
<h3><?php echo $this->lang->line('working_plan'); ?></h3>
|
||||
<button id="reset-working-plan" class="btn btn-primary"
|
||||
title="Reset the working plan back to the default values.">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
|
|
@ -430,7 +430,7 @@
|
|||
|
||||
<br>
|
||||
|
||||
<h2><?php echo $this->lang->line('breaks');?></h2>
|
||||
<h3><?php echo $this->lang->line('breaks');?></h3>
|
||||
|
||||
<span class="help-block">
|
||||
<?php echo $this->lang->line('add_breaks_during_each_day');?>
|
||||
|
|
@ -471,15 +471,15 @@
|
|||
<div id="filter-secretaries" class="filter-records column col-md-4">
|
||||
<form class="input-append">
|
||||
<input class="key" type="text" />
|
||||
<button class="filter btn btn-sm" type="submit" title="<?php echo $this->lang->line('filter');?>">
|
||||
<button class="filter btn btn-default btn-xs" type="submit" title="<?php echo $this->lang->line('filter');?>">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<button class="clear btn btn-sm" type="button" title="<?php echo $this->lang->line('clear');?>">
|
||||
<button class="clear btn btn-default btn-xs" type="button" title="<?php echo $this->lang->line('clear');?>">
|
||||
<span class="glyphicon glyphicon-repeat"></span>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo $this->lang->line('secretaries');?></h2>
|
||||
<h3><?php echo $this->lang->line('secretaries');?></h3>
|
||||
<div class="results"></div>
|
||||
</div>
|
||||
|
||||
|
|
@ -490,11 +490,11 @@
|
|||
<span class="glyphicon glyphicon-plus"></span>
|
||||
<?php echo $this->lang->line('add');?>
|
||||
</button>
|
||||
<button id="edit-secretary" class="btn" disabled="disabled">
|
||||
<button id="edit-secretary" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-pencil"></span>
|
||||
<?php echo $this->lang->line('edit');?>
|
||||
</button>
|
||||
<button id="delete-secretary" class="btn" disabled="disabled">
|
||||
<button id="delete-secretary" class="btn btn-default" disabled="disabled">
|
||||
<span class="glyphicon glyphicon-remove"></span>
|
||||
<?php echo $this->lang->line('delete');?>
|
||||
</button>
|
||||
|
|
@ -505,14 +505,14 @@
|
|||
<span class="glyphicon glyphicon-ok"></span>
|
||||
<?php echo $this->lang->line('save');?>
|
||||
</button>
|
||||
<button id="cancel-secretary" class="btn">
|
||||
<button id="cancel-secretary" class="btn btn-default">
|
||||
<span class="glyphicon glyphicon-ban-circle"></span>
|
||||
<?php echo $this->lang->line('cancel');?>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2><?php echo $this->lang->line('details');?></h2>
|
||||
<h3><?php echo $this->lang->line('details');?></h3>
|
||||
|
||||
<div class="form-message alert" style="display:none;"></div>
|
||||
|
||||
|
|
@ -588,7 +588,7 @@
|
|||
|
||||
<br>
|
||||
|
||||
<button type="button" id="secretary-notifications" class="btn" data-toggle="button">
|
||||
<button type="button" id="secretary-notifications" class="btn btn-default" data-toggle="button">
|
||||
<span class="glyphicon glyphicon-envelope"></span>
|
||||
<span><?php echo $this->lang->line('receive_notifications');?></span>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -289,14 +289,15 @@ body .jspTrack {
|
|||
#existing-customers-list div {
|
||||
display: inline-block;
|
||||
width: 250px;
|
||||
margin: 0 5px 5px 0;
|
||||
padding: 3px 5px;
|
||||
margin: 0 7px 7px 0;
|
||||
padding: 5px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
#existing-customers-list div:hover {
|
||||
background: #B8F0C1;
|
||||
background: #3DD481;
|
||||
font-weight: bold;
|
||||
color: #FFF;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ var GeneralFunctions = {
|
|||
});
|
||||
|
||||
$('#message_box').dialog('open');
|
||||
$('.ui-dialog .ui-dialog-buttonset button').addClass('btn');
|
||||
$('.ui-dialog .ui-dialog-buttonset button').addClass('btn btn-default');
|
||||
$('#message_box .ui-dialog-titlebar-close').hide();
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -57,10 +57,18 @@ $(document).ready(function() {
|
|||
}
|
||||
},
|
||||
error: function(jqXHR, textStatus, errorThrown) {
|
||||
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE,
|
||||
GeneralFunctions.EXCEPTIONS_MESSAGE);
|
||||
console.log('The installation could be completed due to AJAX issues: ',
|
||||
jqXHR, textStatus, errorThrown);
|
||||
// Treat the error the same way as php exceptions.
|
||||
var exc = {
|
||||
exceptions: [
|
||||
JSON.stringify({
|
||||
message: 'The installation could not be completed due to an ' +
|
||||
'unexpected issue. Please check the browser\'s console for ' +
|
||||
'more information.'
|
||||
})
|
||||
]
|
||||
};
|
||||
GeneralFunctions.handleAjaxExceptions(exc);
|
||||
console.log(exc.exceptions[0].message, jqXHR, textStatus, errorThrown);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -55,16 +55,16 @@ WorkingPlan.prototype.setup = function(workingPlan) {
|
|||
'<td class="break-start editable">' + brk.start + '</td>' +
|
||||
'<td class="break-end editable">' + brk.end + '</td>' +
|
||||
'<td>' +
|
||||
'<button type="button" class="btn btn-sm edit-break" title="' + EALang['edit'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm edit-break" title="' + EALang['edit'] + '">' +
|
||||
'<span class="glyphicon glyphicon-pencil"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm delete-break" title="' + EALang['delete'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm delete-break" title="' + EALang['delete'] + '">' +
|
||||
'<span class="glyphicon glyphicon-remove"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm save-break hidden" title="' + EALang['save'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm save-break hidden" title="' + EALang['save'] + '">' +
|
||||
'<span class="glyphicon glyphicon-ok"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm cancel-break hidden" title="' + EALang['cancel'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm cancel-break hidden" title="' + EALang['cancel'] + '">' +
|
||||
'<span class="glyphicon glyphicon-ban-circle"></span>' +
|
||||
'</button>' +
|
||||
'</td>' +
|
||||
|
|
@ -103,9 +103,6 @@ WorkingPlan.prototype.editableBreakDay = function($selector) {
|
|||
}, {
|
||||
'type': 'select',
|
||||
'data': weekDays,
|
||||
// 'data': '{ "Monday": "Monday", "Tuesday": "Tuesday", "Wednesday": "Wednesday", '
|
||||
// + '"Thursday": "Thursday", "Friday": "Friday", "Saturday": "Saturday", '
|
||||
// + '"Sunday": "Sunday", "selected": "Monday"}',
|
||||
'event': 'edit',
|
||||
'height': '30px',
|
||||
'submit': '<button type="button" class="hidden submit-editable">Submit</button>',
|
||||
|
|
@ -178,16 +175,16 @@ WorkingPlan.prototype.bindEventHandlers = function() {
|
|||
'<td class="break-start editable">09:00</td>' +
|
||||
'<td class="break-end editable">10:00</td>' +
|
||||
'<td>' +
|
||||
'<button type="button" class="btn btn-sm edit-break" title="' + EALang['edit'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm edit-break" title="' + EALang['edit'] + '">' +
|
||||
'<span class="glyphicon glyphicon-pencil"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm delete-break" title="' + EALang['delete'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm delete-break" title="' + EALang['delete'] + '">' +
|
||||
'<span class="glyphicon glyphicon-remove"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm save-break hidden" title="' + EALang['save'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm save-break hidden" title="' + EALang['save'] + '">' +
|
||||
'<span class="glyphicon glyphicon-ok"></span>' +
|
||||
'</button>' +
|
||||
'<button type="button" class="btn btn-sm cancel-break hidden" title="' + EALang['cancel'] + '">' +
|
||||
'<button type="button" class="btn btn-default btn-sm cancel-break hidden" title="' + EALang['cancel'] + '">' +
|
||||
'<span class="glyphicon glyphicon-ban-circle"></span>' +
|
||||
'</button>' +
|
||||
'</td>' +
|
||||
|
|
|
|||
Loading…
Reference in a new issue