Merge lp:~joey/linaro-wordpress-registration-form/lce12updatesv2 into lp:linaro-wordpress-registration-form

[Joey Stanford]

Several changes requested by Arwen to customize the form. Mostly textual changes but there are some form changes around travel details.

[James Tunnicliffe (dooferlad)]

Looks fine to me.

review: Approve

=== modified file 'linaro_connect.php'
--- linaro_connect.php	2012-08-02 15:44:09 +0000
+++ linaro_connect.php	2012-08-07 17:08:23 +0000
@@ -17,7 +17,7 @@
 
 Greetings from Linaro Connect!
 
-Congratulations on registering LCE12 at the Bella Center, Copenhagen, 
+Congratulations on registering for LCE12 at the Bella Center, Copenhagen, 
 - where you can expect another great week of planning,
 discussing and hacking the future of Linux on ARM.
 
@@ -208,7 +208,7 @@
         "  JOIN wp_em_locations ".
         "    ON wp_em_events.location_id = wp_em_locations.location_id ".
         "  WHERE event_end_date >= CURRENT_DATE AND ".
-        "        event_name LIKE \"%Linaro Connect%\" ".
+        "        event_name LIKE \"%lce12%\" ".
         "  ORDER BY event_end_date LIMIT 1");
   }
 
@@ -223,7 +223,7 @@
         "    ON wp_em_events.location_id = wp_em_locations.location_id ".
         "  JOIN wp_connect_attendees ".
         "    ON wp_em_events.event_id = wp_connect_attendees.event_id ".
-        "  WHERE event_name LIKE \"%Linaro Connect%\" AND ".
+        "  WHERE event_name LIKE \"%lce12%\" AND ".
         "        wp_em_events.event_id != $current_id ".
         "  HAVING COUNT(wp_connect_attendees.user_id) > 0 ".
         "  ORDER BY event_end_date DESC");
@@ -346,9 +346,11 @@
     $destination_country = $countries[$event->location_country];
 
     return <<<EOT
-      <div><label for="visa_status">Do you need a new visa to enter $destination_country?*</label></div>
+      <div><label for="visa_status">Visa: Business invitation letter *</label></div>
       <div>{$visa}</div>
-
+        <div>
+           <p>(Do you require an invitation letter to apply for a travel visa?).</p>
+        </div>
       <div id="visa_details" class="section {$css_class}">
         <div>
            It is essential you make sure the following information is precise and
@@ -401,58 +403,20 @@
   static function getTravelFields($data) {
     return <<<EOT
       <div id="travel_details">
-        <div><label>Arrival &amp; Departure Details:*</label></div>
-        <table>
-          <thead><tr>
-            <th><label for="flight_arrival">Arrival flight number</label></th>
-            <th><label for="check_in">Date</label></th>
-            <th><label for="check_in_time">Approx time (HH:MM)</label></th>
-          </thead></tr>
-          <tr>
-            <td><input name="flight_arrival" type="text" id="flight_arrival"
-                       value="{$data[flight_arrival]}" /></td>
-            <td><input name="check_in" type="text" id="check_in"
-                       value="{$data[check_in]}" class="date"/></td>
-            <td><input name="check_in_time" type="text" id="check_in_time"
-                       value="{$data[check_in_time]}" class="time"/></td>
-          </tr>
-          <thead><tr>
-            <th><label for="flight_departure">Departure flight number</label></th>
-            <th><label for="check_out">Date</label></th>
-            <th><label for="check_out_time">Approx time (HH:MM)</label></th>
-          </thead></tr>
-          <tr>
-            <td><input name="flight_departure" type="text" id="flight_departure"
-                       value="{$data[flight_departure]}" /></td>
-            <td><input name="check_out" type="text" id="check_out"
-                       value="{$data[check_out]}" class="date"/></td>
-            <td><input name="check_out_time" type="text" id="check_out_time"
-                       value="{$data[check_out_time]}" class="time"/></td>
-          </tr>
-        </table>
-        <div><label>Conference Attendance Details:*</label></div>
-        <table>
-          <thead><tr>
-            <th><label for="attendance_from_date">Start Date</label></th>
-            <th><label for="attendance_from_time">Time</label></th>
-            <th><label for="attendance_to_date">End Date</label></th>
-            <th><label for="attendance_to_time">Time</label></th>
-          </thead></tr>
-          <tr>
-            <td><input name="attendance_from_date" type="text"
-                       id="attendance_from_date"
-                       value="{$data[attendance_from_date]}" class="date"/></td>
-            <td><input name="attendance_from_time" type="text"
-                       id="attendance_from_time"
-                       value="{$data[attendance_from_time]}" class="time"/></td>
-            <td><input name="attendance_to_date" type="text"
-                       id="attendance_to_date"
-                       value="{$data[attendance_to_date]}" class="date"/></td>
-            <td><input name="attendance_to_time" type="text"
-                       id="attendance_to_time"
-                       value="{$data[attendance_to_time]}" class="time"/></td>
-          </tr>
-        </table>
+        <div><label>Conference attendance arrival date *</label></div>
+        <div><p>Mon 29 Oct - Fri 2 Nov</p></div>
+        <div>
+          <input name="attendance_from_date" type="text"
+                      id="attendance_from_date"
+                      value="{$data[attendance_from_date]}" class="date"/>
+        </div>
+        <div><label for="visa_passport_expiry">Conference attendance departure date *</label></div>
+        <div><p>Mon 29 Oct - Fri 2 Nov</p></div>
+        <div>
+          <input name="attendance_to_date" type="text"
+                      id="attendance_to_date"
+                      value="{$data[attendance_to_date]}" class="date"/>
+        </div>
       </div>
 EOT;
   }
@@ -577,8 +541,8 @@
         important you complete registration as soon as possible as these details
         help Linaro organise a successful event.</p>
 
-        <p>When you are ready to complete your registration, click the Register 
-        Now button on the <a href=\"http://connect.linaro.org/\">LCE12
+        <p>When you are ready to complete your registration, click the Register Now 
+        button on the <a href=\"http://connect.linaro.org/\">LCE12
         website</a>.</p>";
       self::emailSaved($registration, $user, $event);
       return str_replace(self::form_tag, $warn, $text);
@@ -628,7 +592,7 @@
         <div><label for="first_name">First name:*</label></div>
         <div><input name="first_name" type="text" id="first_name"
                     value="{$data[first_name]}" /></div>
-        <div><label for="last_name">Last name:*</label></div>
+        <div><label for="last_name">Family name:*</label></div>
         <div><input name="last_name" type="text" id="last_name"
                     value="{$data[last_name]}" /></div>
         <div><label for="email">Email:*</label></div>
@@ -638,13 +602,13 @@
            <p>This email will be used to provide event details.
              We will not pass your email on to any third parties.</p>
         </div>
-        <div><label for="lp_name">Launchpad user name:*</label></div>
+        <div><label for="lp_name">Launchpad ID:*</label></div>
         <div><input name="lp_name" type="text" id="lp_name" readonly="readonly"
                     value="{$data[lp_name]}" disabled="disabled"/></div>
         <div><label for="irc_name">IRC Nickname:*</label></div>
         <div><input name="irc_name" type="text" id="irc_nickname"
                     value="{$data[irc_name]}"/></div>
-        <div><label for="phone">Phone:</label></div>
+        <div><label for="phone">MObile Phone Number:</label></div>
         <div><input name="phone" type="text" id="phone"
                     value="{$data[phone]}" /></div>
         <div><label for="company_select">Company:*</label></div>
@@ -655,18 +619,18 @@
         <div><label for="job_title">Job Title:*</label></div>
         <div><input name="job_title" type="text" id="job_title"
                     value="{$data[job_title]}" /></div>
-        <div><label for="linaro_team">Linaro Engineering team:*</label></div>
+        <div><label for="linaro_team">Linaro team:*</label></div>
         <div>{$team}</div>
-        <div><label for="attendance_type">Attending:*</label></div>
+        <div><label for="attendance_type">Attendance type:*</label></div>
         <div>{$attendance}</div>
         <div id="attendance_details" class="{$attendance_css_class}">
-        <div><label for="dietary">Dietary requirements:</label></div>
+        <div><label for="dietary">Special dietary requirements:</label></div>
         <div><input name="dietary" type="text" id="dietary"
                     value="{$data[dietary]}" /></div>
         {$visa}
         {$travel}
         </div>
-        <div><label for="comments">Comments:</label></div>
+        <div><label for="comments">Additional comments:</label></div>
         <div>
           <textarea name="comments" id="comments">{$data[comments]}</textarea>
         </div>
@@ -774,13 +738,12 @@
 
   /* Ensures required fields are present. */
   static function validateRequiredData($values) {
-    $required = array('first_name', 'last_name', 'irc_name', 'email', 'company',
+    $required = array('first_name', 'last_name', 'irc_name', 'email', 'phone', 'company',
                       'linaro_team', 'attendance_type', 'visa_status', 'job_title');
     $visa_required = array('visa_country', 'visa_address', 'visa_embassy_address',
                            'visa_travel_start', 'visa_travel_end',
                            'visa_passport_number', 'visa_passport_expiry');
-    $attending_required = array('check_in', 'check_in_time',
-                                'check_out', 'check_out_time');
+    $attending_required = array();
     $missing = array();
     foreach ($required as $key) {
       if (!isset($values[$key]) or trim($values[$key])==='' or $values[$key]===NULL) {