Title: [174769] trunk/Websites/bugs.webkit.org
- Revision
- 174769
- Author
- [email protected]
- Date
- 2014-10-16 09:01:16 -0700 (Thu, 16 Oct 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Websites/bugs.webkit.org/code-review.js (174768 => 174769)
--- 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)
@@ -555,10 +555,10 @@
$.get('show_bug.cgi?id=' + bug_id, function(data) {
var comments = [];
$(data).find('.bz_comment').each(function() {
- var author = $(this).find('.email').text();
+ var author = $(this).find('.email').text().trim();
var text = $(this).find('.bz_comment_text').text();
- var comment_marker = '(From update of attachment ' + attachment_id + ' .details.)';
+ var comment_marker = 'Comment on attachment ' + attachment_id + ' .details.';
if (text.match(comment_marker))
$.merge(comments, scanForComments(author, text));
Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl (174768 => 174769)
--- 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)
@@ -19,23 +19,22 @@
#%]
[% PROCESS global/variables.none.tmpl %]
+
[% USE CGI %]
[%
# We use a query string rietveldreview=true to indicate when in rietveld mode.
rietveldReview = CGI.param('rietveldreview')
%]
-<link href="" rel="stylesheet" type="text/css">
-<link href="" rel="stylesheet" type="text/css">
<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>
-<script type="text/_javascript_">
- <!--
+[% _javascript_ = BLOCK %]
var viewing_formatted_diff = true;
function viewPrettyPatch()
{
@@ -73,9 +72,12 @@
return true;
[% END %]
}
- //-->
-</script>
+[% 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">
@@ -99,8 +101,10 @@
<button id="submitBtn" type="submit">Submit</button>
</td>
<td>
- [% IF flag_types.size > 0 %]
- [% PROCESS "flag/list.html.tmpl" bug_id=attachment.bug_id attach_id=attachment.id %]<br>
+ [% 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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
