summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-08-01 18:20:43 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-08-01 18:20:43 +0200
commita45e86a994221a2feff4cfeef8f9020671f012eb (patch)
tree5bce286f1799e443a20b3a6c357e0d16eabc7b4e
parent21d4de4902f8b2fd74679d8f3939214112e9f6e3 (diff)
downloadbugzilla-a45e86a994221a2feff4cfeef8f9020671f012eb.tar.gz
bugzilla-a45e86a994221a2feff4cfeef8f9020671f012eb.tar.xz
Bug 779475 - Changes in budget request form
-rw-r--r--extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl4
-rw-r--r--extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl22
2 files changed, 16 insertions, 10 deletions
diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
index 9486c56fe..d60f2fdde 100644
--- a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
@@ -31,8 +31,8 @@
Requester info:
Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %]
-Wiki user profile: [% cgi.param('wikiprofile') %]
-Event wiki page: [% cgi.param('wikipage') %]
+Profile page: [% cgi.param('profilepage') %]
+Event page: [% cgi.param('eventpage') %]
Advance payment needed: [% IF cgi.param('advancepayment') %]Yes[% ELSE %]No[% END %]
Budget breakdown:
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
index 685d3eaeb..0264b23c9 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
@@ -39,8 +39,8 @@ Rep team.</p>
function trySubmit() {
var firstname = document.getElementById('firstname').value;
var lastname = document.getElementById('lastname').value;
- var wikipage = document.getElementById('wikipage').value;
- var shortdesc = 'Budget Request - ' + firstname + ' ' + lastname + ' - ' + wikipage;
+ var eventpage = document.getElementById('eventpage').value;
+ var shortdesc = 'Budget Request - ' + firstname + ' ' + lastname + ' - ' + eventpage;
document.getElementById('short_desc').value = shortdesc;
return true;
}
@@ -49,8 +49,8 @@ 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 a wiki user profile.\n";
- if(!isFilledOut('wikipage')) alert_text += "Please enter a wiki page address.\n";
+ if(!isFilledOut('profilepage')) alert_text += "Please enter a Mozilla Reps profile page.\n";
+ if(!isFilledOut('eventpage')) alert_text += "Please enter a event page address.\n";
if(!isFilledOut('successmeasure')) alert_text += "Please enter how you will measure the success of the event.\n";
if(!isFilledOut('budgettotal')) alert_text += "Please enter the total budget for the event.\n";
if(!isFilledOut('service1') || !isFilledOut('cost1')) alert_text += "Please enter at least one service and cost value.\n";
@@ -112,16 +112,22 @@ function togglePaymentInfo (e) {
</tr>
<tr class="odd">
- <td><strong>Wiki user profile:<span style="color: red;">*</span></strong></td>
<td>
- <input type="text" name="wikiprofile" id="wikiprofile" value="" size="40" placeholder="JohnDoe">
+ <strong>Mozilla Reps Profile Page: <span style="color: red;">*</span></strong>
+ </td>
+ <td>
+ <input type="text" name="profilepage" id="profilepage"
+ value="" size="40" placeholder="https://reps.mozilla.org/u/JohnDoe">
</td>
</tr>
<tr class="even">
- <td><strong>Event wiki page: <span style="color: red;">*</span></strong></td>
<td>
- <input type="text" name="wikipage" id="wikipage" value="" size="40" placeholder="http://wiki.mozilla.org/JohnDoe">
+ <strong>Event Page: <span style="color: red;">*</span></strong>
+ </td>
+ <td>
+ <input type="text" name="eventpage" id="eventpage"
+ value="" size="40" placeholder="https://reps.mozilla.org/e/TestEvent">
</td>
</tr>