Merge lp:~mhall119/awstrial/new_marketing_optin into lp:awstrial

[Michael Hall]

Go back to using separate checkboxes for usage agreement and marketing opt-in with new working from Sonia

Go back to using separate checkboxes for usage agreement and marketing opt-in with new working from Sonia

[Matthew Nuzum (newz)]

Looks good

review: Approve

=== modified file 'awstrial/templates/contacts.html'
--- awstrial/templates/contacts.html	2011-12-18 15:21:32 +0000
+++ awstrial/templates/contacts.html	2011-12-21 16:15:27 +0000
@@ -38,10 +38,13 @@
 			    2. Agree to the terms of Service
 			</p>
 			<p>
-			    <input class="checkbox"  type="checkbox" name="opt_marketing" id="opt_marketing" onClick="document.getElementById('launchbtn').disabled=(document.getElementById('launchbtn').disabled)? false : true"/>
-			    <label for="a">I will use this instance in accordance with the <a href=http://aws.amazon.com/agreement/>Amazon Web Services Customer Agreement</a>,
-			    the <a href=http://www.ubuntu.com/community/conduct>Ubuntu Code of Conduct</a>,
-			    and that Canonical may occasionally mail me information about products and services in accordance with our <a href="http://www.canonical.com/privacy">privacy policy</a>.</label><br/>
+			    <input class="checkbox"  type="checkbox" name="a" id="a" onClick="document.getElementById('launchbtn').disabled=(document.getElementById('a').checked)? false : true"/>
+			    <label for="a">I will use this instance in accordance with the <a href=http://aws.amazon.com/agreement/>Amazon Web Services Customer Agreement</a> and
+			    the <a href=http://www.ubuntu.com/community/conduct>Ubuntu Code of Conduct</a>.</label><br/>
+		        </p>
+			<p>
+			    <input class="checkbox"  type="checkbox" name="opt_marketing" id="opt_marketing" />
+			    <label for="opt_marketing">I want to receive Canonical's newsletter. My details will be handled in accordance with the Canonical <a href="http://www.canonical.com/legal">privacy policy</a>.</label><br/>
 		        </p>
 			<label for="launchbtn">3. Launch your instance.</label>
                         <p>After clicking 'Launch', your instance will start, and your hour will begin.</p>

=== modified file 'awstrial/trial/tests.py'
--- awstrial/trial/tests.py	2011-12-18 15:21:32 +0000
+++ awstrial/trial/tests.py	2011-12-21 16:15:27 +0000
@@ -201,7 +201,7 @@
     def call_run_instance(self, campaign):
         post_data = {
             'config': 'default',
-            'opt_marketing': 1,
+            'a': 1,
             'launchbtn': 'Launch',
         }
         return self.client.post('/%s/run/' % campaign.name, post_data)

=== modified file 'awstrial/trial/views.py'
--- awstrial/trial/views.py	2011-12-18 15:21:32 +0000
+++ awstrial/trial/views.py	2011-12-21 16:15:27 +0000
@@ -71,14 +71,14 @@
         # Now Check the campaign is running and has avaliability left.
         if current_campaign.remaining() and (current_campaign.active):
             if request.method == "POST":
-
-                # This is both the disclaiming and marketing opt-in checkbox
-                opt_marketing = request.POST.get('opt_marketing', '')
-                if opt_marketing:
-                    user = request.user.profile
-                    user.opt_marketing = opt_marketing
-                    user.save()
-
+                # opt_marketing = opt in for marketing mail, bool
+                user = request.user.profile
+                user.opt_marketing = request.POST.get('opt_marketing', '')
+                user.save()
+
+                # a = disclaimer box
+                a = request.POST.get('a', '')
+                if a:
                     #try:
                     region = request.POST.get('region',None)
                     if region is not None: