UI Corrections

This commit is contained in:
Alex Tselegidis 2016-07-16 20:14:10 +02:00
parent c6728ee99e
commit 057e3d139a
4 changed files with 109 additions and 61 deletions

View file

@ -64,7 +64,7 @@
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?> <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
<button id="insert-appointment" class="btn btn-primary" <button id="insert-appointment" class="btn btn-default"
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'); ?>
@ -224,69 +224,71 @@
<input id="customer-id" type="hidden" /> <input id="customer-id" type="hidden" />
<div class="col-md-6"> <div class="row">
<div class="form-group"> <div class="col-md-6">
<label for="first-name" class="control-label col-sm-2"> <div class="form-group">
<?php echo $this->lang->line('first_name'); ?> *</label> <label for="first-name" class="control-label col-sm-2">
<div class="col-sm-8"> <?php echo $this->lang->line('first_name'); ?> *</label>
<input type="text" id="first-name" class="required form-control" /> <div class="col-sm-8">
<input type="text" id="first-name" class="required form-control" />
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="last-name" class="control-label col-sm-2"> <label for="last-name" class="control-label col-sm-2">
<?php echo $this->lang->line('last_name'); ?>*</label> <?php echo $this->lang->line('last_name'); ?>*</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="text" id="last-name" class="required form-control" /> <input type="text" id="last-name" class="required form-control" />
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="email" class="control-label col-sm-2"> <label for="email" class="control-label col-sm-2">
<?php echo $this->lang->line('email'); ?>*</label> <?php echo $this->lang->line('email'); ?>*</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="text" id="email" class="required form-control" /> <input type="text" id="email" class="required form-control" />
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="phone-number" class="control-label col-sm-3"> <label for="phone-number" class="control-label col-sm-3">
<?php echo $this->lang->line('phone_number'); ?>*</label> <?php echo $this->lang->line('phone_number'); ?>*</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="text" id="phone-number" class="required form-control" /> <input type="text" id="phone-number" class="required form-control" />
</div>
</div> </div>
</div> </div>
</div> <div class="col-md-6">
<div class="col-md-6"> <div class="form-group">
<div class="form-group"> <label for="address" class="control-label col-sm-3">
<label for="address" class="control-label col-sm-3"> <?php echo $this->lang->line('address'); ?></label>
<?php echo $this->lang->line('address'); ?></label> <div class="col-md-8">
<div class="col-md-8"> <input type="text" id="address" class="form-control" />
<input type="text" id="address" class="form-control" /> </div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="city" class="control-label col-sm-3"> <label for="city" class="control-label col-sm-3">
<?php echo $this->lang->line('city'); ?></label> <?php echo $this->lang->line('city'); ?></label>
<div class="col-md-8"> <div class="col-md-8">
<input type="text" id="city" class="form-control" /> <input type="text" id="city" class="form-control" />
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="zip-code" class="control-label col-sm-3"> <label for="zip-code" class="control-label col-sm-3">
<?php echo $this->lang->line('zip_code'); ?></label> <?php echo $this->lang->line('zip_code'); ?></label>
<div class="col-md-8"> <div class="col-md-8">
<input type="text" id="zip-code" class="form-control" /> <input type="text" id="zip-code" class="form-control" />
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="customer-notes" class="control-label col-sm-3"> <label for="customer-notes" class="control-label col-sm-3">
<?php echo $this->lang->line('notes'); ?></label> <?php echo $this->lang->line('notes'); ?></label>
<div class="col-md-8"> <div class="col-md-8">
<textarea id="customer-notes" rows="3" class="form-control"></textarea> <textarea id="customer-notes" rows="3" class="form-control"></textarea>
</div>
</div> </div>
</div> </div>
</div> </div>

View file

@ -44,15 +44,15 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script>
<script
type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script> src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script> src="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script>
<script
type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script> src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>

View file

@ -200,6 +200,10 @@ body .jspTrack {
background: #EBEBEB; background: #EBEBEB;
} }
body legend {
color: #666;
}
/* BACKEND COMPONENTS /* BACKEND COMPONENTS
-------------------------------------------------------------------- */ -------------------------------------------------------------------- */
@ -484,6 +488,8 @@ body .form-horizontal .controls {
#services-page .record-details .ui-spinner a { #services-page .record-details .ui-spinner a {
cursor: pointer; cursor: pointer;
background: none;
border: none;
} }
/* BACKEND USERS PAGE /* BACKEND USERS PAGE
@ -645,6 +651,17 @@ body .form-horizontal .controls {
#business-logic .ui-spinner { #business-logic .ui-spinner {
border: none; border: none;
width: 80px; width: 80px;
color: #666;
}
#business-logic .ui-state-disabled {
opacity: 1;
}
#business-logic .ui-spinner a {
cursor: pointer;
background: none;
border: none;
} }
#settings-page #user-notifications, #settings-page #user-notifications,

View file

@ -21,7 +21,8 @@ body .custom-qtip {
} }
body .ui-widget { body .ui-widget {
font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 1.1em;
} }
body .ui-widget-overlay { body .ui-widget-overlay {
@ -57,11 +58,16 @@ body .ui-dialog .ui-dialog-buttonpane {
border: none; border: none;
} }
body .ui-button .ui-icon,
body .ui-button:hover .ui-icon {
background-image: url('../ext/jquery-ui/images/ui-icons_222222_256x240.png');
}
body .ui-dialog #error-technical { body .ui-dialog #error-technical {
max-width: 500px; max-width: 500px;
} }
body .ui-datepicker { body .ui-widget.ui-widget-content {
border: 1px solid #3DD481; border: 1px solid #3DD481;
border-radius: 2px; border-radius: 2px;
padding: 0; padding: 0;
@ -70,6 +76,15 @@ body .ui-datepicker {
body .ui-datepicker .ui-widget-header { body .ui-datepicker .ui-widget-header {
border: none; border: none;
background: #3DD481; background: #3DD481;
border-radius: 0;
}
body .ui-datepicker .ui-widget-header .ui-icon {
background-image: url("../ext/jquery-ui/images/ui-icons_ffffff_256x240.png")
}
body .ui-datepicker .ui-datepicker-title {
color: white;
} }
body .ui-datepicker th { body .ui-datepicker th {
@ -117,11 +132,25 @@ body .ui-datepicker td a.ui-state-highlight {
body .ui-datepicker .ui-datepicker-prev-hover { body .ui-datepicker .ui-datepicker-prev-hover {
top: 2px !important; top: 2px !important;
left: 2px !important; left: 2px !important;
background: #80e1ac;
border-color: #80e1ac;
border-radius: 0;
cursor: pointer;
} }
body .ui-datepicker .ui-datepicker-next-hover { body .ui-datepicker .ui-datepicker-next-hover {
top: 2px !important; top: 2px !important;
right: 2px !important; right: 2px !important;
background: #80e1ac;
border-color: #80e1ac;
border-radius: 0;
cursor: pointer;
}
body .ui-datepicker .ui-slider-handle {
border-radius: none;
border-color: #3DD481;
background-color: #3DD481;
} }
.breaks tr:hover td { .breaks tr:hover td {