This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new aed6851e Rearrange form to make it easier to see the Diff
aed6851e is described below

commit aed6851e8c838119a741032b3136f45ffe5bb6ae
Author: Sebb <[email protected]>
AuthorDate: Sun Nov 16 12:47:31 2025 +0000

    Rearrange form to make it easier to see the Diff
---
 www/officers/update_affiliations.cgi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/officers/update_affiliations.cgi 
b/www/officers/update_affiliations.cgi
index b1a53e87..85aa7693 100755
--- a/www/officers/update_affiliations.cgi
+++ b/www/officers/update_affiliations.cgi
@@ -29,22 +29,22 @@ def emit_form(url, revision, original, updated, diff, env)
       _whimsy_forms_input(label: 'Revision', name: field, id: field,
         value: revision, readonly: true
       )
-      field = 'updated'
-      _whimsy_forms_input(label: 'Content', name: field, id: field, rows: 15,
-        value: updated || original
-      )
+      _div.col_sm_offset_3.col_sm_9 do
+        _input.btn.btn_default type: 'submit', label: 'Diff', name: 'Submit', 
value: 'Diff', helptext: 'Show diff'
+        _input.btn.btn_default type: 'submit', label: 'Commit', name: 
'Submit', value: 'Commit', helptext: 'Commit diff'
+      end
       if diff
         field = 'difference'
         rows = nil
-        rows = 5 if diff.size > 0
+        rows = 1 + diff.split("\n").size if diff.size > 0
         _whimsy_forms_input(label: 'Difference', name: field, id: field, rows: 
rows, readonly: true, 
           value: diff.size > 0 ? diff : '[No differences found]'
         )
       end
-      _div.col_sm_offset_3.col_sm_9 do
-        _input.btn.btn_default type: 'submit', label: 'Diff', name: 'Submit', 
value: 'Diff', helptext: 'Show diff'
-        _input.btn.btn_default type: 'submit', label: 'Commit', name: 
'Submit', value: 'Commit', helptext: 'Commit diff'
-      end
+      field = 'updated'
+      _whimsy_forms_input(label: 'Content', name: field, id: field, rows: 15,
+        value: updated || original
+      )
     end
   end
 end

Reply via email to