Dzahn has submitted this change and it was merged. Change subject: Add warning that patches should go to Gerrit instead of Bugzilla ......................................................................
Add warning that patches should go to Gerrit instead of Bugzilla Added "Note: Patches should go into Gerrit if possible." above the checkbox asking if attachment is a patch on Bugzilla's attachment page. (changed tab to 4 spaces to match rest of the code) Bug: 42606 Change-Id: I4e5cfbed567d884a685740facd9becdd6841525c --- A template/en/custom/attachment/createformcontents.html.tmpl 1 file changed, 110 insertions(+), 0 deletions(-) Approvals: Aklapper: Looks good to me, but someone else must approve Dzahn: Verified; Looks good to me, approved diff --git a/template/en/custom/attachment/createformcontents.html.tmpl b/template/en/custom/attachment/createformcontents.html.tmpl new file mode 100644 index 0000000..0b8fb43 --- /dev/null +++ b/template/en/custom/attachment/createformcontents.html.tmpl @@ -0,0 +1,110 @@ +[%# 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 Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Myk Melez <m...@mozilla.org> + # Joel Peshkin <bugrep...@peshkin.net> + # Erik Stambaugh <e...@dasbistro.com> + # Marc Schumann <wurbl...@gmail.com> + #%] + +<tr class="attachment_data"> + <th><label for="data">File</label>:</th> + <td> + <em>Enter the path to the file on your computer</em> (or + <a id="attachment_data_controller" href="javascript:TUI_toggle_class('attachment_text_field'); + javascript:TUI_toggle_class('attachment_data')" + >paste text as attachment</a>).<br> + <input type="file" id="data" name="data" size="50" onchange="DataFieldHandler()"> + </td> +</tr> +<tr class="attachment_text_field"> + <th><label for="attach_text">File</label>:</th> + <td> + <em>Paste the text to be added as an attachment</em> (or + <a id="attachment_text_field_controller" href="javascript:TUI_toggle_class('attachment_text_field'); + javascript:TUI_toggle_class('attachment_data')" + >attach a file</a>).<br> + <textarea id="attach_text" name="attach_text" cols="80" rows="15" + onkeyup="TextFieldHandler()" onblur="TextFieldHandler()"></textarea> + </td> +</tr> +<tr> + <th class="required"><label for="description">Description</label>:</th> + <td> + <em>Describe the attachment briefly.</em><br> + <input type="text" id="description" name="description" class="required" + size="60" maxlength="200"> + </td> +</tr> +<tr[% ' class="expert_fields"' UNLESS bug.id %]> + <th>Content Type:</th> + <td> + <em>If the attachment is a patch, check the box below.</em><br> + <em>Note: Patches should go into <a href="https://gerrit.wikimedia.org/";>Gerrit</a> if possible.</em><br> + <input type="checkbox" id="ispatch" name="ispatch" value="1" + onchange="setContentTypeDisabledState(this.form);"> + <label for="ispatch">patch</label><br><br> + [%# Reset this whenever the page loads so that the JS state is up to date %] + <script type="text/javascript"> + YAHOO.util.Event.onDOMReady(function() { + bz_fireEvent(document.getElementById('ispatch'), 'change'); + }); + </script> + + <em>Otherwise, choose a method for determining the content type.</em><br> + <input type="radio" id="autodetect" + name="contenttypemethod" value="autodetect" checked="checked"> + <label for="autodetect">auto-detect</label><br> + <input type="radio" id="list" + name="contenttypemethod" value="list"> + <label for="list">select from list</label>: + <select name="contenttypeselection" id="contenttypeselection" + onchange="this.form.contenttypemethod[1].checked = true;"> + [% PROCESS content_types %] + </select><br> + <input type="radio" id="manual" + name="contenttypemethod" value="manual"> + <label for="manual">enter manually</label>: + <input type="text" name="contenttypeentry" id="contenttypeentry" + size="30" maxlength="200" + onchange="if (this.value) this.form.contenttypemethod[2].checked = true;"> + </td> +</tr> +<tr[% ' class="expert_fields"' UNLESS bug.id %]> + <td> </td> + <td> + [% IF flag_types && flag_types.size > 0 %] + [% PROCESS "flag/list.html.tmpl" %]<br> + [% END %] + </td> +</tr> + +[% BLOCK content_types %] + [% mimetypes = [{type => "text/plain", desc => "plain text"}, + {type => "text/html", desc => "HTML source"}, + {type => "application/xml", desc => "XML source"}, + {type => "image/gif", desc => "GIF image"}, + {type => "image/jpeg", desc => "JPEG image"}, + {type => "image/png", desc => "PNG image"}, + {type => "application/octet-stream", desc => "binary file"}] + %] + [% Hook.process("mimetypes", "attachment/createformcontents.html.tmpl") %] + + [% FOREACH m = mimetypes %] + <option value="[% m.type FILTER html %]">[% m.desc FILTER html %] ([% m.type FILTER html %])</option> + [% END %] +[% END %] -- To view, visit https://gerrit.wikimedia.org/r/96684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e5cfbed567d884a685740facd9becdd6841525c Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Tholam <t....@lamsinfosystem.com> Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
