From 0a622fb429cfa7140fbca7c7b4c75233584c961e Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Fri, 13 Jan 2012 13:55:01 -0500 Subject: Bug 712141 - Changes to BrownBag Request Form --- .../default/bug/create/comment-brownbag.txt.tmpl | 34 ++++ .../default/bug/create/create-brownbag.html.tmpl | 186 ++++++++++++++------- 2 files changed, 156 insertions(+), 64 deletions(-) create mode 100644 extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl 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 new file mode 100644 index 000000000..d9aa35f17 --- /dev/null +++ b/extensions/BMO/template/en/default/bug/create/comment-brownbag.txt.tmpl @@ -0,0 +1,34 @@ +[%# 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 + #%] +[% 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 %] +Audience: [% cgi.param('audience') %] +Air Mozilla: [% IF cgi.param('airmozilla') %]Yes[% ELSE %]No[% END %] +Dial-in: [% IF cgi.param('dialin') %]Yes[% ELSE %]No[% END %] +Archive: [% IF cgi.param('archive') %]Yes[% ELSE %]No[% END %] +Member of IT to help with A/V: [% IF cgi.param('ithelp') %]Yes[% ELSE %]No[% END %] +Description: +[% cgi.param('description') %] 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 index 33ed80c1a..243a58945 100644 --- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl @@ -23,8 +23,8 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Corporation Brownbag Requests" - style_urls = [ 'skins/standard/attachment.css', 'skins/custom/calendar.css' ] 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' ] %] @@ -46,71 +46,58 @@ person who submitted the request and any persons designated in the CC line.

-
- - - - - - - - - - - - + + + + + + + + + + + + + - + - - + - + - + + + + + + + + + + + - + - + - + - - + + - - - + + - + - + -
Presenter: + +
Topic: + +
Date: + +
Start Time: + + :: + + +
+ + + +
+ +
+ + + +
+ + +
Intended Audience: + +
Air Mozilla Broadcasting? + +
Dial In? + +
Archive this? + +
Need IT to help run A/V? + +
CC (optional): + + [% INCLUDE global/userselect.html.tmpl id => "cc" @@ -197,23 +250,28 @@ function trySubmit() {
: + : + Please briefly describe the brownbag and any specific needs you might have.
-
+ + + + + + + -
-
-

Thanks for contacting us. - You will be notified by email of any progress made in resolving your request. - +

+ Thanks for contacting us. + You will be notified by email of any progress made in resolving your request.