summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-05-23 22:09:28 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-05-23 22:09:28 +0200
commit78300b6d3094f1ea423c013e4fbd3b7312ccbccd (patch)
tree79061afbaac6c06164556ca5167334e976c91958
parentf7de2548756a72aa0d35d1b38d8f11b9232b4599 (diff)
downloadbugzilla-78300b6d3094f1ea423c013e4fbd3b7312ccbccd.tar.gz
bugzilla-78300b6d3094f1ea423c013e4fbd3b7312ccbccd.tar.xz
Bug 875464 - Air Mozilla Event (Brownbag) Request Form Obsolete
-rw-r--r--.htaccess3
-rw-r--r--extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl33
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl326
3 files changed, 2 insertions, 360 deletions
diff --git a/.htaccess b/.htaccess
index 20eb372e8..e10ae687d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -37,6 +37,7 @@ Redirect permanent /etiquette.html https://bugzilla.mozilla.org/page.cgi?id=etiq
Redirect permanent /duplicates.html https://bugzilla.mozilla.org/duplicates.cgi
RewriteEngine On
+RewriteBase /stable/
RewriteRule ^review(.*) page.cgi?id=splinter.html$1 [QSA]
RewriteRule ^favicon\.ico$ extensions/BMO/web/images/favicon.ico
RewriteRule ^form[\.:](itrequest|mozlist|poweredby|presentation|trademark|recoverykey)$ enter_bug.cgi?product=mozilla.org&format=$1
@@ -47,7 +48,7 @@ RewriteRule ^form[\.:]reps[\.:]budget$ enter_bug.cgi?product=Mozilla+Reps&format
RewriteRule ^form[\.:]reps[\.:]swag$ enter_bug.cgi?product=Mozilla+Reps&format=remo-swag
RewriteRule ^form[\.:]reps[\.:]payment$ page.cgi?id=remo-form-payment.html
RewriteRule ^form[\.:]employee[\.\-:]incident$ enter_bug.cgi?product=mozilla.org&format=employee-incident
-RewriteRule ^form[\.:]brownbag$ enter_bug.cgi?product=Air+Mozilla&format=brownbag
+RewriteRule ^form[\.:]brownbag$ https://air.mozilla.org/requests
RewriteRule ^form[\.:]finance$ enter_bug.cgi?product=Finance&format=finance
RewriteRule ^form[\.:]privacy[\.\-:]data$ enter_bug.cgi?product=Privacy&format=privacy-data
RewriteRule ^form[\.:]moz[\.\-:]project[\.\-:]review$ enter_bug.cgi?product=mozilla.org&format=moz-project-review
diff --git a/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
deleted file mode 100644
index 158c08f19..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
- #
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the BMO Bugzilla Extension.
- #
- # The Initial Developer of the Original Code is the Mozilla Foundation
- # Portions created by the Initial Developers are Copyright (C) 2011 the
- # Initial Developer. All Rights Reserved.
- #
- # Contributor(s):
- # David Lawrence <dkl@mozilla.com>
- #%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-Topic: [% cgi.param('topic') %]
-Presenter: [% cgi.param('presenter') %]
-Date: [% cgi.param('date') %]
-Time: [% cgi.param('time_hour') %]:[% cgi.param('time_minute') %][% cgi.param('ampm') +%] [%+ cgi.param('time_zone') %]
-Duration: [% IF cgi.param('duration') == 'Other' %][% cgi.param('duration_other') %][% ELSE %][% cgi.param('duration') %][% END %]
-Privacy: [% cgi.param('public') %]
-Large Screen Location: [% FOREACH location = cgi.param('large_screen_loc') %][% location FILTER html %], [% END %]
-Description:
-[%+ cgi.param('description') %]
-Special Requirements:
-[%+ cgi.param('special_requirements') %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
deleted file mode 100644
index 07c749f02..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
+++ /dev/null
@@ -1,326 +0,0 @@
-[%# 1.0@bugzilla.org %]
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
- #
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Mozilla Corporation.
- # Portions created by Mozilla are Copyright (C) 2008 Mozilla
- # Corporation. All Rights Reserved.
- #
- # Contributor(s): Reed Loden <reed@mozilla.com>
- # David Tran <dtran@mozilla.com>
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
- title = "Event Request"
- style = ".yui-skin-sam .yui-calcontainer { z-index: 1; }"
- style_urls = [ 'skins/standard/enter_bug.css' ]
- javascript_urls = [ 'js/attachment.js', 'js/field.js', 'js/util.js' ]
- yui = [ 'autocomplete', 'calendar' ]
-%]
-
-[% USE Bugzilla %]
-
-<script type="text/javascript">
-function trySubmit() {
- var timeZone = document.getElementById('time_zone').value;
- if (!timeZone) {
- alert('You must select an appropriate time zone');
- return false;
- }
- var topic = document.getElementById('topic').value;
- var date = document.getElementById('date').value;
- var time = document.getElementById('time_hour').value + ':' +
- document.getElementById('time_minute').value + ' ' + timeZone;
- var location = document.getElementById('location').value;
- var shortdesc = 'Event - (' + date + ' ' + time + ') - ' + location + ' - ' + topic;
- document.getElementById('short_desc').value = shortdesc;
-
- var public = document.getElementById('public');
- if (!public.value) {
- alert('You must select whether the event is public or not');
- return false;
- }
- if (public.value != 'The Public') {
- var brownbagRequestForm = document.getElementById('brownbagRequestForm');
- var groups = document.createElement('input');
- groups.type = 'hidden';
- groups.name = 'groups';
- groups.value = 'mozilla-corporation-confidential';
- brownbagRequestForm.appendChild(groups);
- }
-
- return true;
-}
-</script>
-
-<p>
- <strong>Event Request:</strong> Please use this form to schedule an event
- in any of the Mozilla Common Spaces.</b>
-</p>
-
-<p>Process:</p>
-
-<ol>
- <li>Complete and submit request below.</li>
- <li>Your request will be reviewed and assigned to the appropriate person in IT.</li>
-</ol>
-
-<form method="post" action="post_bug.cgi" id="brownbagRequestForm" class="enter_bug_form"
- enctype="multipart/form-data" onSubmit="return trySubmit();">
- <input type="hidden" name="format" value="brownbag">
- <input type="hidden" name="product" value="Air Mozilla">
- <input type="hidden" name="component" value="Events">
- <input type="hidden" name="rep_platform" value="All">
- <input type="hidden" name="op_sys" value="Other">
- <input type="hidden" name="priority" value="--">
- <input type="hidden" name="version" value="unspecified">
- <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
- <input type="hidden" name="comment" id="comment" value="">
- <input type="hidden" name="short_desc" id="short_desc" value="">
- <input type="hidden" name="token" value="[% token FILTER html %]">
-
-<table>
-<tr>
- <th class="field_label">
- <label for="presenter">Presenter:</label>
- </th>
- <td>
- <input type="text" name="presenter" id="presenter" value="" size="60" />
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="topic">Topic:</label>
- </th>
- <td>
- <input type="text" name="topic" id="topic" value="" size="60" />
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="date">Date:</label>
- </th>
- <td>
- <input type="text" name="date" size="10" id="date"
- align="right" value="" maxlength="10"
- onchange="updateCalendarFromField(this)">
- <button type="button" class="calendar_button" id="button_calendar_date"
- onclick="showCalendar('date')"><span>Calendar</span>
- </button>
- <div id="con_calendar_date"></div>
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="time_hour">Start Time (24 hr clock):</label>
- </th>
- <td>
- <select name="time_hour" id="time_hour">
- <option value="0">0</option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- <option value="6">6</option>
- <option value="7">7</option>
- <option value="8">8</option>
- <option value="9">9</option>
- <option value="10">10</option>
- <option value="11">11</option>
- <option value="12" selected>12</option>
- <option value="13">13</option>
- <option value="14">14</option>
- <option value="15">15</option>
- <option value="16">16</option>
- <option value="17">17</option>
- <option value="18">18</option>
- <option value="19">19</option>
- <option value="20">20</option>
- <option value="21">21</option>
- <option value="22">22</option>
- <option value="23">23</option>
- </select>:
- <select name="time_minute" id="time_minute">
- <option value="00" selected>00</option>
- <option value="15">15</option>
- <option value="30">30</option>
- <option value="45">45</option>
- </select>
- <select name="time_zone" id="time_zone">
- <option value="" selected>Select Time Zone</option>
- <option value="UTC-14">UTC-14</option>
- <option value="UTC-13">UTC-13</option>
- <option value="UTC-12">UTC-12</option>
- <option value="UTC-11">UTC-11</option>
- <option value="UTC-10">UTC-10</option>
- <option value="UTC-9">UTC-9</option>
- <option value="UTC-8">UTC-8</option>
- <option value="UTC-7">UTC-7</option>
- <option value="UTC-6">UTC-6</option>
- <option value="UTC-5">UTC-5</option>
- <option value="UTC-4">UTC-4</option>
- <option value="UTC-3">UTC-3</option>
- <option value="UTC-2">UTC-2</option>
- <option value="UTC-1">UTC-1</option>
- <option value="UTC+0">UTC+0</option>
- <option value="UTC+1">UTC+1</option>
- <option value="UTC+2">UTC+2</option>
- <option value="UTC+3">UTC+3</option>
- <option value="UTC+4">UTC+4</option>
- <option value="UTC+5">UTC+5</option>
- <option value="UTC+6">UTC+6</option>
- <option value="UTC+7">UTC+7</option>
- <option value="UTC+8">UTC+8</option>
- <option value="UTC+9">UTC+9</option>
- <option value="UTC+10">UTC+10</option>
- <option value="UTC+11">UTC+11</option>
- <option value="UTC+12">UTC+12</option>
- <option value="UTC+13">UTC+13</option>
- <option value="UTC+14">UTC+14</option>
- </select>
- <br>
- <table>
- <tr>
- <th>Summer:</th>
- <td>MTV/SFO/PDX/YVR UTC-7</td>
- <td>TOR/BOS UTC-4</td>
- <td>LON UTC+1</td>
- <td>PAR/BER UTC+2</td>
- </tr>
- <tr>
- <th>Winter:</th>
- <td>MTV/SFO/PDX/YVR UTC-8</td>
- <td>TOR/BOS UTC-3</td>
- <td>LON UTC</td>
- <td>PAR/BER UTC+1</td>
- </tr>
- </table>
- </div>
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="duration_one_hour_radio">Duration:</label>
- </th>
- <td>
- <input type="radio" name="duration" id="duration_one_hour_radio" value="1 Hour" checked="checked">
- <label for="duration_one_hour_radio">1 Hour</label><br>
- <input type="radio" name="duration" id="duration_one_day_radio" value="1 Day">
- <label for="duration_one_day_radio">1 Day</label><br>
- <input type="radio" name="duration" id="duration_other_radio" value="Other"
- onclick="YAHOO.util.Dom.get('duration_other').focus();">
- <label for="duration_other_radio">Other</label>
- <input type="text" name="duration_other" id="duration_other" value="">
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="location">Originating Location:</label>
- </th>
- <td>
- <input type="text" name="location" id="location"
- value="[% default.location || 'Ten Forward' FILTER html %]" size="60" />
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="large_screen_loc_mtv_radio">Show on large screens in<br>these Mozilla Spaces Commons:</label>
- </th>
- <td>
- <input type="checkbox" name="large_screen_loc" id="large_screen_loc_mtv_checkbox" value="MTV" checked="checked">
- <label for="large_screen_loc_mtv_checkbox">MTV</label><br>
- <input type="checkbox" name="large_screen_loc" id="large_screen_loc_sfo_checkbox" value="SFO">
- <label for="large_screen_loc_sfo_checkbox">SFO</label><br>
- <input type="checkbox" name="large_screen_loc" id="large_screen_loc_tor_checkbox" value="TOR">
- <label for="large_screen_loc_tor_checkbox">TOR</label><br>
- <input type="checkbox" name="large_screen_loc" id="large_screen_loc_lon_checkbox" value="LON">
- <label for="large_screen_loc_lon_checkbox">LON</label><br>
- </td>
-</tr>
-
-<tr>
- <th class="field_label">This event may be seen by:</th>
- <td>
- If anything other than <strong>The Public</strong> is chosen, this request will only be
- visible internally as well as the reporter and anyone designated in the CC field.<br>
- <select name="public" id="public">
- <option value="">Select One</option>
- <option value="The Public">The Public</option>
- <option value="Vouched Mozillians and MoCo/MoFo Staff">Vouched Mozillians and MoCo/MoFo Staff</option>
- <option value="MoCo/MoFo Staff Only">MoCo/MoFo Staff Only</option>
- </select>
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="cc">CC&nbsp;(optional):</label>
- </th>
- <td colspan="3">
- [% INCLUDE global/userselect.html.tmpl
- id => "cc"
- name => "cc"
- value => cc
- size => 60
- multiple => 5
- %]
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="description">Description</label>:
- </th>
- <td>
- Please describe the event the way you would in a program guide listing<br>
- <textarea id="description" name="description" rows="10" cols="80"></textarea>
- </td>
-</tr>
-
-<tr>
- <th class="field_label">
- <label for="special_requirements">Special Requirements:</label>
- </th>
- <td>
- <textarea id="special_requirements" name="special_requirements" rows="10" cols="80"></textarea>
- </td>
-</tr>
-
-<tr>
- <td></td>
- <td>
- <input type="submit" id="commit" value="Submit Request">
- </td>
-</tr>
-</table>
-
-</form>
-
-<p>
- Thanks for contacting us.
- You will be notified by email of any progress made in resolving your request.
-</p>
-
-<script type="text/javascript">
- createCalendar('date');
-</script>
-
-[% PROCESS global/footer.html.tmpl %]