From 5611423ae30e9b834fde98f7d6806eeb13d2fca0 Mon Sep 17 00:00:00 2001
From: Siddhant Rajagopalan <rajgo94@gmail.com>
Date: Sun, 17 Aug 2014 21:34:31 +0530
Subject: [PATCH] changing layout

---
 js/angular-newMailing.js               | 29 +++++++++---------
 partials/crmMailingType/content.html   | 10 ++++++-
 partials/crmMailingType/main.html      | 41 +++++---------------------
 partials/crmMailingType/recipient.html | 16 +++++-----
 partials/crmMailingType/send.html      | 11 +++++++
 5 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/js/angular-newMailing.js b/js/angular-newMailing.js
index 5cbbc5d523..022c5b8484 100644
--- a/js/angular-newMailing.js
+++ b/js/angular-newMailing.js
@@ -187,21 +187,21 @@
 
 
 		$scope.recclicked = function(){
-			if($scope.acttab >=0){
+			//if($scope.acttab >=0){
 				$scope.acttab =0;
-			}
+			//}
 		};
 
 		$scope.conclicked = function(){
-			if($scope.acttab >=1){
+		//	if($scope.acttab >=1){
 				$scope.acttab =1;
-			}
+			//}
 		};
 
 		$scope.schedclicked = function(){
-			if($scope.acttab >=2){
+			//if($scope.acttab >=2){
 				$scope.acttab =2;
-			}
+			//}
 		};
 
 		//to split the value of selectedMail.scheduled_date into the date and time separately
@@ -624,9 +624,10 @@
 		return {
 			restrict: 'A',
 			link: function(scope, element, attrs) {
-				$(element).parent().parent().tabs();
+				$(element).parent().parent().parent().parent().parent().tabs();
+        console.log($(element).parent().parent().parent().parent().parent());
 				var myarr = new Array(1,2);
-				$(element).parent().parent().tabs({disabled:myarr});
+				//$(element).parent().parent().parent().parent().parent().tabs({disabled:myarr});
 				$(element).on("click",function() {
 					scope.acttab=scope.acttab +1;
 					var myArray1 = new Array( );
@@ -634,8 +635,8 @@
 						if(scope.acttab!=i)
 							myArray1.push(i);
 					}
-					$(element).parent().parent().tabs( "option", "disabled", myArray1 );
-					$(element).parent().parent().tabs({active:scope.acttab});
+					//$(element).parent().parent().parent().parent().parent().tabs( "option", "disabled", myArray1 );
+					$(element).parent().parent().parent().parent().parent().tabs({active:scope.acttab});
 					console.log("sid");
 				});
 			}
@@ -647,9 +648,9 @@
 		return {
 			restrict: 'A',
 			link: function(scope, element, attrs) {
-				$(element).parent().parent().tabs();
+				$(element).parent().parent().parent().parent().parent().tabs();
 				var myarr = new Array(1,2);
-				$(element).parent().parent().tabs({disabled:myarr});
+				//$(element).parent().parent().parent().parent().parent().tabs({disabled:myarr});
 				$(element).on("click",function() {
 					scope.acttab=scope.acttab -1;
 					var myArray1 = new Array( );
@@ -657,8 +658,8 @@
 						if(scope.acttab!=i)
 							myArray1.push(i);
 					}
-					$(element).parent().parent().tabs( "option", "disabled", myArray1 );
-					$(element).parent().parent().tabs({active:scope.acttab});
+			//		$(element).parent().parent().parent().parent().parent().tabs( "option", "disabled", myArray1 );
+					$(element).parent().parent().parent().parent().parent().tabs({active:scope.acttab});
 					console.log("sid");
 				});
 			}
diff --git a/partials/crmMailingType/content.html b/partials/crmMailingType/content.html
index 2a92059548..cfc53fbd1e 100644
--- a/partials/crmMailingType/content.html
+++ b/partials/crmMailingType/content.html
@@ -2,7 +2,8 @@
 Controller: MailCtrl
 Required Variables: cool_api and currentMailing and fromAddress
 -->
-
+<form name="editMailingFormStep2" unsaved-warning-form>
+  <div class="crm-block crm-form-block crmMailing">
 <br>
 <table class="form-layout-compressed">
 	<tbody>
@@ -75,3 +76,10 @@ Required Variables: cool_api and currentMailing and fromAddress
 	<div class="crm-accordion-header">Track and Respond</div>
 	<div class="crm-accordion-body" ng-include="partialUrl('trackandRespond.html')"></div>
 </div>
+
+<button prevtab class="crm-button" type= "button" ng-click= "setwatchVariable()"><span>Previous</span></button>
+<button nexttab class="crm-button" type= "button" ng-click = "save_next_page2()" ><span>Next</span></button>
+<button class="crm-button" ng-click="save()" type="submit"><span>Save and Continue Later</span></button>
+<button class="crm-button" ng-click="back()" ><span>Cancel</span></button>
+    </div>
+  </form>
\ No newline at end of file
diff --git a/partials/crmMailingType/main.html b/partials/crmMailingType/main.html
index 346d6df8d1..0fba3ce902 100644
--- a/partials/crmMailingType/main.html
+++ b/partials/crmMailingType/main.html
@@ -2,49 +2,24 @@
 Controller: MailCtrl
 Submit Mailing is not functional yet
 -->
-<style>
-	.crm-container .ng-invalid {
-		border: 1px solid black;
-	}
-</style>
 
-<form name="mailing_form" novalidate ng-submit="mailingForm()">
-	<div ui-jq="tabs" id="alltabs">
+
+	<div ui-jq="tabs" id="alltabs" class="crmMailingTabs">
 		<ul>
-			<li><a href="#acttab-0" ng-click= "recclicked()">Recipients</a></li>
-			<li><a href="#acttab-1" ng-click= "conclicked()">Content</a></li>
-			<li><a href="#acttab-2" ng-click= "schedclicked()">Schedule and Send</a></li>
+			<li><a href="#tab-0" ng-click= "recclicked()">Recipients</a></li>
+			<li><a href="#tab-1" ng-click= "conclicked()">Content</a></li>
+			<li><a href="#tab-2" ng-click= "schedclicked()">Schedule and Send</a></li>
 		</ul>
 
-
-		<div id="acttab-0">
+		<div id="tab-0">
 			<div ng-include="partialUrl('recipient.html')"></div>
-			<button nexttab class="crm-button" ng-click="save_next_page1()" type= "button"><span>Next</span></button>
-			<button class="crm-button" ng-click="save_page1()" type= "submit"><span>Save and Continue Later</span></button>
-			<button class="crm-button" ng-click="back()"><span>Cancel</span></button>
-			<br><br>
 		</div>
 
-		<div id="acttab-1">
+		<div id="tab-1">
 			<div ng-include="partialUrl('content.html')"></div>
-			<br>
-			<button prevtab class="crm-button" type= "button" ng-click= "setwatchVariable()"><span>Previous</span></button>
-			<button nexttab class="crm-button" type= "button" ng-click = "save_next_page2()" ><span>Next</span></button>
-			<button class="crm-button" ng-click="save()" type="submit"><span>Save and Continue Later</span></button>
-			<button class="crm-button" ng-click="back()" ><span>Cancel</span></button>
-			<br><br>
 		</div>
 
-		<div id="acttab-2">
+		<div id="tab-2">
 			<div ng-include="partialUrl('send.html')"></div>
-			<br>
-			<button class="crm-button" prevtab type="button" ><span>Previous</span></button>
-			<button class="crm-button" ng-click="save()" type= "submit"><span>Save and Continue Later</span></button>
-			<button class="crm-button" ng-click="submitButton()" type= "submit"> <span>Submit Mailing</span></button>
-			<button class="crm-button" ng-click="back()" ><span>Cancel</span></button>
-			<br><br>
 		</div>
 	</div>
-</form>
-<!--   <button class="crm-button" ng-click="save()" ng-disabled="mailing_form.$invalid" type= "submit"><span>Save and Continue Later</span></button>
--->
diff --git a/partials/crmMailingType/recipient.html b/partials/crmMailingType/recipient.html
index d29f1deef0..feb53fffec 100644
--- a/partials/crmMailingType/recipient.html
+++ b/partials/crmMailingType/recipient.html
@@ -4,6 +4,8 @@ Required vars: currentMailing
 Remove duplicates not functional
 -->
 
+<form name="editMailingFormStep1" unsaved-warning-form>
+  <div class="crm-block crm-form-block crmMailing">
 <br>
 <table class="form-layout-compressed">
 	<tbody>
@@ -13,11 +15,6 @@ Remove duplicates not functional
 			<input placeholder="New Mail" name = "name" type="text" required ng-model="currentMailing.name"/>
 		</td>
 	</tr>
-	<tr>
-		<td class="label"  style= "color:red" ng-show="mailing_form.name.$invalid">
-			Your name is required.
-		</td>
-	</tr>
 	<tr>
 		<td class="label">Campaign</td>
 		<td class="addRow">
@@ -42,5 +39,10 @@ Remove duplicates not functional
 </div>
 
 
-<br> 
- 
+<br>
+
+<button nexttab class="crm-button" ng-click="save_next_page1()" type= "button"><span>Next</span></button>
+<button class="crm-button" ng-click="save_page1()" type= "submit"><span>Save and Continue Later</span></button>
+<button class="crm-button" ng-click="back()"><span>Cancel</span></button>
+</div>
+</form>
\ No newline at end of file
diff --git a/partials/crmMailingType/send.html b/partials/crmMailingType/send.html
index 76b8e33ca5..c3b5616624 100644
--- a/partials/crmMailingType/send.html
+++ b/partials/crmMailingType/send.html
@@ -1,6 +1,8 @@
 <!--
 Controller: MailCtrl
 -->
+<form name="editMailingFormStep3" unsaved-warning-form>
+  <div class="crm-block crm-form-block crmMailing">
 <br>
 <h3 style="background-color: #5d677b; color: #f5f6f1;border-radius: 4px; background-image: url('../../sites/all/modules/civicrm/i/TreePlusWhite.gif'); background-repeat: no-repeat; padding: 4px 8px 4px 20px; background-position: 2px center; cursor: pointer; font-weight: normal; font-family: Georgia; font-size: 1em; line-height: 135%;" ng-click="preview_update()">Preview</h3>
 <div id="prevmail" ng-show = "pre">
@@ -37,3 +39,12 @@ Controller: MailCtrl
 	<div class="crm-accordion-header">Schedule and Send</div>
 	<div class="crm-accordion-body" ng-include="partialUrl('sched.html')"></div>
 </div>
+
+<br>
+<button class="crm-button" prevtab type="button" ><span>Previous</span></button>
+<button class="crm-button" ng-click="save()" type= "submit"><span>Save and Continue Later</span></button>
+<button class="crm-button" ng-click="submitButton()" type= "submit"> <span>Submit Mailing</span></button>
+<button class="crm-button" ng-click="back()" ><span>Cancel</span></button>
+<br><br>
+    </div>
+  </form>
\ No newline at end of file
-- 
2.25.1