Realign buttons in .form-controls

Author: flourish86

application/forms/EntryForm.php

@@ -283,14 +283,6 @@ protected function assemble()
         ]);
 
         $additionalButtons = [];
-        $cancelBtn = $this->createElement('submit', 'cancel', [
-            'label' => $this->translate('Cancel'),
-            'class' => 'btn-cancel',
-            'formnovalidate' => true
-        ]);
-        $this->registerElement($cancelBtn);
-        $additionalButtons[] = $cancelBtn;
-
         if ($this->showRemoveButton) {
             $removeBtn = $this->createElement('submit', 'remove', [
                 'label' => $this->translate('Remove Entry'),
@@ -301,6 +293,14 @@ protected function assemble()
             $additionalButtons[] = $removeBtn;
         }
 
+        $cancelBtn = $this->createElement('submit', 'cancel', [
+            'label' => $this->translate('Cancel'),
+            'class' => 'btn-cancel btn-default',
+            'formnovalidate' => true
+        ]);
+        $this->registerElement($cancelBtn);
+        $additionalButtons[] = $cancelBtn;
+
         $this->getElement('submit')->prependWrapper((new HtmlDocument())->setHtmlContent(...$additionalButtons));
 
         $this->addElement($this->createCsrfCounterMeasure(Session::getSession()->getId()));

application/forms/ScheduleForm.php

@@ -120,14 +120,6 @@ protected function assemble()
         ]);
 
         $additionalButtons = [];
-        $cancelBtn = $this->createElement('submit', 'cancel', [
-            'label' => $this->translate('Cancel'),
-            'class' => 'btn-cancel',
-            'formnovalidate' => true
-        ]);
-        $this->registerElement($cancelBtn);
-        $additionalButtons[] = $cancelBtn;
-
         if ($this->showRemoveButton) {
             $removeBtn = $this->createElement('submit', 'remove', [
                 'label' => $this->translate('Delete Schedule'),
@@ -138,6 +130,14 @@ protected function assemble()
             $additionalButtons[] = $removeBtn;
         }
 
+        $cancelBtn = $this->createElement('submit', 'cancel', [
+            'label' => $this->translate('Cancel'),
+            'class' => 'btn-cancel btn-default',
+            'formnovalidate' => true
+        ]);
+        $this->registerElement($cancelBtn);
+        $additionalButtons[] = $cancelBtn;
+
         $this->getElement('submit')->prependWrapper((new HtmlDocument())->setHtmlContent(...$additionalButtons));
 
         $this->addElement($this->createCsrfCounterMeasure(Session::getSession()->getId()));