Diff
Modified: trunk/Websites/bugs.webkit.org/template/en/default/attachment/create.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/create.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/create.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -131,6 +131,9 @@
[% END %]
[% Hook.process('form_before_submit') %]
+[%# if WEBKIT_CHANGES %]
+[% PROCESS attachment/patchlegalese.html.tmpl product = bug.product %]
+[%# endif // WEBKIT_CHANGES %]
<tr>
<th> </th>
Modified: trunk/Websites/bugs.webkit.org/template/en/default/attachment/created.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/created.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/created.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -33,8 +33,10 @@
<dl>
<dt>
+[%# if WEBKIT_CHANGES %]
<a title="[% attachment.description FILTER html %]"
- href="" attachment.id %]&action="" #[% attachment.id %]</a>
+ href="" attachment.id %]&action="" #[% attachment.id %]</a>
+[%# endif // WEBKIT_CHANGES %]
to [% "$terms.bug $attachment.bug_id" FILTER bug_link(attachment.bug_id) FILTER none %] created
</dt>
<dd>
@@ -50,7 +52,9 @@
<b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
<em>[% attachment.contenttype FILTER html %]</em> for this attachment. If this is
incorrect, correct the value by editing the attachment's
- <a href="" attachment.id %]&action=""
+[%# if WEBKIT_CHANGES %]
+ <a href="" attachment.id %]&action=""
+[%# endif // WEBKIT_CHANGES %]
</p>
[% END %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/attachment/createformcontents.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/createformcontents.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/createformcontents.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -91,10 +91,18 @@
[% END %]
</td>
</tr>
+[%# if WEBKIT_CHANGES %]
+[% USE CGI %]
+[% cgi_product = CGI.param('product') %]
+[% PROCESS attachment/patchlegalese.html.tmpl product = cgi_product %]
+[%# endif // WEBKIT_CHANGES %]
[% BLOCK content_types %]
+[%# WEBKIT_CHANGES: Added XHTML source and SVG image. %]
[% mimetypes = [{type => "text/plain", desc => "plain text"},
{type => "text/html", desc => "HTML source"},
+ {type => "application/xhtml+xml", desc => "XHTML source"},
+ {type => "image/svg+xml", desc => "SVG image"},
{type => "application/xml", desc => "XML source"},
{type => "image/gif", desc => "GIF image"},
{type => "image/jpeg", desc => "JPEG image"},
Modified: trunk/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -223,6 +223,11 @@
document.write('<iframe id="viewDiffFrame" class="bz_default_hidden"><\/iframe>');
[% END %]
[% IF user.id %]
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch %]
+ document.write('<button type="button" id="viewPrettyPatchButton" _onclick_="viewPrettyPatch(attachment_id);">View Formatted Diff<\/button>');
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
document.write('<button type="button" id="editButton" _onclick_="editAsComment(patchviewerinstalled);">Edit Attachment As Comment<\/button>');
document.write('<button type="button" id="undoEditButton" _onclick_="undoEditAsComment(patchviewerinstalled);" class="bz_default_hidden">Undo Edit As Comment<\/button>');
document.write('<button type="button" id="redoEditButton" _onclick_="redoEditAsComment(patchviewerinstalled);" class="bz_default_hidden">Redo Edit As Comment<\/button>');
@@ -254,6 +259,18 @@
</div>
<div id="attachment_comments_and_flags">
[% IF user.id %]
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch %]
+ Bot Status:
+
+ <div class="statusBubble">
+ <iframe src="" attachment.id %]"
+ style="width: 400px; height: 40px; border: none;" scrolling="no">
+ </iframe>
+ </div>
+ <br>
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
<div id="smallCommentFrame" >
<label for="" (on the [% terms.bug %]):</label>
[% classNames = 'block' %]
@@ -292,6 +309,11 @@
<div id="attachment_actions">
<span class="label">Actions:</span>
<a href="" attachment.id %]">View</a>
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch %]
+ | <a href="" attachment.id %]&action="" Diff</a>
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
[% IF use_patchviewer %]
| <a href="" attachment.id %]&action=""
[% END %]
@@ -318,7 +340,7 @@
<script type="text/_javascript_">
<!--
YAHOO.util.Dom.removeClass( document.body, "no_javascript" );
- toggle_attachment_details_visibility( );
+ // toggle_attachment_details_visibility( ); // WEBKIT_CHANGES
-->
</script>
[% END %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -76,7 +76,11 @@
[% " bz_patch" IF attachment.ispatch %]
[% " bz_private" IF attachment.isprivate %]
[% " bz_tr_obsolete bz_default_hidden"
- IF attachment.isobsolete %]">
+ IF attachment.isobsolete %]"
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch && !attachment.isobsolete %] style="background-color: rgb(255,255,200);" [% END %]
+[%# endif // WEBKIT_CHANGES %]
+ >
<td valign="top">
[% IF attachment.datasize %]
<a href="" attachment.id %]"
@@ -135,11 +139,30 @@
[% END %]
<td valign="top">
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch && user.id %]
+ <a href="" attachment.id %]&action="" Patch</a> |
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
<a href="" attachment.id %]&action=""
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch %]
+ | <a href="" attachment.id %]&action="" Diff</a>
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
[% IF attachment.ispatch && feature_enabled('patch_viewer') %]
| <a href="" attachment.id %]&action=""
[% END %]
[% Hook.process("action") %]
+[%# if WEBKIT_CHANGES %]
+ [% IF attachment.ispatch %]
+ <div class="statusBubble">
+ <iframe src="" attachment.id %]"
+ style="width: 600px; height: 20px; border: none;" scrolling="no">
+ </iframe>
+ </div>
+ [% END %]
+[%# endif // WEBKIT_CHANGES %]
</td>
</tr>
[% END %]
Copied: trunk/Websites/bugs.webkit.org/template/en/default/attachment/patchlegalese.html.tmpl (from rev 174777, trunk/Websites/bugs.webkit.org/template/en/custom/attachment/patchlegalese.html.tmpl) (0 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/patchlegalese.html.tmpl (rev 0)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/patchlegalese.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -0,0 +1,42 @@
+[%#
+ # Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met:
+ # 1. Redistributions of source code must retain the above copyright
+ # notice, this list of conditions and the following disclaimer.
+ # 2. Redistributions in binary form must reproduce the above copyright
+ # notice, this list of conditions and the following disclaimer in the
+ # documentation and/or other materials provided with the distribution.
+ #
+ # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #%]
+
+[%# if WEBKIT_CHANGES %]
+[% IF (product == "WebKit" || product == "Security") %]
+ <tr id="legal" class="expert_fields" style="display: none;">
+ <th>Legal:</th>
+ <td>
+ <b>WebKit Contribution Terms:</b><br/>
+ <br/>
+ Hello and thank you for contributing a patch. Here is our licensing policy and terms for contributing code to the WebKit project.<br/>
+ <br/>
+ <ol>
+ <li>If you are sending in a patch to existing WebKit code, you agree by clicking below that your changes are licensed under the existing license terms of the file you are modifying (i.e., BSD license or GNU Lesser General Public License v.2.1, LGPL v. 2.1). Please also add your copyright (name and year) to the relevant files for changes that are more than 10 lines of code.</li>
+ <li>If you are sending in a new file for inclusion in WebKit (no code copied from another source), the preferred license is BSD, but LGPL 2.1 is an option as well. Please include your copyright (name and year) and license preference (BSD or LGPL 2.1). By clicking below you agree that your file is licensed under either the BSD license or LGPL 2.1, as indicated in your file.</li>
+ <li>If you aren't the author of the patch, you agree to include the original copyright notices and licensing terms with it, to the extent that they exist. If there wasn't a copyright notice or license, please make a note of it. Generally we can only take in patches that are BSD- or LGPL-licensed in order to maintain license compatibility within the project.</li>
+ </ol>
+ </td>
+ </tr>
+[% END %]
+[%# endif // WEBKIT_CHANGES %]
Copied: trunk/Websites/bugs.webkit.org/template/en/default/attachment/review.html.tmpl (from rev 174777, trunk/Websites/bugs.webkit.org/template/en/custom/attachment/review.html.tmpl) (0 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/review.html.tmpl (rev 0)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/review.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -0,0 +1,31 @@
+[%# 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 <[email protected]>
+ #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Review patch #[% attachment.id %] for [% terms.Bug %] #[% attachment.bug_id %]: [% bugsummary FILTER html %]</title>
+<frameset rows="60%,40%">
+<frame id=viewFrame src="" attachment.id %]&action=""
+<frame src="" attachment.id %]&action=""
+</frameset>
+
Copied: trunk/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl (from rev 174777, trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl) (0 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl (rev 0)
+++ trunk/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -0,0 +1,129 @@
+[%# 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 <[email protected]>
+ #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+<style>
+* { font-size: small; }
+#comment { width: 100%; height: 100%; font-family: monospace; }
+#form-controls { height: 40px; }
+#form-controls td { width: 25%; text-align: center; }
+#header { display: none; }
+</style>
+
+[% _javascript_ = BLOCK %]
+ var viewing_formatted_diff = true;
+ function viewPrettyPatch()
+ {
+ viewing_formatted_diff = !viewing_formatted_diff;
+ var src = "" attachment.id %]";
+ var buttonText = "View Formatted Diff";
+ if (viewing_formatted_diff) {
+ src += "&action=""
+ buttonText = "View Plain Diff";
+ }
+
+ top.document.getElementById('viewFrame').src = ""
+ document.getElementById('viewPrettyPatchButton').innerHTML = buttonText;
+ }
+ function onSubmitComments()
+ {
+ // If someone just left the entire comment alone, then upload the form
+ // with no comment at all.
+ var textarea = document.getElementById("comment");
+ if (textarea.defaultValue === textarea.value)
+ textarea.value = "";
+ return true;
+ }
+[% END %]
+
+[% PROCESS global/header.html.tmpl
+ _javascript_ = _javascript_
+%]
+
+<form method="post" action="" target="_top" _onsubmit_="return onSubmitComments();">
+ <input type="hidden" name="id" value="[% attachment.id %]">
+ <input type="hidden" name="action" value="update">
+ <input type="hidden" name="contenttypemethod" value="manual">
+ <input type="hidden" name="delta_ts" value="[% attachment.modification_time FILTER html %]">
+ [% IF user.id %]
+ <input type="hidden" name="token" value="[% issue_hash_token([attachment.id, attachment.modification_time]) FILTER html %]">
+ [% END %]
+ <input type="hidden" name="description" value="[% attachment.description FILTER html %]">
+ <input type="hidden" name="filename" value="[% attachment.filename FILTER html %]">
+ <input type="hidden" name="contenttypeentry" value="[% attachment.contenttype FILTER html %]">
+ <input type="hidden" name="ispatch" [% IF attachment.ispatch %] value="1" [% ELSE %] value="0" [% END %] >
+ <input type="hidden" name="isobsolete" [% IF attachment.isobsolete %] value="1" [% ELSE %] value="0" [% END %] >
+ [% IF (Param("insidergroup") && user.in_group(Param("insidergroup"))) %]
+ <input type="hidden" name="isprivate" [% IF attachment.isprivate %] value="1" [% ELSE %] value="0" [% END %] >
+ [% END %]
+
+<table style="width:100%; height:90%" cellpadding=0 cellspacing=0>
+<tr id="form-controls">
+<td>
+ <button id="submitBtn" type="submit">Submit</button>
+</td>
+<td>
+ [% IF attachment.flag_types.size > 0 %]
+ [% PROCESS "flag/list.html.tmpl" attach_id = attachment.id
+ bug_id = attachment.bug_id
+ flag_types = attachment.flag_types %]<br>
+ [% END %]
+</td>
+<td>
+[% IF attachment.ispatch %]
+ <table>
+ <tr><th style="text-align: left;">Bot Status:</th></tr>
+ <tr>
+ <td>
+ <div class="statusBubble" style="margin-left: 30px;">
+ <iframe src="" attachment.id %]"
+ style="width: 400px; height: 20px; border: none;" scrolling="no">
+ </iframe>
+ </div>
+ </td>
+ </tr>
+ </table>
+[% END %]
+</td>
+<td>
+ <div>Back to <a href="" attachment.bug_id %]" target="_top">[% terms.Bug %] #[% attachment.bug_id %]</a></div>
+[% IF attachment.ispatch %]
+ <script type="text/_javascript_">
+ <!--
+ if (typeof document.getElementById == "function") {
+ document.write('<p><button type="button" id="viewPrettyPatchButton" _onclick_="viewPrettyPatch();">View Plain Diff</button></p>');
+ }
+ //-->
+ </script>
+[% END %]
+</td>
+</tr>
+<tr>
+<td colspan="4">
+Enter comments below:<br>
+<textarea id=comment name="comment" wrap="soft">
+[% quotedpatch FILTER html %]
+</textarea><br>
+
+</tr>
+</table>
+
+</form>
Modified: trunk/Websites/bugs.webkit.org/template/en/default/bug/edit.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/bug/edit.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/bug/edit.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -30,8 +30,9 @@
[% PROCESS bug/time.html.tmpl %]
-<script type="text/_javascript_">
-<!--
+ <script type="text/_javascript_">
+ <!--
+
/* Outputs a link to call replyToComment(); used to reduce HTML output */
function addReplyLink(id, real_id) {
/* XXX this should really be updated to use the DOM Core's
@@ -118,7 +119,6 @@
[% END %]
-[% IF user.id %]
/* Index all classifications so we can keep track of the classification
* for the selected product, which could control field visibility.
*/
@@ -127,10 +127,10 @@
all_classifications['[% product.name FILTER js %]'] = '
[%- product.classification.name FILTER js %]';
[%- END %]
-[% END %]
-//-->
-</script>
+ //-->
+ </script>
+
<form name="changeform" id="changeform" method="post" action=""
<input type="hidden" name="delta_ts" value="[% bug.delta_ts %]">
@@ -139,7 +139,9 @@
<input type="hidden" name="token" value="[% issue_hash_token([bug.id, bug.delta_ts]) FILTER html %]">
[% PROCESS section_title %]
- <table class="edit_form">
+[%# if WEBKIT_CHANGES %]
+ <table id="bug_details" class="edit_form">
+[%# endif // WEBKIT_CHANGES %]
<tr>
[%# 1st Column %]
<td id="bz_show_bug_column_1" class="bz_show_bug_column">
@@ -352,10 +354,14 @@
</tr>
<tr>
<td class="field_label">
- <label for=""
+[%# if WEBKIT_CHANGES %]
+ <label for=""
+[%# endif // WEBKIT_CHANGES %]
</td>
- [% PROCESS select selname => "version" %]
+[%# if WEBKIT_CHANGES %]
+ [% PROCESS select selname => "version" accesskey => "v" %]
+[%# endif // WEBKIT_CHANGES %]
</tr>
[%############%]
[%# PLATFORM #%]
@@ -374,7 +380,9 @@
no_tds = 1, value = bug.op_sys
editable = bug.check_can_change_field('op_sys', 0, 1) %]
<script type="text/_javascript_">
- assignToDefaultOnChange(['product', 'component']);
+[%# if WEBKIT_CHANGES %]
+ assignToDefaultOnChange(['product']);
+[%# endif // WEBKIT_CHANGES %]
</script>
</td>
</tr>
@@ -422,17 +430,22 @@
<tr>
<td class="field_label">
<label for="" accesskey="i">
- <b><a href=""
+[%# if WEBKIT_CHANGES %]
+ <b><a href=""
+[%# endif // WEBKIT_CHANGES %]
</td>
<td>
[% INCLUDE bug/field.html.tmpl
bug = bug, field = bug_fields.priority,
no_tds = 1, value = bug.priority
editable = bug.check_can_change_field('priority', 0, 1) %]
+[%# if WEBKIT_CHANGES %]
[%+ INCLUDE bug/field.html.tmpl
bug = bug, field = bug_fields.bug_severity,
no_tds = 1, value = bug.bug_severity
+ accesskey = 'e'
editable = bug.check_can_change_field('bug_severity', 0, 1) %]
+[%# endif // WEBKIT_CHANGES %]
[% Hook.process('after_importance', 'bug/edit.html.tmpl') %]
</td>
</tr>
@@ -442,9 +455,13 @@
<td class="field_label">
<label for=""
<a href=""
- Target Milestone</a></label>:
+[%# if WEBKIT_CHANGES %]
+ <u>T</u>arget Milestone</a></label>:
+[%# endif // WEBKIT_CHANGES %]
</td>
- [% PROCESS select selname = "target_milestone" %]
+[%# if WEBKIT_CHANGES %]
+ [% PROCESS select selname => "target_milestone" accesskey => "t" %]
+[%# endif // WEBKIT_CHANGES %]
</tr>
[% END %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/bug/field.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/bug/field.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/bug/field.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -35,6 +35,7 @@
# wrapping <td> for the field.
# bug (optional): The current Bugzilla::Bug being displayed, or a hash
# with default field values being displayed on a page.
+ # accesskey: set an accesskey attribute for this string
#%]
[% SET hidden = 0 %]
@@ -55,6 +56,9 @@
<input id="[% field.name FILTER html %]" class="text_input"
name="[% field.name FILTER html %]"
value="[% value FILTER html %]" size="40"
+[% IF accesskey %]
+ accesskey="[% accesskey FILTER html %]"
+[% END %]
maxlength="[% constants.MAX_FREETEXT_LENGTH FILTER none %]"
[% ' aria-required="true"' IF field.is_mandatory %]>
[% CASE constants.FIELD_TYPE_DATETIME %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/bug/format_comment.txt.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/bug/format_comment.txt.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/bug/format_comment.txt.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -42,7 +42,7 @@
[% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %]
Created attachment [% comment.extra_data %]
[% IF is_bugmail %]
- --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data _ "&action="" %]
+ --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data _ "&action="" %]
[% END %]
[%+ comment.attachment.description %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/bug/navigate.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/bug/navigate.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/bug/navigate.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -49,37 +49,51 @@
<a href=""
[%- last_bug_list.first FILTER uri %]&list_id=
- [%- my_search.id FILTER uri %]">First</a>
+[%# if WEBKIT_CHANGES %]
+ [%- my_search.id FILTER uri %]">|« First</a>
+[%# endif // WEBKIT_CHANGES %]
<a href=""
[%- last_bug_list.last FILTER uri %]&list_id=
- [%- my_search.id FILTER uri %]">Last</a>
+[%# if WEBKIT_CHANGES %]
+ [%- my_search.id FILTER uri %]">Last »|</a>
+[%# endif // WEBKIT_CHANGES %]
[% IF this_bug_idx > 0 %]
[% prev_bug = this_bug_idx - 1 %]
<a href=""
[%- last_bug_list.$prev_bug FILTER uri %]&list_id=
- [%- my_search.id FILTER uri %]">Prev</a>
+[%# if WEBKIT_CHANGES %]
+ [%- my_search.id FILTER uri %]">« Prev</a>
+[%# endif // WEBKIT_CHANGES %]
[% ELSE %]
- <i><font color="#777777">Prev</font></i>
+[%# if WEBKIT_CHANGES %]
+ <i><font color="#777777">« Prev</font></i>
+[%# endif // WEBKIT_CHANGES %]
[% END %]
[% IF this_bug_idx + 1 < last_bug_list.size %]
[% next_bug = this_bug_idx + 1 %]
<a href=""
[%- last_bug_list.$next_bug FILTER uri %]&list_id=
- [%- my_search.id FILTER uri %]">Next</a>
+[%# if WEBKIT_CHANGES %]
+ [%- my_search.id FILTER uri %]">Next »</a>
+[%# endif // WEBKIT_CHANGES %]
[% ELSE %]
- <i><font color="#777777">Next</font></i>
+[%# if WEBKIT_CHANGES %]
+ <i><font color="#777777">Next »</font></i>
+[%# endif // WEBKIT_CHANGES %]
[% END %]
<a href=""
[%- my_search.id FILTER uri %]">Show last search results</a>
[% ELSE %]
[%# With no list, don't show link to search results %]
- <i><font color="#777777">First</font></i>
- <i><font color="#777777">Last</font></i>
- <i><font color="#777777">Prev</font></i>
- <i><font color="#777777">Next</font></i>
+[%# if WEBKIT_CHANGES %]
+ <i><font color="#777777">|« First</font></i>
+ <i><font color="#777777">Last »|</font></i>
+ <i><font color="#777777">« Prev</font></i>
+ <i><font color="#777777">Next »</font></i>
+[%# endif // WEBKIT_CHANGES %]
<i><font color="#777777">This [% terms.bug %] is not in your last
search results.</font></i>
Modified: trunk/Websites/bugs.webkit.org/template/en/default/global/choose-product.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/global/choose-product.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/global/choose-product.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -65,6 +65,22 @@
</tr>
[% END %]
+ <!-- Custom Web Accessibility Link -->
+ <tr>
+ <th align="right" valign="top">
+ <a href=""
+ </th>
+ <td valign="top">Accessibility-related bugs for WebKit</td>
+ </tr>
+
+ <!-- Custom Web Inspector Link -->
+ <tr>
+ <th align="right" valign="top">
+ <a href=""
+ </th>
+ <td valign="top">The Web Inspector Developer Tools</td>
+ </tr>
+
<tr>
<th colspan="2"> </th>
</tr>
Modified: trunk/Websites/bugs.webkit.org/template/en/default/global/header.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/global/header.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/global/header.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -34,7 +34,7 @@
# style: string. CSS style.
# style_urls: list. List of URLs to CSS style sheets.
# message: string. A message to display to the user. May contain HTML.
- # atomlink: Atom link URL, May contain HTML
+ # rsslink: RSS link URL, May contain HTML (WEBKIT_CHANGES)
#%]
[% IF message %]
@@ -230,12 +230,14 @@
[% PROCESS format_js_link %]
[% END %]
- [%# this puts the live bookmark up on firefox for the Atom feed %]
- [% IF atomlink %]
+[%# if WEBKIT_CHANGES #%]
+ [%# this puts the live bookmark up on firefox for the RSS feed %]
+ [% IF rsslink %]
<link rel="alternate"
- type="application/atom+xml" title="Atom feed"
- href="" atomlink FILTER html %]">
+ type="application/rss+xml" title="RSS 1.0"
+ href="" rsslink FILTER html %]">
[% END %]
+[%# endif // WEBKIT_CHANGES #%]
[%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %]
<link rel="search" type="application/opensearchdescription+xml"
@@ -249,7 +251,7 @@
#%]
<body _onload_="[% onload %]"
- class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %]
+ class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %]
[% FOREACH class = bodyclasses %]
[% ' ' %][% class FILTER css_class_quote %]
[% END %] yui-skin-sam">
@@ -260,26 +262,20 @@
<div id="header">
-[% INCLUDE global/banner.html.tmpl %]
+[%# if WEBKIT_CHANGES #%]
+[%# INCLUDE global/banner.html.tmpl #%]
+[%# endif // WEBKIT_CHANGES #%]
<table border="0" cellspacing="0" cellpadding="0" id="titles">
<tr>
<td id="title">
- <p>[% terms.Bugzilla %]
- [% " – $header" IF header %]</p>
+[%# if WEBKIT_CHANGES #%]
+ <p>WebKit [% terms.Bugzilla %]
+ [%# " – $header" IF header #%]</p>
+[%# endif // WEBKIT_CHANGES #%]
</td>
- [% IF subheader %]
- <td id="subtitle">
- <p class="subheader">[% subheader %]</p>
- </td>
- [% END %]
-
- [% IF header_addl_info %]
- <td id="information">
- <p class="header_addl_info">[% header_addl_info %]</p>
- </td>
- [% END %]
+[%# WEBKIT_CHANGES: Removed subheader and header_addl_info output #%]
</tr>
</table>
@@ -301,6 +297,12 @@
[% END %]
</td></tr></table>
+[%# if WEBKIT_CHANGES #%]
+ [% IF header || subheader %]
+ <div id="bug_title">[% header %][% ": $subheader" IF subheader %]</div>
+ [% END %]
+[%# endif // WEBKIT_CHANGES #%]
+
[% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
</div> [%# header %]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/list/list.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/list/list.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/list/list.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -42,15 +42,17 @@
[%# Page Header #%]
[%############################################################################%]
+[%# if WEBKIT_CHANGES #%]
[% PROCESS global/header.html.tmpl
title = title
style = style
- atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom"
+ rsslink = "buglist.cgi?$urlquerypart&title=$title&ctype=rss"
yui = [ 'autocomplete', 'calendar' ]
_javascript__urls = [ "js/util.js", "js/field.js" ]
style_urls = [ "skins/standard/buglist.css" ]
doc_section = "query.html#list"
%]
+[%# endif // WEBKIT_CHANGES #%]
<div class="bz_query_head">
<span class="bz_query_timestamp">
@@ -205,7 +207,9 @@
[% urlquerypart FILTER html %]&ctype=csv&human=1">CSV</a> |
<a href=""
[% urlquerypart FILTER html %]&title=
- [%- title FILTER html %]&ctype=atom">Feed</a> |
+[%# if WEBKIT_CHANGES %]
+ [%- title FILTER html %]&ctype=rss">RSS</a> |
+[%# endif // WEBKIT_CHANGES %]
<a href=""
[% urlquerypart FILTER html %]&ctype=ics">iCalendar</a> |
<a href=""
Modified: trunk/Websites/bugs.webkit.org/template/en/default/request/email.txt.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/request/email.txt.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/request/email.txt.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -73,7 +73,9 @@
[% FILTER bullet = wrap(80) %]
Attachment [% attidsummary %]
[%- END %]
-[%+ urlbase %]attachment.cgi?id=[% attachment.id %]&action=""
+[%# if WEBKIT_CHANGES #%]
+[%+ urlbase %]attachment.cgi?id=[% attachment.id %]&action=""
+[%# endif // WEBKIT_CHANGES #%]
[%- END %]
[%- Hook.process('after_summary') -%]
Modified: trunk/Websites/bugs.webkit.org/template/en/default/request/queue.html.tmpl (174777 => 174778)
--- trunk/Websites/bugs.webkit.org/template/en/default/request/queue.html.tmpl 2014-10-16 16:01:24 UTC (rev 174777)
+++ trunk/Websites/bugs.webkit.org/template/en/default/request/queue.html.tmpl 2014-10-16 16:01:28 UTC (rev 174778)
@@ -243,7 +243,9 @@
[% BLOCK display_attachment %]
[% IF request.attach_id %]
- <a href="" request.attach_id %]&action=""
+[%# if WEBKIT_CHANGES #%]
+ <a href="" request.attach_id %]&action=""
+[%# endif // WEBKIT_CHANGES #%]
[% request.attach_id %]: [%+ request.attach_summary FILTER html %]</a>
[% ELSE %]
N/A
