Commit 436448036ff44530b3e287f77d6cf005de56be0d

Authored by Jarrett Jordaan
1 parent 0eb60618

PT-2280465: Updated Registration page of install wizard.

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
setup/wizard/steps/registration.php
@@ -90,10 +90,12 @@ class registration extends Step @@ -90,10 +90,12 @@ class registration extends Step
90 $this->temp_variables['first_name'] = $this->getPostSafe($reg['first_name']); 90 $this->temp_variables['first_name'] = $this->getPostSafe($reg['first_name']);
91 $this->temp_variables['last_name'] = $this->getPostSafe($reg['last_name']); 91 $this->temp_variables['last_name'] = $this->getPostSafe($reg['last_name']);
92 $this->temp_variables['email_address'] = $this->getPostSafe($reg['email_address']); 92 $this->temp_variables['email_address'] = $this->getPostSafe($reg['email_address']);
  93 + $this->temp_variables['reasons'] = $this->getPostSafe($reg['reasons']);;
93 $this->temp_variables['sel_country'] = $this->getPostSafe($reg['sel_country']); 94 $this->temp_variables['sel_country'] = $this->getPostSafe($reg['sel_country']);
94 $this->temp_variables['sel_industry'] = $this->getPostSafe($reg['sel_industry']); 95 $this->temp_variables['sel_industry'] = $this->getPostSafe($reg['sel_industry']);
95 $this->temp_variables['sel_organization_size'] = $this->getPostSafe($reg['sel_organization_size']); 96 $this->temp_variables['sel_organization_size'] = $this->getPostSafe($reg['sel_organization_size']);
96 $this->temp_variables['installation_guid'] = $this->getPostSafe($reg['installation_guid']); 97 $this->temp_variables['installation_guid'] = $this->getPostSafe($reg['installation_guid']);
  98 + $this->temp_variables['opt_in'] = $this->getPostSafe($reg['opt_in']);;
97 } 99 }
98 100
99 /** 101 /**
@@ -113,11 +115,13 @@ class registration extends Step @@ -113,11 +115,13 @@ class registration extends Step
113 $this->temp_variables['first_name'] = $_POST['submitted']['first_name']; 115 $this->temp_variables['first_name'] = $_POST['submitted']['first_name'];
114 $this->temp_variables['last_name'] = $_POST['submitted']['last_name']; 116 $this->temp_variables['last_name'] = $_POST['submitted']['last_name'];
115 $this->temp_variables['email_address'] = $_POST['submitted']['email_address']; 117 $this->temp_variables['email_address'] = $_POST['submitted']['email_address'];
  118 + $this->temp_variables['reasons'] = $_POST['submitted']['reasons'];
116 $this->temp_variables['sel_country'] = $_POST['submitted']['country']; 119 $this->temp_variables['sel_country'] = $_POST['submitted']['country'];
117 $this->temp_variables['sel_industry'] = $_POST['submitted']['industry']; 120 $this->temp_variables['sel_industry'] = $_POST['submitted']['industry'];
118 $this->temp_variables['sel_organization_size'] = $_POST['submitted']['organization_size']; 121 $this->temp_variables['sel_organization_size'] = $_POST['submitted']['organization_size'];
119 // System GUID, comes from session or db, not POST 122 // System GUID, comes from session or db, not POST
120 $this->temp_variables['installation_guid'] = $this->util->getSystemIdentifier(false); 123 $this->temp_variables['installation_guid'] = $this->util->getSystemIdentifier(false);
  124 + $this->temp_variables['opt_in'] = $_POST['submitted']['opt_in'];
121 } 125 }
122 126
123 /** 127 /**
setup/wizard/templates/registration.tpl
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <br/> 22 <br/>
23 <div id="step_content_<?php echo $step_name; ?>" class="step"> 23 <div id="step_content_<?php echo $step_name; ?>" class="step">
24 <span class="error" id="reg_error"></span> 24 <span class="error" id="reg_error"></span>
25 - <?php $rowspan = "6";?> 25 + <?php $rowspan = "8";?>
26 <?php if(WINDOWS_OS) $input_width = 40; else { $input_width = 28; } ?> 26 <?php if(WINDOWS_OS) $input_width = 40; else { $input_width = 28; } ?>
27 <table class="registration_template"> 27 <table class="registration_template">
28 <tr> 28 <tr>
@@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@
41 <td><input value="<?php echo $email_address; ?>" name='submitted[email_address]' id='email' size='<?php echo $input_width; ?>' style="float:left;"/></td> 41 <td><input value="<?php echo $email_address; ?>" name='submitted[email_address]' id='email' size='<?php echo $input_width; ?>' style="float:left;"/></td>
42 </tr> 42 </tr>
43 <tr> 43 <tr>
  44 + <td><label for='email'>Reasons</label></td>
  45 + <td><input value="<?php echo $reasons; ?>" name='submitted[reasons]' id='reasons' size='<?php echo $input_width; ?>' style="float:left;"/></td>
  46 + </tr>
  47 + <tr>
44 <td><label for='country'>Country</label></td> 48 <td><label for='country'>Country</label></td>
45 <td> 49 <td>
46 <select id='country' class="registration_select" name='submitted[country]'> 50 <select id='country' class="registration_select" name='submitted[country]'>
@@ -96,6 +100,11 @@ @@ -96,6 +100,11 @@
96 </select> 100 </select>
97 </td> 101 </td>
98 </tr> 102 </tr>
  103 + <tr>
  104 + <td><label for='opt_in'>Commumity updates</label></td>
  105 + <td><input type='checkbox' id="opt_in" name='opt_in' value='enable' checked style="float:right;"/></td>
  106 +
  107 + </tr>
99 </table> 108 </table>
100 <input type='hidden' name='form_id' value='webform_client_form_242' /> 109 <input type='hidden' name='form_id' value='webform_client_form_242' />
101 <input type='hidden' name='op' value='Submit' /> 110 <input type='hidden' name='op' value='Submit' />