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: schlatterbeck

CHANGES.txt

@@ -99,6 +99,10 @@ Features:
   endpoints. (John Rouillard)
 - issue2551062: roundup-admin security now validates all properties in
   permissions. It reports invalid properties. (John Rouillard)
+- issue2551065: Reorder html entities generated by submit button so that
+  styles can be applied. Thanks to Garth Jensen for the patch against
+  release 1.6 that was ported to upcoming 2.0 release (Ralf
+  Schlatterbeck).
 
 Fixed:
 

doc/acknowledgements.txt

@@ -10,6 +10,10 @@ ideas and everything else that helped!
 
 .. _`Announcement with changelog for current release.`: announcement.html
 
+2.X
+---
+
+Garth Jensen
 
 1.6
 ---

roundup/cgi/templating.py

@@ -776,12 +776,14 @@ def submit(self, label=''"Submit New Entry", action="new"):
         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 @@ def submit(self, label=''"Submit Changes", action="edit"):
 
         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.