Re-add buttons

app/static/app/js/components/FormDialog.jsx

@@ -181,7 +181,7 @@ class FormDialog extends React.Component {
                                         <i className="fa fa-circle-notch fa-spin"></i> {_("Deleting...")}
                                     </span>
                                 :   <span>
-                                        <i className="glyphicon glyphicon-trash"></i> {_("Delete")}
+                                        <i className="fa fa-trash"></i> {_("Delete")}
                                     </span>}
                             </button>
                         </div>

app/static/app/js/components/TaskListItem.jsx

@@ -397,6 +397,7 @@ class TaskListItem extends React.Component {
                     ([pendingActions.CANCEL,
                       pendingActions.REMOVE, 
                       pendingActions.RESTART].indexOf(task.pending_action) !== -1);
+    const editable = this.props.hasPermission("change") && [statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1;
 
     let expanded = "";
     if (this.state.expanded){
@@ -430,8 +431,17 @@ class TaskListItem extends React.Component {
         });
       }
 
+      if (editable || (!task.processing_node)){
+        addActionButton(_("Edit"), "btn-primary pull-right edit-button", "glyphicon glyphicon-pencil", () => {
+          this.startEditing();
+        }, {
+          className: "inline"
+        });
+      }
+
       if ([statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1 &&
             task.processing_node &&
+            this.props.hasPermission("change") &&
             !imported){
           // By default restart reruns every pipeline
           // step from the beginning
@@ -444,6 +454,13 @@ class TaskListItem extends React.Component {
           });
       }
 
+      if (this.props.hasPermission("delete")){
+          addActionButton(_("Delete"), "btn-danger", "fa fa-trash fa-fw", this.genActionApiCall("remove", {
+            confirm: _("All information related to this task, including images, maps and models will be deleted. Continue?"),
+            defaultError: _("Cannot delete task.")
+          }));
+      }
+
       actionButtons = (<div className="action-buttons">
             {task.status === statusCodes.COMPLETED ?
               <AssetDownloadButtons task={this.state.task} disabled={disabled} />
@@ -637,19 +654,15 @@ class TaskListItem extends React.Component {
     }
 
     // Ability to change options
-    const editable = [statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1;
+    if (editable || (!task.processing_node)){
+        taskActions.push(<li key="edit"><a href="javascript:void(0)" onClick={this.startEditing}><i className="glyphicon glyphicon-pencil"></i>{_("Edit")}</a></li>);
+    }
 
-    if (this.props.hasPermission("change")){
+    if (editable){
-        if (editable || (!task.processing_node)){
+        taskActions.push(
-            taskActions.push(<li key="edit"><a href="javascript:void(0)" onClick={this.startEditing}><i className="glyphicon glyphicon-pencil"></i>{_("Edit")}</a></li>);
+            <li key="move"><a href="javascript:void(0)" onClick={this.handleMoveTask}><i className="fa fa-arrows-alt"></i>{_("Move")}</a></li>,
-        }
+            <li key="duplicate"><a href="javascript:void(0)"><i className="fa fa-copy"></i>{_("Duplicate")}</a></li>
-
+        );
-        if (editable){
-            taskActions.push(
-                <li key="move"><a href="javascript:void(0)" onClick={this.handleMoveTask}><i className="fa fa-arrows-alt"></i>{_("Move")}</a></li>,
-                <li key="duplicate"><a href="javascript:void(0)"><i className="fa fa-copy"></i>{_("Duplicate")}</a></li>
-            );
-        }
     }
 
 
@@ -658,7 +671,7 @@ class TaskListItem extends React.Component {
             <li key="sep" role="separator" className="divider"></li>,
         );
     
-        addTaskAction(_("Delete"), "glyphicon glyphicon-trash", this.genActionApiCall("remove", {
+        addTaskAction(_("Delete"), "fa fa-trash", this.genActionApiCall("remove", {
             confirm: _("All information related to this task, including images, maps and models will be deleted. Continue?"),
             defaultError: _("Cannot delete task.")
         }));

app/static/app/js/css/ProjectListItem.scss

@@ -56,6 +56,11 @@
         }
     }
 
+    .btn-danger .fa-trash{
+        margin-right: 2px;
+        margin-left: 0px;
+    }
+    
     .dz-preview{
         display: none;
     }