Bug 779472 - Changes in swag request form

2 files changed, 18 insertions, 19 deletions

diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
index 3c628b536..dba982310 100644
--- a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
@@ -32,9 +32,9 @@ Requester info:
 
 First name: [% cgi.param('firstname') %]
 Last name: [% cgi.param('lastname') %]
-Wiki user profile: [% cgi.param('wikiprofile') %]
+Profile page: [% cgi.param('profilepage') %]
 Event name: [% cgi.param('eventname') %]
-Event wiki page: [% cgi.param('wikipage') %]
+Event page: [% cgi.param('eventpage') %]
 Estimated attendance: [% cgi.param('attendance') %]
 
 Shipping details:
@@ -59,7 +59,6 @@ Swag requested:
 
 Stickers: [% IF cgi.param('stickers') %]Yes[% ELSE %]No[% END %]
 Buttons: [% IF cgi.param('buttons') %]Yes[% ELSE %]No[% END %]
-Posters: [% IF cgi.param('posters') %]Yes[% ELSE %]No[% END %]
 Lanyards: [% IF cgi.param('lanyards') %]Yes[% ELSE %]No[% END %]
 T-shirts: [% IF cgi.param('tshirts') %]Yes[% ELSE %]No[% END %]
 Roll-up banners: [% IF cgi.param('rollupbanners') %]Yes[% ELSE %]No[% END %]
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
index e5f0cadaf..cd4fb1a16 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
@@ -48,9 +48,9 @@ function validateAndSubmit() {
   var alert_text = '';
   if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
   if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
-  if(!isFilledOut('wikiprofile')) alert_text += "Please enter your wiki user profile\n";
+  if(!isFilledOut('profilepage')) alert_text += "Please enter your Mozilla Reps profile page\n";
   if(!isFilledOut('eventname')) alert_text += "Please enter your event name\n";
-  if(!isFilledOut('wikipage')) alert_text += "Please enter the event wiki page.\n";
+  if(!isFilledOut('eventpage')) alert_text += "Please enter the event page.\n";
   if(!isFilledOut('attendance')) alert_text += "Please enter the estimated attendance.\n";
   if(!isFilledOut('shiptofirstname')) alert_text += "Please enter the shipping first name\n";
   if(!isFilledOut('shiptolastname')) alert_text += "Please enter the shipping last name\n";
@@ -106,9 +106,12 @@ function validateAndSubmit() {
 </tr>
 
 <tr class="odd">
-  <td><strong>Wiki User Profile: <span style="color: red;" title="Required">*</span></strong></td>
   <td>
-    <input type="text" name="wikiprofile" id="wikiprofile" size="40">
+    <strong>Mozilla Reps Profile Page: 
+      <span style="color: red;" title="Required">*</span></strong>
+  </td>
+  <td>
+    <input type="text" name="profilepage" id="profilepage" size="40">
   </td>
 </tr>
 
@@ -120,9 +123,9 @@ function validateAndSubmit() {
 </tr>
 
 <tr class="odd">
-  <td><strong>Event Wiki Page: <span style="color: red;" title="Required">*</span></strong></td>
+  <td><strong>Event Page: <span style="color: red;" title="Required">*</span></strong></td>
   <td>
-    <input type="text" name="wikipage" id="wikipage" size="40">
+    <input type="text" name="eventpage" id="eventpage" size="40">
   </td>
 </tr>
 
@@ -206,7 +209,9 @@ function validateAndSubmit() {
 </tr>
 
 <tr class="odd">
-  <td><strong>Custom Reference (Fiscal or VAT-number, if known):</strong><br><small>(if your country requires this)</small></td>
+  <td><strong>Custom Reference<br>
+    (Fiscal or VAT-number, if known):</strong><br><small>(if your country requires this)</small>
+  </td>
   <td><input name="shiptoidrut" id="shiptoidrut" size="40"></td>
 </tr>
 
@@ -217,30 +222,25 @@ function validateAndSubmit() {
   </td>
 </tr>
 
-<tr class="even">
+<tr class="odd">
   <td><!--spacer-->&nbsp;</td>
   <td><!--spacer-->&nbsp;</td>
 </tr>
 
-<tr class="odd">
+<tr class="even">
   <td colspan="2"><strong>Swag Requested:</strong></td>
 </tr>
 
-<tr class="even">
+<tr class="odd">
   <td><strong>Stickers:</strong></td>
   <td><input type="checkbox" id="stickers" name="stickers" value="1"></td>
 </tr>
 
-<tr class="odd">
+<tr class="even">
   <td><strong>Buttons:</strong></td>
   <td><input type="checkbox" id="buttons" name="buttons" value="1"></td>
 </tr>
 
-<tr class="even">
-  <td><strong>Posters:</strong></td>
-  <td><input type="checkbox" id="posters" name="posters" value="1"></td>
-</tr>
-
 <tr class="odd">
   <td><strong>Lanyards:</strong></td>
   <td><input type="checkbox" id="lanyards" name="lanyards" value="1"></td>