<!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>[174769] 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/174769">174769</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 09:01:16 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix review form after Bugzilla 4.2.5 update
* code-review.js:
(fetchHistory):
- Trim author since new format adds a space before the name.
- Update comment_marker to match the text now used by Bugzilla.
* template/en/custom/attachment/reviewform.html.tmpl:
- Add global/header.html.tmpl to make sure we get the standard
HTML for including CSS, JavaScript, etc.
- Remove redundant <link> tags.
- Add CSS in local <style> to hide the header.
- Change local <script> to be passed as an argument into
global/header.html.tmpl when it is processed.
- NOTE: local <style> tag should be passed as an argument into
global/header.html.tmpl, but that breaks page layout, so it
was skipped for now.
- Fix fallout form moving flag_types into the attachment object
when processing flag/list.html.tmpl.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesbugswebkitorgcodereviewjs">trunk/Websites/bugs.webkit.org/code-review.js</a></li>
<li><a href="#trunkWebsitesbugswebkitorgtemplateencustomattachmentreviewformhtmltmpl">trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesbugswebkitorgcodereviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/code-review.js (174768 => 174769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/code-review.js 2014-10-16 16:01:15 UTC (rev 174768)
+++ trunk/Websites/bugs.webkit.org/code-review.js 2014-10-16 16:01:16 UTC (rev 174769)
</span><span class="lines">@@ -555,10 +555,10 @@
</span><span class="cx"> $.get('show_bug.cgi?id=' + bug_id, function(data) {
</span><span class="cx"> var comments = [];
</span><span class="cx"> $(data).find('.bz_comment').each(function() {
</span><del>- var author = $(this).find('.email').text();
</del><ins>+ var author = $(this).find('.email').text().trim();
</ins><span class="cx"> var text = $(this).find('.bz_comment_text').text();
</span><span class="cx">
</span><del>- var comment_marker = '(From update of attachment ' + attachment_id + ' .details.)';
</del><ins>+ var comment_marker = 'Comment on attachment ' + attachment_id + ' .details.';
</ins><span class="cx"> if (text.match(comment_marker))
</span><span class="cx"> $.merge(comments, scanForComments(author, text));
</span><span class="cx">
</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 (174768 => 174769)</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:15 UTC (rev 174768)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl 2014-10-16 16:01:16 UTC (rev 174769)
</span><span class="lines">@@ -19,23 +19,22 @@
</span><span class="cx"> #%]
</span><span class="cx">
</span><span class="cx"> [% PROCESS global/variables.none.tmpl %]
</span><ins>+
</ins><span class="cx"> [% USE CGI %]
</span><span class="cx"> [%
</span><span class="cx"> # We use a query string rietveldreview=true to indicate when in rietveld mode.
</span><span class="cx"> rietveldReview = CGI.param('rietveldreview')
</span><span class="cx"> %]
</span><span class="cx">
</span><del>-<link href="skins/standard/global.css" rel="stylesheet" type="text/css">
-<link href="skins/custom/global.css" rel="stylesheet" type="text/css">
</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="cx"> #form-controls { height: 40px; }
</span><span class="cx"> #form-controls td { width: 25%; text-align: center; }
</span><ins>+#header { display: none; }
</ins><span class="cx"> </style>
</span><span class="cx">
</span><del>-<script type="text/javascript">
- <!--
</del><ins>+[% javascript = BLOCK %]
</ins><span class="cx"> var viewing_formatted_diff = true;
</span><span class="cx"> function viewPrettyPatch()
</span><span class="cx"> {
</span><span class="lines">@@ -73,9 +72,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> [% END %]
</span><span class="cx"> }
</span><del>- //-->
-</script>
</del><ins>+[% END %]
</ins><span class="cx">
</span><ins>+[% PROCESS global/header.html.tmpl
+ javascript = javascript
+%]
+
</ins><span class="cx"> <form method="post" action="attachment.cgi" target="_top" onsubmit="return onSubmitComments();">
</span><span class="cx"> <input type="hidden" name="id" value="[% attachment.id %]">
</span><span class="cx"> <input type="hidden" name="action" value="update">
</span><span class="lines">@@ -99,8 +101,10 @@
</span><span class="cx"> <button id="submitBtn" type="submit">Submit</button>
</span><span class="cx"> </td>
</span><span class="cx"> <td>
</span><del>- [% IF flag_types.size > 0 %]
- [% PROCESS "flag/list.html.tmpl" bug_id=attachment.bug_id attach_id=attachment.id %]<br>
</del><ins>+ [% 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>
</ins><span class="cx"> [% END %]
</span><span class="cx"> </td>
</span><span class="cx"> <td>
</span></span></pre>
</div>
</div>
</body>
</html>