Change "content" control on patch comment form to a text area.

Also, a few further adjustments to patch formatting.

diff --git a/perl-lib/PgCommitFest/PatchComment.pm b/perl-lib/PgCommitFest/PatchComment.pm
index 78f3a795b67ee42f55981edea4b21678f1b3554e..101a784a4fc0f2a60e57dbe767804cc3c58c436b 100644 (file)
--- a/perl-lib/PgCommitFest/PatchComment.pm
+++ b/perl-lib/PgCommitFest/PatchComment.pm
@@ -71,7 +71,7 @@ EOM
 SELECT id, name FROM patch_comment_type ORDER BY id
 EOM
        $r->add_control('message_id', 'text', 'Message-ID', 'maxlength' => 255);
-       $r->add_control('content', 'text', 'Content', 'required' => 1);
+       $r->add_control('content', 'textarea', 'Content', 'required' => 1);
        my %value = $r->initialize_controls($d);
 
        # Handle commit.

diff --git a/template/commitfest_view.tt2 b/template/commitfest_view.tt2
index 65e0155d1678ad9d5d7d2de7faaa90bcbcb5a054..7bb6296c8a017ff5b4965b4bc7a037401a7259cf 100644 (file)
--- a/template/commitfest_view.tt2
+++ b/template/commitfest_view.tt2
@@ -22,9 +22,9 @@ changes, click on the patch name.</p>
   <td class='colLast'>&nbsp;</td>
 [% ELSE %]
   <td class='colFirstT'><a href='/action/patch_view?id=[% p.id %]'>[% p.name | htmlsafe %]</a>
-  <div style='padding-left: 2em;'>
+  <div style='padding-left: 1em'>
     [% FOREACH c = p.comment_list %]
-    <div><span class='txtAttribution'>[% c.creator | html %] at [% c.creation_time | html %]:</span> [% IF c.message_id != '' %]<a href='http://archives.postgresql.org/message-id/[% c.message_id | htmlsafe %]'>[% END %][% c.patch_comment_type | htmlsafe %][% IF c.message_id != '' %]</a>[% END %] - [% c.content | html %]</div>
+    <div style='margin-left: 1em; text-indent: -1em'><span class='txtAttribution'>[% IF c.message_id != '' %]<a href='http://archives.postgresql.org/message-id/[% c.message_id | htmlsafe %]'>[% END %][% c.patch_comment_type | htmlsafe %][% IF c.message_id != '' %]</a>[% END %] by [% c.creator | html %] on [% c.creation_time | html %]:</span> [% c.content | html | html_line_break %]</div>
     [% END %]
   </div>
   </td>

diff --git a/template/patch_view.tt2 b/template/patch_view.tt2
index fa4c034a2f0995bec06f14062f1f026386cc7e4a..37a9fa0bb3446d050a9c080e0d9af4ade949ff19 100644 (file)
--- a/template/patch_view.tt2
+++ b/template/patch_view.tt2
@@ -30,7 +30,7 @@
   <td class='colFirstT'>Comments</td>
   <td class='colLastT'>
     [% FOREACH c = patch_comment_list %]
-    <div>[% IF c.message_id != '' %]<a href='http://archives.postgresql.org/message-id/[% c.message_id | htmlsafe %]'>[% END %][% c.patch_comment_type | htmlsafe %][% IF c.message_id != '' %]</a>[% END %]: [% c.content | html %] ([% c.creator | html %]: [% c.creation_time | html %])[% IF authenticate.is_administrator || authenticate.userid == c.creator %] - <a href='/action/patch_comment_form?id=[% c.id %]'>Edit</a> - <a href='/action/patch_comment_delete?id=[% c.id %]' onClick='return confirm("Are you sure you want to delete this comment?");'>Delete</a>[% END %]</div>
+    <div style='margin-left: 1em; text-indent: -1em'><span class='txtAttribution'>[% IF c.message_id != '' %]<a href='http://archives.postgresql.org/message-id/[% c.message_id | htmlsafe %]'>[% END %][% c.patch_comment_type | htmlsafe %][% IF c.message_id != '' %]</a>[% END %] by [% c.creator | html %] on [% c.creation_time | html %]:</span> [% c.content | html | html_line_break %] [% IF authenticate.is_administrator || authenticate.userid == c.creator %] - <a href='/action/patch_comment_form?id=[% c.id %]'>Edit</a> - <a href='/action/patch_comment_delete?id=[% c.id %]' onClick='return confirm("Are you sure you want to delete this comment?");'>Delete</a>[% END %]</div>
     [% END %]
     [% IF patch_comment_list.size == 0 %]<div>No comments.</div>[% END %]
 </td>