client module refactors + dialog css

front/core/components/dialog/style.scss

@@ -34,7 +34,6 @@
             input[type="button"],
             input[type="submit"],
             input[type="reset"] {
-                @extend %clickable;
                 text-transform: uppercase;
                 background-color: transparent;
                 border: none;
@@ -44,6 +43,20 @@
                 padding: 11px;
                 margin: -11px;
                 margin-left: 11px;
+
+                &:hover,
+                &:focus {
+                    color: lighten($color-button, 10%);
+                }
+            }
+            button {
+                background-color: $color-button;
+                color: white;
+                &:hover,
+                &:focus {
+                    background-color: lighten($color-button, 10%);
+                    color: white;
+                }
             }
         }
     }

modules/client/front/basic-data/index.html

@@ -72,12 +72,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>

modules/client/front/billing-data/index.html

@@ -96,12 +96,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>

modules/client/front/contact/index.html

@@ -47,8 +47,15 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>

modules/client/front/create/index.html

@@ -125,8 +125,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Create"></vn-submit>
+        <vn-submit
-        <vn-button ui-sref="client.index" label="Cancel"></vn-button>
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="client.index">
+        </vn-button>
     </vn-button-bar>
 </form>
 <!-- New postcode dialog -->

modules/client/front/credit-insurance/create/index.html

@@ -32,12 +32,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
-            ui-sref="client.card.creditInsurance.index"
+            class="cancel"
-            label="Cancel">
+            label="Cancel"
+            ui-sref="client.card.creditInsurance.index"></vn-button>
         </vn-button>
     </vn-button-bar>
 </form>

modules/client/front/dms/create/index.html

@@ -94,8 +94,15 @@
             </vn-vertical>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
+            <vn-submit
-            <vn-button ui-sref="client.card.dms.index" label="Cancel"></vn-button>
+                disabled="!watcher.dataChanged()"
+                label="Upload">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="client.card.dms.index">
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>

modules/client/front/fiscal-data/index.html

@@ -203,12 +203,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>

modules/client/front/recovery/create/index.html

@@ -33,12 +33,13 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
-            ng-click="$ctrl.cancel()"
+            class="cancel"
-            label="Cancel">
+            label="Cancel"
+            ng-click="$ctrl.cancel()">
         </vn-button>
     </vn-button-bar>
 </form>

modules/client/front/sample/create/index.html

@@ -54,17 +54,18 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="sampleType.selection"
+            disabled="!sampleType.selection"
             label="Send">
         </vn-submit>
         <vn-button
-            ng-if="sampleType.selection.hasPreview"
+            disabled="!sampleType.selection.hasPreview"
             label="Preview" 
             ng-click="$ctrl.showPreview()">
         </vn-button>
         <vn-button
-            ui-sref="client.card.sample.index"
+            class="cancel"
-            label="Cancel">
+            label="Cancel"
+            ui-sref="client.card.sample.index">
         </vn-button>
     </vn-button-bar>
 </form>

modules/client/front/web-access/index.html

@@ -27,18 +27,19 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <vn-button
-            label="Undo changes"
+        ng-if="$ctrl.canChangePassword"
-            ng-if="$ctrl.$.form.$dirty"
+        label="Change password"
-            ng-click="watcher.loadOriginalData()">
+        vn-dialog="change-pass">
         </vn-button>
         <vn-button
-            ng-if="$ctrl.canChangePassword"
+            class="cancel"
-            label="Change password"
+            label="Undo changes"
-            vn-dialog="change-pass">
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
 </form>