projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b88b7a1)
Content changes in compose tab
authoraditya-nambiar <aditya.nambiar007@gmail.com>
Sat, 26 Jul 2014 04:43:54 +0000 (10:13 +0530)
committeraditya-nambiar <aditya.nambiar007@gmail.com>
Sat, 26 Jul 2014 04:51:00 +0000 (10:21 +0530)
js/angular-crmMailingAB.js patch | blob | blame | history
partials/abtesting/from_name.html patch | blob | blame | history
partials/abtesting/main.html patch | blob | blame | history
partials/abtesting/report.html [new file with mode: 0644] patch | blob
partials/abtesting/subject_lines.html patch | blob | blame | history
partials/abtesting/two_emails.html patch | blob | blame | history

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 4a3d2dc51108987e392f4face5c7329b841b6c52..130bd4ad6ec23d4d91584d8dfedff888dae9263e 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -121,6 +121,8 @@
         $scope.scheddate={};
         $scope.scheddate.date = "6";
         $scope.scheddate.time = "";
+        $scope.incGroup =[];
+        $scope.excGroup=[];
 
 
     });
@@ -212,6 +214,39 @@
                    formatSelection: format,
                    escapeMarkup: function(m) { return m; }
                });
+
+               $(element).on('select2-selecting', function(e) {
+                   var a = e.val.split(" ");
+                   var l = a.length;
+                   if(a[2]=="include")
+                   {   var str="";
+                       for(i=3; i< l; i++){
+                       str+=a[i];
+                       str+=" ";
+                       }
+                       scope.incGroup.push(str);scope.$apply();}
+
+                   else
+                   {   var str="";
+                       for(i=3; i< l; i++){
+                           str+=a[i];
+                           str+=" ";
+                       }
+
+                       scope.excGroup.push(str);scope.$apply();}
+
+               });
+               $(element).on("select2-removed", function(e) {
+                   if(e.val.split(" ")[2]=="exclude") {
+                       var index = scope.excGroup.indexOf(e.val.split(" ")[3]);
+                       scope.excGroup.splice(index, 1);
+                       scope.$apply();
+                   }
+                   else{
+                       var index = scope.incGroup.indexOf(e.val.split(" ")[3]);
+                       scope.incGroup.splice(index, 1);scope.$apply();
+                   }
+               });
            }
        };
 
diff --git a/partials/abtesting/from_name.html b/partials/abtesting/from_name.html
index e6484d8d2070a17978a310c2fb374562499e5339..303da39367ce36d969693611f2e5587fa57477a2 100644 (file)
--- a/partials/abtesting/from_name.html
+++ b/partials/abtesting/from_name.html
@@ -58,10 +58,8 @@
 
 <br>
 <div class="crm-accordion-wrapper collapsed" >
-    <div class="crm-accordion-header">Compose on Screen</div>
-    <div class="crm-accordion-body"  >
 
-        <br>
+
         <div class="crm-accordion-wrapper collapsed">
             <div class="crm-accordion-header">HTML Format</div>
             <div class="crm-accordion-body">
@@ -79,90 +77,24 @@
                 <br>
                 &nbsp &nbsp &nbsp &nbsp
                 <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
-                <br> <br>
+                <br>
             </div>
         </div>
 
-        <table>
-            <tr ng-show= "false">
-                <td>
-                    <input type="checkbox">&nbsp Save Template</input>
-            </tr>
-        </table>
-
-
-
-
-    </div>
-</div>
-<div class="crm-accordion-wrapper collapsed" ng-show='false'>
-    <div class="crm-accordion-header">Upload Content</div>
-    <div class="crm-accordion-body" >
-
-        <body>
-        <table>
-            <tr>
-                <td class="label">Upload TEXT Message</td>
-                <td>
-                    <input type="file"/>
-                </td>
-            </tr>
+        <table  ng-show= "false">
             <tr>
-                <td class="label">Upload HTML Message</td>
                 <td>
-                    <input type="file"/>
-                </td>
+                    <input type="checkbox">&nbsp Save Template</input>
             </tr>
         </table>
 
-        </body>
-    </div>
 </div>
-<div class="crm-accordion-wrapper collapsed" >
-    <div class="crm-accordion-header">Attachments</div>
-    <div class="crm-accordion-body" >
 
-        <!-- will use Controller: browse -->
-        <body>
-        <table>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file"/>
-                </td>
-                <td>
-                    <button ng-click="upload()" >Upload</button>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file_2"/>
-                </td>
-                <td>
-                    <button ng-click="upload_2()" >Upload</button>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file_3"/>
-                </td>
-                <td>
-                    <button ng-click="upload_3()" >Upload</button>
-                </td>
-            </tr>
-
-        </table>
-
-        </body>
-    </div>
-</div>
 <div class="crm-accordion-wrapper collapsed">
     <div class="crm-accordion-header">Header and Footer</div>
     <div class="crm-accordion-body" >
 
-        <br>
+
         <body>
         <table>
             <tr>
diff --git a/partials/abtesting/main.html b/partials/abtesting/main.html
index b959244576b97d563c78a165652048119373e2bd..006420f006a0a4309322fa0e161a866b4e05a70d 100644 (file)
--- a/partials/abtesting/main.html
+++ b/partials/abtesting/main.html
@@ -21,7 +21,7 @@
                 &nbsp <input type="radio" ng-model="template" ng-value="templates[0]">  Subject Lines <br/><br>
                 &nbsp <input type="radio" ng-model="template" ng-value="templates[1]"> From Names <br/><br>
                 &nbsp <input type="radio" ng-model="template" ng-value="templates[2]"> Two different Emails <br/><br>
-                &nbsp <div style="position:relative; left:200px; top: 30px;" nextbutton></div> <div style="position:relative; left:300px;" cancelbutton></div>
+                &nbsp <div style="position:relative; left:220px; top: 30px;" nextbutton></div> <div style="position:relative; left:300px; top:-1px;" cancelbutton></div>
 
 
             </form>
@@ -32,9 +32,9 @@
             <form>
             <div  ng-include="template.url">
             </div>
-                <div style="position:relative; left:200px; top:60px;" prevbutton></div>
-                <div style="position:relative; left:295px; top: 30px;" nextbutton></div>
-                <div style="position:relative; left:375px;"cancelbutton></div>
+                <div style="position:relative; left:200px; top:61px;" prevbutton></div>
+                <div style="position:relative; left:300px; top: 30px;" nextbutton></div>
+                <div style="position:relative; left:375px; top:-1px;"cancelbutton></div>
 
             </form>
         </div>
@@ -46,14 +46,14 @@
 
 
                 &nbsp<br>
-                <select multiple groupselect ng-model="incGroup">
-                    <option id= "1" ng-repeat="grp in groups" value="{{grp.id}} group include" > {{grp.title}} </option>
-                    <option ng-repeat="grp in groups" value="{{grp.id}} group exclude" > {{grp.title}} </option>
-                    <option ng-repeat="ml in mailList" value="{{ml.id}} mail include" > {{ml.name}} </option>
-                    <option ng-repeat="ml in mailList" value="{{ml.id}} mail exclude" > {{ml.name}} </option>
+                <select multiple groupselect >
+                    <option id= "1" ng-repeat="grp in groups" value="{{grp.id}} group include {{grp.title}}" > {{grp.title}} </option>
+                    <option ng-repeat="grp in groups" value="{{grp.id}} group exclude {{grp.title}}" > {{grp.title}} </option>
+                    <option ng-repeat="ml in mailList" value="{{ml.id}} mail include {{ml.title}}" > {{ml.name}} </option>
+                    <option ng-repeat="ml in mailList" value="{{ml.id}} mail exclude {{ml.title}}" > {{ml.name}} </option>
                 </select>
                 <br> <br><br><br>
-
+                {{incGroup}}<br>{{excGroup}}
 
                 <h3>Select the size of your test group</h3><br>
                 &nbsp Percentage Selected - {{slide_value}}%
@@ -95,8 +95,8 @@
 
 
                 <div style="position:relative; left:200px; top:30px;" prevbutton></div>
-                <div style="position:relative; left:295px; top: 00px;" nextbutton></div>
-                <div style="position:relative; left:375px; top: -30px;" cancelbutton></div>
+                <div style="position:relative; left:300px; top: 00px;" nextbutton></div>
+                <div style="position:relative; left:375px; top: -31px;" cancelbutton></div>
 
             </form>
         </div>
@@ -110,8 +110,12 @@
                 <td>{{template.name}}</td>
             </tr>
             <tr>
-                 <td>Groups Selected</td>
-                 <td>{{groups_selected}}</td>
+                 <td>Groups Included</td>
+                 <td>{{incGroup}}</td>
+            </tr>
+            <tr>
+                    <td>Groups Excluded</td>
+                    <td>{{excGroup}}</td>
             </tr>
             <tr>
                  <td>Size of Test Group</td>
@@ -149,7 +153,7 @@
 
             <br><br>
             <div>
-4
+
                 <div style="position:relative; left:200px; top:60px;" prevbutton></div>
                 <div class="crm-submit-buttons" style="position:relative; left:295px; top: 30px;" >
                   <div class = "crm-button crm-button-type-upload crm-button_qf_Contact_upload_view"   >
diff --git a/partials/abtesting/report.html b/partials/abtesting/report.html
new file mode 100644 (file)
index 0000000..92e5d66
--- /dev/null
+++ b/partials/abtesting/report.html
@@ -0,0 +1,10 @@
+<div>
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+
+    <hr>
+    &nbsp <input type="radio" >  Stop Test and Send Version A <br/><br>
+    &nbsp <input type="radio" >  Stop Test and Send Version B <br/><br>
+
+
+
+</div>
\ No newline at end of file
diff --git a/partials/abtesting/subject_lines.html b/partials/abtesting/subject_lines.html
index 26f9b089dc968a6d83d8851c1bb4c3c962e8b887..d1eae176a1628fe4000870c6b7ec872143d5083a 100644 (file)
--- a/partials/abtesting/subject_lines.html
+++ b/partials/abtesting/subject_lines.html
@@ -4,7 +4,7 @@
 <table class="form-layout-compressed">
     <tbody>
     <tr>
-        <td class="label">From E-mail Address </td>
+        <td class="label">From E-mail Address A</td>
         <td>
             <select style="width: 200px" ng-model="currentMailing.from_email" ng-options="frm.email as frm.email for frm in eMailing">
                 <option value="">-none-</option>
@@ -57,111 +57,43 @@
 
 <br>
 <div class="crm-accordion-wrapper collapsed" >
-    <div class="crm-accordion-header">Compose on Screen</div>
-    <div class="crm-accordion-body"  >
 
-        <br>
-        <div class="crm-accordion-wrapper collapsed">
-            <div class="crm-accordion-header">HTML Format</div>
-            <div class="crm-accordion-body">
-                <br>
-                &nbsp &nbsp &nbsp &nbsp
-                <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
-                <br> <br>
-            </div>
-        </div>
-
-        <div class="crm-accordion-wrapper collapsed">
-            <div class="crm-accordion-header">Plain Text</div>
-            <div class="crm-accordion-body" >
 
-                <br>
-                &nbsp &nbsp &nbsp &nbsp
-                <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
-                <br> <br>
-            </div>
+    <div class="crm-accordion-wrapper collapsed">
+        <div class="crm-accordion-header">HTML Format</div>
+        <div class="crm-accordion-body">
+            <br>
+            &nbsp &nbsp &nbsp &nbsp
+            <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
+            <br> <br>
         </div>
-
-        <table>
-            <tr ng-show= "false">
-                <td>
-                    <input type="checkbox">&nbsp Save Template</input>
-            </tr>
-        </table>
-
-
-
-
     </div>
-</div>
-<div class="crm-accordion-wrapper collapsed" ng-show = 'false' >
-    <div class="crm-accordion-header">Upload Content</div>
-    <div class="crm-accordion-body" >
 
-        <body>
-        <table>
-            <tr>
-                <td class="label">Upload TEXT Message</td>
-                <td>
-                    <input type="file"/>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">Upload HTML Message</td>
-                <td>
-                    <input type="file"/>
-                </td>
-            </tr>
-        </table>
+    <div class="crm-accordion-wrapper collapsed">
+        <div class="crm-accordion-header">Plain Text</div>
+        <div class="crm-accordion-body" >
 
-        </body>
+            <br>
+            &nbsp &nbsp &nbsp &nbsp
+            <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
+            <br>
+        </div>
     </div>
-</div>
-<div class="crm-accordion-wrapper collapsed" >
-    <div class="crm-accordion-header">Attachments</div>
-    <div class="crm-accordion-body" >
 
-        <!-- will use Controller: browse -->
-        <body>
-        <table>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file"/>
-                </td>
-                <td>
-                    <button ng-click="upload()" >Upload</button>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file_2"/>
-                </td>
-                <td>
-                    <button ng-click="upload_2()" >Upload</button>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">Attach Files</td>
-                <td>
-                    <input type="file" data-file="param.file_3"/>
-                </td>
-                <td>
-                    <button ng-click="upload_3()" >Upload</button>
-                </td>
-            </tr>
+    <table  ng-show= "false">
+        <tr>
+            <td>
+                <input type="checkbox">&nbsp Save Template</input>
+        </tr>
+    </table>
 
-        </table>
-
-        </body>
-    </div>
 </div>
+
 <div class="crm-accordion-wrapper collapsed">
     <div class="crm-accordion-header">Header and Footer</div>
     <div class="crm-accordion-body" >
 
-        <br>
+
         <body>
         <table>
             <tr>
diff --git a/partials/abtesting/two_emails.html b/partials/abtesting/two_emails.html
index b0c20c2f0e5192c87fe12092453c8a5ba727cfcf..43b7f168ee604b404b220165e5a52000cedb5af9 100644 (file)
--- a/partials/abtesting/two_emails.html
+++ b/partials/abtesting/two_emails.html
@@ -8,294 +8,20 @@
       </ul>
 
       <div id="tabs-21">
-          <table class="form-layout-compressed">
-              <tbody>
-              <tr>
-                  <td class="label">From E-mail Address</td>
-                  <td>
-                      <select style="width: 200px" ng-model="currentMailing.from_email" ng-options="frm.email as frm.email for frm in eMailing">
-                          <option value="">-none-</option>
-                      </select>
-                  </td>
-              </tr>
-              <tr>
-                  <td class="label">Reply to E-mail Address</td>
-                  <td>
-                      <select style="width: 200px" ng-model="currentMailing.replyto_email" ng-options="frm.email as frm.email for frm in eMailing">
-                          <option value="">-none-</option>
-                      </select>
-                  </td>
-              </tr>
-              <tr>
-                  <td class="label">Mailing Subject</td>
-                  <td>
-                      <input placeholder="Enter Subject"  name="subject" type="text" ng-model="currentMailing.subject"/>
-                  </td>
-              </tr>
-              <tr>
-                  <td class="label" style= "color:red" ng-show="mailing_form.subject.$invalid">
-                      Mailing subject required.
-                  </td>
-              </tr>
-              <tr>
-                  <td class="label">Use Template</td>
-                  <td>
-                      <select ng-change="tmp(tst)" ng-model="tst" ng-options= "mstemp.id as mstemp.msg_title for mstemp in tmpList">
-                          <option value="">-none-</option>
-                      </select>
-                  </td>
-              </tr>
-              <tr ng-show= "false">
-                  <td class="label">I want to</td>
-                  <td class="label">Compose on screen</td>
-                  <td><input type="radio" ng-model="composeS" value="1" /></td>
-                  <td class="label">Upload Content</td>
-                  <td><input type="radio" ng-model="composeS" value="0" /></td>
-              </tr>
-              </tbody>
-          </table>
-
-          <br>
-          <div class="crm-accordion-wrapper collapsed" >
-              <div class="crm-accordion-header">Compose on Screen</div>
-              <div class="crm-accordion-body"  >
-
-                  <br>
-                  <div class="crm-accordion-wrapper collapsed">
-                      <div class="crm-accordion-header">HTML Format</div>
-                      <div class="crm-accordion-body">
-                          <br>
-                          &nbsp &nbsp &nbsp &nbsp
-                          <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
-                          <br> <br>
-                      </div>
-                  </div>
-
-                  <div class="crm-accordion-wrapper collapsed">
-                      <div class="crm-accordion-header">Plain Text</div>
-                      <div class="crm-accordion-body" >
-
-                          <br>
-                          &nbsp &nbsp &nbsp &nbsp
-                          <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
-                          <br> <br>
-                      </div>
-                  </div>
-
-                  <table>
-                      <tr ng-show= "false">
-                          <td>
-                              <input type="checkbox">&nbsp Save Template</input>
-                      </tr>
-                  </table>
-
-
-
-
-              </div>
-          </div>
-          <div class="crm-accordion-wrapper collapsed" ng-show="false">
-              <div class="crm-accordion-header">Upload Content</div>
-              <div class="crm-accordion-body" >
 
-                  <body>
-                  <table>
-                      <tr>
-                          <td class="label">Upload TEXT Message</td>
-                          <td>
-                              <input type="file"/>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="label">Upload HTML Message</td>
-                          <td>
-                              <input type="file"/>
-                          </td>
-                      </tr>
-                  </table>
-
-                  </body>
-              </div>
-          </div>
-          <div class="crm-accordion-wrapper collapsed" >
-              <div class="crm-accordion-header">Attachments</div>
-              <div class="crm-accordion-body" >
-
-                  <!-- will use Controller: browse -->
-                  <body>
-                  <table>
-                      <tr>
-                          <td class="label">Attach Files</td>
-                          <td>
-                              <input type="file" data-file="param.file"/>
-                          </td>
-                          <td>
-                              <button ng-click="upload()" >Upload</button>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="label">Attach Files</td>
-                          <td>
-                              <input type="file" data-file="param.file_2"/>
-                          </td>
-                          <td>
-                              <button ng-click="upload_2()" >Upload</button>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="label">Attach Files</td>
-                          <td>
-                              <input type="file" data-file="param.file_3"/>
-                          </td>
-                          <td>
-                              <button ng-click="upload_3()" >Upload</button>
-                          </td>
-                      </tr>
-
-                  </table>
-
-                  </body>
-              </div>
-          </div>
-          <div class="crm-accordion-wrapper collapsed">
-              <div class="crm-accordion-header">Header and Footer</div>
-              <div class="crm-accordion-body" >
+      <div>
 
-                  <br>
-                  <body>
-                  <table>
-                      <tr>
-                          <td class="label">Mailing Header</td>
-                          <td>
-                              <select ng-model="currentMailing.header_id" ng-options="hf.id as hf.name for hf in headerfooter| filter:isHeader">
-                                  <option value="">-none-</option>
-                              </select>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="label">Mailing Footer</td>
-                          <td>
-                              <select ng-model="currentMailing.footer_id" ng-options="f.id as f.name for f in headerfooter| filter:isFooter">
-                                  <option value="">-none-</option>
-                              </select>
-                          </td>
-                      </tr>
-                  </table>
-                  </body>
-              </div>
-          </div>
-          <div class="crm-accordion-wrapper collapsed">
-              <div class="crm-accordion-header">Track and Respond</div>
-              <div class="crm-accordion-body" >
-
-                  <table class="form-layout-compressed">
-                      <tbody>
-                      <tr>
-                          <td>
-                              <h3 style ="text-decoration:underline"> Tracking</h3>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <input type="checkbox" ng-model="currentMailing.url_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Click Throughs</input>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <div id="help">
-                                  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 automaticallly re-written to route through your CiviCRM server prior to redirecting to the target page.
-                              </div>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <input type="checkbox" ng-model="currentMailing.open_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Opens</input>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <div id="help">
-                                  Track the number of times recipients open this mailing in their email software.
-                              </div>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <h3 style ="text-decoration:underline">Responding</h3>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <input type="checkbox" ng-model="trackreplies" ng-change= "reply()" ng-true-value="1" ng-false-value="0">&nbsp Track Replies</input>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <div id="help">
-                                  Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.
-                              </div>
-                          </td>
-                      </tr>
-                      <tr ng-show= "trackr(trackreplies)">
-                          <td>
-                              <input type="checkbox" ng-model="currentMailing.forward_replies" ng-true-value="1" ng-false-value="0">&nbsp Forward Replies</input>
-                          </td>
-                      </tr>
-                      <tr ng-show= "trackr(trackreplies)">
-                          <td>
-                              <div id="help">
-                                  If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.
-                              </div>
-                          </td>
-                      </tr>
-                      <tr ng-show= "trackr(trackreplies)">
-                          <td>
-                              <input type="checkbox" ng-model="currentMailing.auto_responder" ng-true-value="1" ng-false-value="0">&nbsp Auto-Respond to Replies &nbsp &nbsp</input>
-                              <select ng-model="mailAutoResponder" ng-options="au.id as au.name for au in headerfooter| filter:isAuto">
-                                  <option value="">-none-</option>
-                              </select>
-                          </td>
-                      </tr>
-                      <tr ng-show= "trackr(trackreplies)">
-                          <td>
-                              <div id="help">
-                                  If a recipient replies to this mailing, send an automated reply using the selected message.
-                              </div>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td>
-                              <h3 style ="text-decoration:underline"> Online Publication</h3>
-                          </td>
-                      </tr>
-                  </table>
-
-                  <table class="form-layout-compressed">
-                      <tr>
-                          <td class="label">Mailing Visibility</td>
-                          <td>
-                              <select ng-model="currentMailing.visibility">
-                                  <option value="Public Pages">Public Pages</option>
-                                  <option value="User and User Admin Only">User and User Admin Only</option>
-                              </select>
-                          </td>
-                          </tbody>
-                  </table>
-              </div>
-          </div>
-
-      </div>
-      <div id="tabs-22">
       <table class="form-layout-compressed">
           <tbody>
           <tr>
-              <td class="label">From E-mail Address</td>
+              <td class="label">From E-mail Address A</td>
               <td>
                   <select style="width: 200px" ng-model="currentMailing.from_email" ng-options="frm.email as frm.email for frm in eMailing">
                       <option value="">-none-</option>
                   </select>
               </td>
           </tr>
+
           <tr>
               <td class="label">Reply to E-mail Address</td>
               <td>
@@ -310,6 +36,7 @@
                   <input placeholder="Enter Subject"  name="subject" type="text" ng-model="currentMailing.subject"/>
               </td>
           </tr>
+
           <tr>
               <td class="label" style= "color:red" ng-show="mailing_form.subject.$invalid">
                   Mailing subject required.
@@ -335,111 +62,43 @@
 
       <br>
       <div class="crm-accordion-wrapper collapsed" >
-          <div class="crm-accordion-header">Compose on Screen</div>
-          <div class="crm-accordion-body"  >
-
-              <br>
-              <div class="crm-accordion-wrapper collapsed">
-                  <div class="crm-accordion-header">HTML Format</div>
-                  <div class="crm-accordion-body">
-                      <br>
-                      &nbsp &nbsp &nbsp &nbsp
-                      <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
-                      <br> <br>
-                  </div>
-              </div>
 
-              <div class="crm-accordion-wrapper collapsed">
-                  <div class="crm-accordion-header">Plain Text</div>
-                  <div class="crm-accordion-body" >
 
-                      <br>
-                      &nbsp &nbsp &nbsp &nbsp
-                      <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
-                      <br> <br>
-                  </div>
+          <div class="crm-accordion-wrapper collapsed">
+              <div class="crm-accordion-header">HTML Format</div>
+              <div class="crm-accordion-body">
+                  <br>
+                  &nbsp &nbsp &nbsp &nbsp
+                  <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
+                  <br> <br>
               </div>
-
-              <table>
-                  <tr ng-show= "false">
-                      <td>
-                          <input type="checkbox">&nbsp Save Template</input>
-                  </tr>
-              </table>
-
-
-
-
           </div>
-      </div>
-      <div class="crm-accordion-wrapper collapsed" >
-          <div class="crm-accordion-header">Upload Content</div>
-          <div class="crm-accordion-body" >
 
-              <body>
-              <table>
-                  <tr>
-                      <td class="label">Upload TEXT Message</td>
-                      <td>
-                          <input type="file"/>
-                      </td>
-                  </tr>
-                  <tr>
-                      <td class="label">Upload HTML Message</td>
-                      <td>
-                          <input type="file"/>
-                      </td>
-                  </tr>
-              </table>
+          <div class="crm-accordion-wrapper collapsed">
+              <div class="crm-accordion-header">Plain Text</div>
+              <div class="crm-accordion-body" >
 
-              </body>
+                  <br>
+                  &nbsp &nbsp &nbsp &nbsp
+                  <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
+                  <br>
+              </div>
           </div>
-      </div>
-      <div class="crm-accordion-wrapper collapsed" >
-          <div class="crm-accordion-header">Attachments</div>
-          <div class="crm-accordion-body" >
-
-              <!-- will use Controller: browse -->
-              <body>
-              <table>
-                  <tr>
-                      <td class="label">Attach Files</td>
-                      <td>
-                          <input type="file" data-file="param.file"/>
-                      </td>
-                      <td>
-                          <button ng-click="upload()" >Upload</button>
-                      </td>
-                  </tr>
-                  <tr>
-                      <td class="label">Attach Files</td>
-                      <td>
-                          <input type="file" data-file="param.file_2"/>
-                      </td>
-                      <td>
-                          <button ng-click="upload_2()" >Upload</button>
-                      </td>
-                  </tr>
-                  <tr>
-                      <td class="label">Attach Files</td>
-                      <td>
-                          <input type="file" data-file="param.file_3"/>
-                      </td>
-                      <td>
-                          <button ng-click="upload_3()" >Upload</button>
-                      </td>
-                  </tr>
 
-              </table>
+          <table  ng-show= "false">
+              <tr>
+                  <td>
+                      <input type="checkbox">&nbsp Save Template</input>
+              </tr>
+          </table>
 
-              </body>
-          </div>
       </div>
+
       <div class="crm-accordion-wrapper collapsed">
           <div class="crm-accordion-header">Header and Footer</div>
           <div class="crm-accordion-body" >
 
-              <br>
+
               <body>
               <table>
                   <tr>
@@ -562,9 +221,225 @@
           </div>
       </div>
       </div>
-
+      </div>
+        <div id="tabs-22">
+
+        <div>
+
+        <table class="form-layout-compressed">
+            <tbody>
+            <tr>
+                <td class="label">From E-mail Address A</td>
+                <td>
+                    <select style="width: 200px" ng-model="currentMailing.from_email" ng-options="frm.email as frm.email for frm in eMailing">
+                        <option value="">-none-</option>
+                    </select>
+                </td>
+            </tr>
+
+            <tr>
+                <td class="label">Reply to E-mail Address</td>
+                <td>
+                    <select style="width: 200px" ng-model="currentMailing.replyto_email" ng-options="frm.email as frm.email for frm in eMailing">
+                        <option value="">-none-</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td class="label">Mailing Subject</td>
+                <td>
+                    <input placeholder="Enter Subject"  name="subject" type="text" ng-model="currentMailing.subject"/>
+                </td>
+            </tr>
+
+            <tr>
+                <td class="label" style= "color:red" ng-show="mailing_form.subject.$invalid">
+                    Mailing subject required.
+                </td>
+            </tr>
+            <tr>
+                <td class="label">Use Template</td>
+                <td>
+                    <select ng-change="tmp(tst)" ng-model="tst" ng-options= "mstemp.id as mstemp.msg_title for mstemp in tmpList">
+                        <option value="">-none-</option>
+                    </select>
+                </td>
+            </tr>
+            <tr ng-show= "false">
+                <td class="label">I want to</td>
+                <td class="label">Compose on screen</td>
+                <td><input type="radio" ng-model="composeS" value="1" /></td>
+                <td class="label">Upload Content</td>
+                <td><input type="radio" ng-model="composeS" value="0" /></td>
+            </tr>
+            </tbody>
+        </table>
+
+        <br>
+        <div class="crm-accordion-wrapper collapsed" >
+
+
+            <div class="crm-accordion-wrapper collapsed">
+                <div class="crm-accordion-header">HTML Format</div>
+                <div class="crm-accordion-body">
+                    <br>
+                    &nbsp &nbsp &nbsp &nbsp
+                    <textarea ng-model="currentMailing.body_html" style="width: 600px; height: 300px;"></textarea>
+                    <br> <br>
+                </div>
+            </div>
+
+            <div class="crm-accordion-wrapper collapsed">
+                <div class="crm-accordion-header">Plain Text</div>
+                <div class="crm-accordion-body" >
+
+                    <br>
+                    &nbsp &nbsp &nbsp &nbsp
+                    <textarea ng-model="currentMailing.body_text" style="width: 600px; height: 300px;"></textarea>
+                    <br>
+                </div>
+            </div>
+
+            <table  ng-show= "false">
+                <tr>
+                    <td>
+                        <input type="checkbox">&nbsp Save Template</input>
+                </tr>
+            </table>
+
+        </div>
+
+        <div class="crm-accordion-wrapper collapsed">
+            <div class="crm-accordion-header">Header and Footer</div>
+            <div class="crm-accordion-body" >
+
+
+                <body>
+                <table>
+                    <tr>
+                        <td class="label">Mailing Header</td>
+                        <td>
+                            <select ng-model="currentMailing.header_id" ng-options="hf.id as hf.name for hf in headerfooter| filter:isHeader">
+                                <option value="">-none-</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="label">Mailing Footer</td>
+                        <td>
+                            <select ng-model="currentMailing.footer_id" ng-options="f.id as f.name for f in headerfooter| filter:isFooter">
+                                <option value="">-none-</option>
+                            </select>
+                        </td>
+                    </tr>
+                </table>
+                </body>
+            </div>
+        </div>
+        <div class="crm-accordion-wrapper collapsed">
+            <div class="crm-accordion-header">Track and Respond</div>
+            <div class="crm-accordion-body" >
+
+                <table class="form-layout-compressed">
+                    <tbody>
+                    <tr>
+                        <td>
+                            <h3 style ="text-decoration:underline"> Tracking</h3>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="checkbox" ng-model="currentMailing.url_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Click Throughs</input>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div id="help">
+                                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 automaticallly re-written to route through your CiviCRM server prior to redirecting to the target page.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="checkbox" ng-model="currentMailing.open_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Opens</input>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div id="help">
+                                Track the number of times recipients open this mailing in their email software.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <h3 style ="text-decoration:underline">Responding</h3>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="checkbox" ng-model="trackreplies" ng-change= "reply()" ng-true-value="1" ng-false-value="0">&nbsp Track Replies</input>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div id="help">
+                                Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr ng-show= "trackr(trackreplies)">
+                        <td>
+                            <input type="checkbox" ng-model="currentMailing.forward_replies" ng-true-value="1" ng-false-value="0">&nbsp Forward Replies</input>
+                        </td>
+                    </tr>
+                    <tr ng-show= "trackr(trackreplies)">
+                        <td>
+                            <div id="help">
+                                If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr ng-show= "trackr(trackreplies)">
+                        <td>
+                            <input type="checkbox" ng-model="currentMailing.auto_responder" ng-true-value="1" ng-false-value="0">&nbsp Auto-Respond to Replies &nbsp &nbsp</input>
+                            <select ng-model="mailAutoResponder" ng-options="au.id as au.name for au in headerfooter| filter:isAuto">
+                                <option value="">-none-</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr ng-show= "trackr(trackreplies)">
+                        <td>
+                            <div id="help">
+                                If a recipient replies to this mailing, send an automated reply using the selected message.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <h3 style ="text-decoration:underline"> Online Publication</h3>
+                        </td>
+                    </tr>
+                </table>
+
+                <table class="form-layout-compressed">
+                    <tr>
+                        <td class="label">Mailing Visibility</td>
+                        <td>
+                            <select ng-model="currentMailing.visibility">
+                                <option value="Public Pages">Public Pages</option>
+                                <option value="User and User Admin Only">User and User Admin Only</option>
+                            </select>
+                        </td>
+                        </tbody>
+                </table>
+            </div>
+        </div>
+        </div>
+
+        </div>
   </div>
 
+</div>
 
 
-</div>
\ No newline at end of file