From 0112f1aedb9f0b62505a36481ad6eb869baa4546 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 30 Nov 2014 17:40:57 -0800 Subject: [PATCH] CRM-15578 - Change table layouts to directive. Remove calls. --- js/angular-crmCaseType.js | 1 + partials/crmCaseType/caseTypeDetails.html | 52 ++---- partials/crmMailing2/field/recipients.html | 8 +- partials/crmMailing2/headerFooter.html | 25 +-- partials/crmMailing2/mailing.html | 121 ++++++-------- partials/crmMailing2/publication.html | 16 +- partials/crmMailing2/responses.html | 176 +++++++++------------ partials/crmMailing2/summary.html | 46 +++--- partials/crmMailing2/tracking.html | 47 ++---- 9 files changed, 186 insertions(+), 306 deletions(-) diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js index fd525718fd..d27c9655e5 100644 --- a/js/angular-crmCaseType.js +++ b/js/angular-crmCaseType.js @@ -128,6 +128,7 @@ crmCaseType.controller('CaseTypeCtrl', function($scope, crmApi, apiCalls) { $scope.partialUrl = partialUrl; + var ts = $scope.ts = CRM.ts('CiviCase'); $scope.activityStatuses = _.values(apiCalls.actStatuses.values); $scope.activityTypes = apiCalls.actTypes.values; diff --git a/partials/crmCaseType/caseTypeDetails.html b/partials/crmCaseType/caseTypeDetails.html index 3a24b86ee8..fb16da9ef0 100644 --- a/partials/crmCaseType/caseTypeDetails.html +++ b/partials/crmCaseType/caseTypeDetails.html @@ -4,15 +4,9 @@ Required vars: caseType The original form used table layout; don't know if we have an alternative, CSS-based layout --> - - - - - - - - - - - - - - - - - - - -
- - +
+
+
-
- - + +
WARNING: If any external files or programs reference the old "Name", then they must be updated manually.
-
- - + +
-
- - + +
-
+ + + diff --git a/partials/crmMailing2/field/recipients.html b/partials/crmMailing2/field/recipients.html index 3c3da6d161..db427c58d0 100644 --- a/partials/crmMailing2/field/recipients.html +++ b/partials/crmMailing2/field/recipients.html @@ -8,9 +8,9 @@ Required vars: mailing, crmMailingConst {{getRecipientsEstimate()}}
- -
@@ -23,4 +23,4 @@ Required vars: mailing, crmMailingConst required multiple> - \ No newline at end of file + diff --git a/partials/crmMailing2/headerFooter.html b/partials/crmMailing2/headerFooter.html index 975350a066..b677c78531 100644 --- a/partials/crmMailing2/headerFooter.html +++ b/partials/crmMailing2/headerFooter.html @@ -1,14 +1,10 @@ - - - - - - - - - -
- - +
+
+
-
- - + +
-
+ + + diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html index 130e1e43dc..3d7a50a482 100644 --- a/partials/crmMailing2/mailing.html +++ b/partials/crmMailing2/mailing.html @@ -1,76 +1,53 @@ - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - -
- - -
- -
- -
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
diff --git a/partials/crmMailing2/publication.html b/partials/crmMailing2/publication.html index 3e0e8b23ef..88c724f2a8 100644 --- a/partials/crmMailing2/publication.html +++ b/partials/crmMailing2/publication.html @@ -1,14 +1,10 @@ - - - - - -
- - +
+
+
-
+ + + diff --git a/partials/crmMailing2/responses.html b/partials/crmMailing2/responses.html index 8e28768c3b..00b7c2315b 100644 --- a/partials/crmMailing2/responses.html +++ b/partials/crmMailing2/responses.html @@ -1,112 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- {{ts('Recipients\' replies are sent to a CiviMail specific address instead of the sender\'s address so they can be stored within CiviCRM.')}} -
-
- - -
-
- {{ts('If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.')}} -
-
- - -
-
- {{ts('If a recipient replies to this mailing, send an automated reply using the selected message.')}} -
-
+
+
+
+ + +
+
+ {{ts('Recipients\' replies are sent to a CiviMail specific address instead of the sender\'s address so they can be stored within CiviCRM.')}} +
+
+ +
+
+ {{ts('If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.')}} +
+
+ +
+
+ {{ts('If a recipient replies to this mailing, send an automated reply using the selected message.')}} +
+
+
- - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
diff --git a/partials/crmMailing2/summary.html b/partials/crmMailing2/summary.html index 5dcde6d037..51bfbae14e 100644 --- a/partials/crmMailing2/summary.html +++ b/partials/crmMailing2/summary.html @@ -3,13 +3,10 @@ Controller: EditMailingCtrl Required vars: mailing, crmMailingConst FIXME: Don't hardcode table-based layout! --> - - - - - - - - - - - -
- - +
+
+
+
-
- - - -
\ No newline at end of file + + +
+ +
+ + diff --git a/partials/crmMailing2/tracking.html b/partials/crmMailing2/tracking.html index fc49f21c74..ebd57c25cd 100644 --- a/partials/crmMailing2/tracking.html +++ b/partials/crmMailing2/tracking.html @@ -1,35 +1,20 @@ - - - - - - - - - - - - - - - -
- - -
-
- {{ts('Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.')}} -
-
- - -
-
- {{ts('Track the number of times recipients open this mailing in their email software.')}} -
-
+
+
+
+ +
+
+ {{ts('Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.')}} +
+
+ +
+
+ {{ts('Track the number of times recipients open this mailing in their email software.')}} +
+
+
-- 2.25.1