<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174773] trunk/Websites/bugs.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174773">174773</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 09:01:21 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove references to Rietveld from bugs.webkit.org
Rietveld was an experiment that was added by Google. It was
never enabled for everyone, so it's safe to remove the changes
that reference it.
* Bugzilla/Flag.pm: Remove code that prevented mail messages from
being sent for patches reviewed in Rietveld.
* attachment.cgi: Remove reference to the "rietveldreview"
template.
* template/en/custom/attachment/list.html.tmpl: Remove code
that handled the Rietveld review flag.
* template/en/custom/attachment/reviewform.html.tmpl: Remove code
that handled the "rietveldReview" CGI parameter.
* template/en/custom/attachment/rietveldreview.html.tmpl: Delete.
* template/en/custom/flag/list.html.tmpl: Delete. After
removing the code to handle Rietveld reviews, there were no more
local WebKit changes to the custom template file, so it could be
removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesbugswebkitorgBugzillaFlagpm">trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm</a></li>
<li><a href="#trunkWebsitesbugswebkitorgattachmentcgi">trunk/Websites/bugs.webkit.org/attachment.cgi</a></li>
<li><a href="#trunkWebsitesbugswebkitorgtemplateencustomattachmentlisthtmltmpl">trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl</a></li>
<li><a href="#trunkWebsitesbugswebkitorgtemplateencustomattachmentreviewformhtmltmpl">trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebsitesbugswebkitorgtemplateencustomattachmentrietveldreviewhtmltmpl">trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl</a></li>
<li>trunk/Websites/bugs.webkit.org/template/en/custom/flag/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesbugswebkitorgBugzillaFlagpm"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm (174772 => 174773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm 2014-10-16 16:01:21 UTC (rev 174773)
</span><span class="lines">@@ -937,12 +937,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #if WEBKIT_CHANGES
- # Don't send a notification when the flag is in-rietveld,
- # since it isn't a user visible flag, and that mail is spammy.
- return if ($flag->type->name eq 'in-rietveld');
- #endif // WEBKIT_CHANGES
-
</del><span class="cx"> my $cc_list = $flag ? $flag->type->cc_list : $old_flag->type->cc_list;
</span><span class="cx"> # Is there someone to notify?
</span><span class="cx"> return unless ($addressee || $cc_list);
</span></span></pre></div>
<a id="trunkWebsitesbugswebkitorgattachmentcgi"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/attachment.cgi (174772 => 174773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/attachment.cgi 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/attachment.cgi 2014-10-16 16:01:21 UTC (rev 174773)
</span><span class="lines">@@ -133,10 +133,6 @@
</span><span class="cx"> {
</span><span class="cx"> edit("reviewform");
</span><span class="cx"> }
</span><del>-elsif ($action eq "rietveldreview")
-{
- edit("rietveldreview");
-}
</del><span class="cx"> #endif // WEBKIT_CHANGES
</span><span class="cx"> elsif ($action eq "update")
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebsitesbugswebkitorgtemplateencustomattachmentlisthtmltmpl"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl (174772 => 174773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
</span><span class="lines">@@ -112,16 +112,10 @@
</span><span class="cx">
</span><span class="cx"> [% IF show_attachment_flags %]
</span><span class="cx"> <td class="bz_attach_flags" valign="top">
</span><del>-[%# if WEBKIT_CHANGES %]
- [% IF attachment.flags.size == 0 ||
- (attachment.flags.size == 1 && attachment.flags.0.type.name == 'in-rietveld') %]
-[%# endif // WEBKIT_CHANGES %]
</del><ins>+ [% IF attachment.flags.size == 0 %]
</ins><span class="cx"> <i>no flags</i>
</span><span class="cx"> [% ELSE %]
</span><span class="cx"> [% FOREACH flag = attachment.flags %]
</span><del>-[%# if WEBKIT_CHANGES %]
- [% IF flag.type.name != 'in-rietveld' %]
-[%# endif // WEBKIT_CHANGES %]
</del><span class="cx"> [% IF user.id %]
</span><span class="cx"> <span title="[% flag.setter.identity FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
</span><span class="cx"> [% ELSIF flag.setter.name %]
</span><span class="lines">@@ -139,9 +133,6 @@
</span><span class="cx"> ([% flag.requestee.nick FILTER html %])
</span><span class="cx"> [% END %]
</span><span class="cx"> [% END %]<br>
</span><del>-[%# if WEBKIT_CHANGES %]
- [% END %]
-[%# endif // WEBKIT_CHANGES %]
</del><span class="cx"> [% END %]
</span><span class="cx"> [% END %]
</span><span class="cx"> </td>
</span><span class="lines">@@ -165,11 +156,6 @@
</span><span class="cx"> [% Hook.process("action") %]
</span><span class="cx"> [%# if WEBKIT_CHANGES %]
</span><span class="cx"> [% IF attachment.ispatch %]
</span><del>- [% FOREACH flag = attachment.flags %]
- [% IF flag.type.name == 'in-rietveld' && flag.status == "+" %]
- | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=rietveldreview&amp;GoAheadAndLogIn=1">Rietve
- [% END %]
- [% END %]
</del><span class="cx"> <div class="statusBubble">
</span><span class="cx"> <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
</span><span class="cx"> style="width: 600px; height: 20px; border: none;" scrolling="no">
</span></span></pre></div>
<a id="trunkWebsitesbugswebkitorgtemplateencustomattachmentreviewformhtmltmpl"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl (174772 => 174773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
</span><span class="lines">@@ -20,12 +20,6 @@
</span><span class="cx">
</span><span class="cx"> [% PROCESS global/variables.none.tmpl %]
</span><span class="cx">
</span><del>-[% USE CGI %]
-[%
- # We use a query string rietveldreview=true to indicate when in rietveld mode.
- rietveldReview = CGI.param('rietveldreview')
-%]
-
</del><span class="cx"> <style>
</span><span class="cx"> * { font-size: small; }
</span><span class="cx"> #comment { width: 100%; height: 100%; font-family: monospace; }
</span><span class="lines">@@ -51,26 +45,12 @@
</span><span class="cx"> }
</span><span class="cx"> function onSubmitComments()
</span><span class="cx"> {
</span><del>-[% IF rietveldReview %]
- var submitBtn = document.getElementById('submitBtn');
- submitBtn.innerHTML = 'Fetching comments from Rietveld...';
- submitBtn.disabled = true; // Disable since this is asynch.
- top.getComments();
- // Handle the error case of Rietveld not responding by giving
- // the user another chance.
- setTimeout(function() {
- submitBtn.innerHTML = 'Fetching comments timed out ... retry?';
- submitBtn.disabled = false;
- }, 30000);
- return false;
-[% ELSE %]
</del><span class="cx"> // If someone just left the entire comment alone, then upload the form
</span><span class="cx"> // with no comment at all.
</span><span class="cx"> var textarea = document.getElementById("comment");
</span><span class="cx"> if (textarea.defaultValue === textarea.value)
</span><span class="cx"> textarea.value = "";
</span><span class="cx"> return true;
</span><del>-[% END %]
</del><span class="cx"> }
</span><span class="cx"> [% END %]
</span><span class="cx">
</span><span class="lines">@@ -138,15 +118,9 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <td colspan="4">
</span><del>-[% IF rietveldReview %]
-Enter high-level comments below. Make detailed comments above. Submit will submit both.<br>
-[% ELSE %]
</del><span class="cx"> Enter comments below:<br>
</span><del>-[% END %]
</del><span class="cx"> <textarea id=comment name="comment" wrap="soft">
</span><del>-[% IF !rietveldReview %]
</del><span class="cx"> [% quotedpatch FILTER html %]
</span><del>-[% END %]
</del><span class="cx"> </textarea><br>
</span><span class="cx">
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkWebsitesbugswebkitorgtemplateencustomattachmentrietveldreviewhtmltmpl"></a>
<div class="delfile"><h4>Deleted: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl (174772 => 174773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-[%# 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 <myk@mozilla.org>
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Rietveld review patch #[% attachment.id %] for [% terms.Bug %] #[% attachment.bug_id %]: [% bugsummary FILTER html %]</title>
-<script type="text/javascript">
-<!--
-/**
- * Handle the postMessage response from Rietveld.
- * The response will be the comments to combine with those left in the
- * comments box.
- */
-function updateComments(e)
-{
- if (e.origin == 'http://wkrietveld.appspot.com') {
- var reviewFormDoc = document.getElementById('reviewFormFrame').
- contentDocument;
- // Add the Rietveld comments to the comments field.
- if (e.data) {
- var commentBox = reviewFormDoc.getElementById('comment');
-
- if (commentBox.value)
- commentBox.value += '\n---------------------------------\n';
- commentBox.value += e.data;
- }
- reviewFormDoc.forms[0].submit();
- }
-}
-
-/**
- * Fetch comments from Rietveld via postMessage.
- */
-function getComments()
-{
- document.getElementById('rietveldFrame').contentWindow.
- postMessage('publish', 'http://wkrietveld.appspot.com');
-}
-
-// Listen for messages from Rietveld.
-if (window.postMessage)
- window.addEventListener("message", updateComments, false);
-else
- alert('Error: Please load this page in a browser that supports postMessage');
-//-->
-</script>
-
-[% IF !user.login %]
-[%# We shouldn't ever hit this, since all links to this page use GoAheadAndLogIn.
- This is just here as a safeguard if anyone directly navigates to it. %]
-Please log in and refresh this page.
-[% ELSE %]
-<frameset rows="80%,20%">
-<frame id=rietveldFrame src="http://wkrietveld.appspot.com/[% attachment.bug_id %]?email=[% user.login %]">
-<frame id=reviewFormFrame src="attachment.cgi?id=[% attachment.id %]&action=reviewform&rietveldreview=true">
-</frameset>
-[% END %]
</del></span></pre>
</div>
</div>
</body>
</html>