diff roundup/cgi/templating.py @ 5907:fe96015445e9

Reorder html entities generated by submit button issue2551065: This allows styles to be applied. Thanks to Garth Jensen for the patch against release 1.6
author Ralf Schlatterbeck <rsc@runtux.com>
date Tue, 08 Oct 2019 14:37:29 +0200
parents c3728772c594
children a2a7860502fa
line wrap: on
line diff
--- a/roundup/cgi/templating.py	Tue Oct 08 07:07:01 2019 -0400
+++ b/roundup/cgi/templating.py	Tue Oct 08 14:37:29 2019 +0200
@@ -776,12 +776,14 @@
         if not self.is_edit_ok():
             return ''
 
-        return self.input(type="hidden", name="@csrf",
-                          value=anti_csrf_nonce(self._client)) + \
+        return \
+            self.input(type="submit", name="submit_button",
+                              value=self._(label)) + \
             '\n' + \
-            self.input(type="hidden", name="@action", value=action) + \
+            self.input(type="hidden", name="@csrf",
+                              value=anti_csrf_nonce(self._client)) + \
             '\n' + \
-            self.input(type="submit", name="submit_button", value=self._(label))
+            self.input(type="hidden", name="@action", value=action)
 
     def history(self):
         if not self.is_view_ok():
@@ -916,16 +918,17 @@
 
         Also sneak in the lastactivity and action hidden elements.
         """
-        return self.input(type="hidden", name="@lastactivity",
-            value=self.activity.local(0)) + \
+        return \
+            self.input(type="submit", name="submit_button",
+                       value=self._(label)) + \
+            '\n' + \
+            self.input(type="hidden", name="@lastactivity",
+                       value=self.activity.local(0)) + \
             '\n' + \
             self.input(type="hidden", name="@csrf",
                        value=anti_csrf_nonce(self._client)) + \
             '\n' + \
-            self.input(type="hidden", name="@action", value=action) + \
-            '\n' + \
-            self.input(type="submit", name="submit_button",
-                       value=self._(label))
+            self.input(type="hidden", name="@action", value=action)
 
     def journal(self, direction='descending'):
         """ Return a list of HTMLJournalEntry instances.

Roundup Issue Tracker: http://roundup-tracker.org/