From 9b09d731cc47ab45012391f698b282fb66a81f15 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 1 Feb 2015 21:24:47 -0800 Subject: [PATCH] CRM-15856 - crmMailing - Submit button Distinguish between blockage based on invalid data from blockage based on pending AJAX. --- css/angular-crmMailing.css | 21 +++++++++++++++++---- partials/crmMailing/edit-wizard.html | 2 +- partials/crmMailing/edit.html | 2 +- partials/crmMailingAB/edit.html | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/css/angular-crmMailing.css b/css/angular-crmMailing.css index d507b98009..1d86ccfcc7 100644 --- a/css/angular-crmMailing.css +++ b/css/angular-crmMailing.css @@ -83,6 +83,7 @@ a.crmMailing-submit-button div { a.crmMailing-submit-button div:hover { background: #afa; border: 1px solid #7a7; + cursor: pointer; } a.crmMailing-submit-button:hover { text-decoration: none; @@ -91,13 +92,25 @@ a.crmMailing-submit-button.disabled div { color: black; background: #aaa; border: 1px solid #8a8; - padding: 1em; - margin: 1em; - width: 15em; } -a.crmMailing-submit-button.disabled div:hover { +a.crmMailing-submit-button.blocking div { + -webkit-animation: crmMailingPulse 2s infinite !important; /* Chrome, Safari, Opera */ + animation: crmMailingPulse 2s infinite !important; +} +@-webkit-keyframes crmMailingPulse { + 0% {background: #bfb;} + 50% {background: #aaa;} + 100% {background: #bfb;} +} +@keyframes crmMailingPulse { + 0% {background: #bfb;} + 50% {background: #aaa;} + 100% {background: #bfb;} +} +a.crmMailing-submit-button.disabled div:hover, a.crmMailing-submit-button.blocking div:hover { background: #aaa; border: 1px solid #7a7; + cursor: not-allowed; } .crm-container .crm-form-block label { diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html index b7cce60e96..df8f8ad0a2 100644 --- a/partials/crmMailing/edit-wizard.html +++ b/partials/crmMailing/edit-wizard.html @@ -53,7 +53,7 @@
- +
- +
{{ts('Submit Mailing')}}
diff --git a/partials/crmMailingAB/edit.html b/partials/crmMailingAB/edit.html index 177bbdf63d..7776dea48f 100644 --- a/partials/crmMailingAB/edit.html +++ b/partials/crmMailingAB/edit.html @@ -167,7 +167,7 @@ }" crm-abtest="abtest">
- +
{{ts('Submit Mailing')}}
-- 2.25.1