Merge branch '6.1' into 6.2

Author: GuySartorelli

src/Actions/SetPropertyWorkflowAction.php

@@ -7,8 +7,6 @@
 use Symbiote\AdvancedWorkflow\DataObjects\WorkflowInstance;
 
 /**
- *
- *
  * @author Marcus Nyeholt <marcus@symbiote.com.au>
  */
 class SetPropertyWorkflowAction extends WorkflowAction

src/Extensions/WorkflowApplicable.php

@@ -261,7 +261,6 @@ public function updateCMSActions(FieldList $actions)
                             // and will be displayed as a major action.
                             if (!$addedFirst) {
                                 $addedFirst = true;
-                                $action->setAttribute('data-icon', 'navigation');
                                 $majorActions = $actions->fieldByName('MajorActions');
                                 $majorActions ? $majorActions->push($action) : $actions->push($action);
                             } else {
@@ -271,7 +270,7 @@ public function updateCMSActions(FieldList $actions)
                     }
                     // Only display menu if actions pushed to it
                     if ($tab->Fields()->exists()) {
-                        $menu->insertBefore($tab, 'MoreOptions');
+                        $menu->insertBefore('MoreOptions', $tab);
                     }
                 }
             }

templates/Symbiote/AdvancedWorkflow/FormFields/WorkflowField.ss

@@ -30,13 +30,13 @@
                     <h4>$Title</h4>
 
                     <div class="workflow-field-action-buttons btn-group">
-                        <a class="btn btn-outline-secondary workflow-field-open-dialog<% if $canEdit %><% else %> workflow-field-action-disabled<% end_if %>" href="$Top.ActionLink('item',$ID,'edit')" data-icon="pencil">
+                        <a class="btn btn-outline-secondary workflow-field-open-dialog<% if $canEdit %><% else %> workflow-field-action-disabled<% end_if %>" href="$Top.ActionLink('item',$ID,'edit')">
                             <%t WorkflowField.EditAction "Edit" %>
                         </a>
-                        <a class="btn btn-outline-secondary workflow-field-open-dialog <% if $canAddTransition %><% else %> workflow-field-action-disabled<% end_if %>" href="$Top.TransitionLink('new',$ID,'edit')" data-icon="chain--arrow">
+                        <a class="btn btn-outline-secondary workflow-field-open-dialog <% if $canAddTransition %><% else %> workflow-field-action-disabled<% end_if %>" href="$Top.TransitionLink('new',$ID,'edit')">
                             <%t WorkflowField.AddTransitionAction "Add Transition" %>
                         </a>
-                        <a href="$Top.ActionLink('item',$ID,'delete')" data-securityid="$SecurityID" class="btn btn-outline-secondary workflow-field-delete<% if $canDelete %><% else %> workflow-field-action-disabled<% end_if %>" data-icon="cross-circle">
+                        <a href="$Top.ActionLink('item',$ID,'delete')" data-securityid="$SecurityID" class="btn btn-outline-secondary workflow-field-delete<% if $canDelete %><% else %> workflow-field-action-disabled<% end_if %>">
                             <%t WorkflowField.DeleteAction "Delete" %>
                         </a>
                     </div>