From 057e3d139a366e148b8609eaa878e7342e280d2f Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sat, 16 Jul 2016 20:14:10 +0200
Subject: [PATCH] UI Corrections

---
 src/application/views/backend/calendar.php | 114 +++++++++++----------
 src/application/views/backend/header.php   |   6 +-
 src/assets/css/backend.css                 |  17 +++
 src/assets/css/general.css                 |  33 +++++-
 4 files changed, 109 insertions(+), 61 deletions(-)

diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index 7423d319..7f46a2c8 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -64,7 +64,7 @@
             <?php endif ?>
 
             <?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'); ?>">
                     <span class="glyphicon glyphicon-plus"></span>
                     <?php echo $this->lang->line('appointment'); ?>
@@ -223,70 +223,72 @@
                             </legend>
 
                             <input id="customer-id" type="hidden" />
+                            
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label for="first-name" class="control-label col-sm-2">
+                                            <?php echo $this->lang->line('first_name'); ?> *</label>
+                                        <div class="col-sm-8">
+                                            <input type="text" id="first-name" class="required form-control" />
+                                        </div>
+                                    </div>
 
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <label for="first-name" class="control-label col-sm-2">
-                                        <?php echo $this->lang->line('first_name'); ?> *</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" id="first-name" class="required form-control" />
+                                    <div class="form-group">
+                                        <label for="last-name" class="control-label col-sm-2">
+                                            <?php echo $this->lang->line('last_name'); ?>*</label>
+                                        <div class="col-sm-8">
+                                            <input type="text" id="last-name" class="required form-control" />
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label for="email" class="control-label col-sm-2">
+                                            <?php echo $this->lang->line('email'); ?>*</label>
+                                        <div class="col-sm-8">
+                                            <input type="text" id="email" class="required form-control" />
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label for="phone-number" class="control-label col-sm-3">
+                                            <?php echo $this->lang->line('phone_number'); ?>*</label>
+                                        <div class="col-sm-8">
+                                            <input type="text" id="phone-number" class="required form-control" />
+                                        </div>
                                     </div>
                                 </div>
-
-                                <div class="form-group">
-                                    <label for="last-name" class="control-label col-sm-2">
-                                        <?php echo $this->lang->line('last_name'); ?>*</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" id="last-name" class="required form-control" />
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label for="address" class="control-label col-sm-3">
+                                            <?php echo $this->lang->line('address'); ?></label>
+                                        <div class="col-md-8">
+                                            <input type="text" id="address" class="form-control" />
+                                        </div>
                                     </div>
-                                </div>
 
-                                <div class="form-group">
-                                    <label for="email" class="control-label col-sm-2">
-                                        <?php echo $this->lang->line('email'); ?>*</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" id="email" class="required form-control" />
+                                    <div class="form-group">
+                                        <label for="city" class="control-label col-sm-3">
+                                            <?php echo $this->lang->line('city'); ?></label>
+                                        <div class="col-md-8">
+                                            <input type="text" id="city" class="form-control" />
+                                        </div>
                                     </div>
-                                </div>
 
-                                <div class="form-group">
-                                    <label for="phone-number" class="control-label col-sm-3">
-                                        <?php echo $this->lang->line('phone_number'); ?>*</label>
-                                    <div class="col-sm-8">
-                                        <input type="text" id="phone-number" class="required form-control" />
+                                    <div class="form-group">
+                                        <label for="zip-code" class="control-label col-sm-3">
+                                            <?php echo $this->lang->line('zip_code'); ?></label>
+                                        <div class="col-md-8">
+                                            <input type="text" id="zip-code" class="form-control" />
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <label for="address" class="control-label col-sm-3">
-                                        <?php echo $this->lang->line('address'); ?></label>
-                                    <div class="col-md-8">
-                                        <input type="text" id="address" class="form-control" />
-                                    </div>
-                                </div>
 
-                                <div class="form-group">
-                                    <label for="city" class="control-label col-sm-3">
-                                        <?php echo $this->lang->line('city'); ?></label>
-                                    <div class="col-md-8">
-                                        <input type="text" id="city" class="form-control" />
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="zip-code" class="control-label col-sm-3">
-                                        <?php echo $this->lang->line('zip_code'); ?></label>
-                                    <div class="col-md-8">
-                                        <input type="text" id="zip-code" class="form-control" />
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label for="customer-notes" class="control-label col-sm-3">
-                                        <?php echo $this->lang->line('notes'); ?></label>
-                                    <div class="col-md-8">
-                                        <textarea id="customer-notes" rows="3" class="form-control"></textarea>
+                                    <div class="form-group">
+                                        <label for="customer-notes" class="control-label col-sm-3">
+                                            <?php echo $this->lang->line('notes'); ?></label>
+                                        <div class="col-md-8">
+                                            <textarea id="customer-notes" rows="3" class="form-control"></textarea>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index 43b356e5..47550570 100755
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -44,15 +44,15 @@
     <script
         type="text/javascript"
         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
         type="text/javascript"
         src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
     <script
         type="text/javascript"
         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
         type="text/javascript"
         src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>
diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index 71555f54..3ca14a89 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -200,6 +200,10 @@ body .jspTrack {
     background: #EBEBEB;
 }
 
+body legend {
+    color: #666;
+}
+
 
 /* BACKEND COMPONENTS
    -------------------------------------------------------------------- */
@@ -484,6 +488,8 @@ body .form-horizontal .controls {
 
 #services-page .record-details .ui-spinner a {
     cursor: pointer;
+    background: none;   
+    border: none;
 }
 
 /* BACKEND USERS PAGE
@@ -645,6 +651,17 @@ body .form-horizontal .controls {
 #business-logic .ui-spinner {
     border: none;
     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,
diff --git a/src/assets/css/general.css b/src/assets/css/general.css
index 0c8b669e..5142db17 100644
--- a/src/assets/css/general.css
+++ b/src/assets/css/general.css
@@ -21,7 +21,8 @@ body .custom-qtip {
 }
 
 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 {
@@ -57,11 +58,16 @@ body .ui-dialog .ui-dialog-buttonpane {
     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 {
     max-width: 500px;
 }
 
-body .ui-datepicker {
+body .ui-widget.ui-widget-content {
     border: 1px solid #3DD481;
     border-radius: 2px;
     padding: 0;
@@ -70,6 +76,15 @@ body .ui-datepicker {
 body .ui-datepicker .ui-widget-header {
     border: none;
     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 {
@@ -117,11 +132,25 @@ body .ui-datepicker td a.ui-state-highlight {
 body .ui-datepicker .ui-datepicker-prev-hover {
     top: 2px !important;
     left: 2px !important;
+    background: #80e1ac;
+    border-color: #80e1ac;
+    border-radius: 0;
+    cursor: pointer;
 }
 
 body .ui-datepicker .ui-datepicker-next-hover {
     top: 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 {