Merge pull request #7066 from archesproject/7065-cbyrd-tabbed-workflo…

…w-save-multi-tile-step tabbed workflow save multi tile step 7065
archesproject · Jan 29, 2021 · 2c0555e · 2c0555e
2 parents 5a1bd82 + 160d4e8
commit 2c0555e
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 7 deletions.
diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css
@@ -615,8 +615,7 @@ input[type="checkbox"] {
 }
 
 .tabbed-workflow-step-body .search-selection-controls {
-    /* display: none !important; */
-    margin-bottom: 53px;
+    display: none !important;
 }
 
 .tabbed-workflow-information-box-marker {
@@ -660,8 +659,14 @@ input[type="checkbox"] {
     color: grey;
 }
 
+.tabbed-workflow-step-body .padded-workflow-step {
+    width: calc(100vw - 50px);
+    padding: 10px;
+}
+
 .tabbed-workflow-step-body .card-component {
     margin: unset;
+    width: calc(100vw - 50px);
     padding: 0 25px;
 }
 
@@ -675,10 +680,18 @@ input[type="checkbox"] {
     border: none !important;
 }
 
+.tabbed-workflow-step-body .workbench-card-wrapper {
+    width: calc(100vw - 50px);
+}
+
 .tabbed-workflow-step-body .install-buttons {
     display: none;
 }
 
+.tabbed-workflow-step-body .manifest-editor .install-buttons {
+    display: unset;
+}
+
 .tabbed-workflow-footer {
     background-color: #fafafa;
     border-top: 1px solid #ddd;
@@ -704,10 +717,13 @@ input[type="checkbox"] {
     display: none;
 }
 
-.tabbed-workflow-footer .btn {
+.tabbed-workflow-footer .btn,
+.tabbed-workflow-title-bar .btn {
     border-radius: 2px;
 }
 
+.tabbed-workflow-title-bar .btn > i,
+.tabbed-workflow-title-bar .btn > span, 
 .tabbed-workflow-footer .btn > i,
 .tabbed-workflow-footer .btn > span {
     padding: 0px 2px;
@@ -864,7 +880,7 @@ div.wf-multi-tile-card-info div {
 }
 
 .workflow-nav-tab-list {
-    padding: 0px 50px 0px 10px;
+    padding: 0px 55px 0px 10px;
     background-color: #fafafa;
     display: flex;
     min-width: max-content;

diff --git a/arches/app/templates/views/components/plugins/tabbed-workflow.htm b/arches/app/templates/views/components/plugins/tabbed-workflow.htm
@@ -16,12 +16,39 @@
 
             <div>
                 <!--ko if: activeStep()._index+1 !== steps.length -->
-                <button data-bind="click: finishWorkflow, css:{disabled: canFinish() === false}" class="btn btn-mint btn-labeled"><i class="btn-label ion-android-cloud-done"></i>{% trans "Finish" %}</button>
+                <button 
+                    data-bind="
+                        click: finishWorkflow, 
+                        css:{disabled: canFinish() === false}
+                    " 
+                    class="btn btn-success"
+                >
+                    <i class="ion-android-cloud-done"></i>
+                    <span>
+                        {% trans "Finish Workflow" %}
+                    </span>
+                </button>
                 <!--/ko-->
                 <!--ko if: activeStep()._index+1 === steps.length -->
-                <button disabled class="btn btn-mint btn-labeled"><i class="btn-label ion-android-cloud-done"></i>{% trans "Finished!" %}</button>
+                <button 
+                    disabled 
+                    class="btn btn-success"
+                >
+                    <i class="ion-android-cloud-done"></i>
+                    <span>
+                        {% trans "Workflow Finished!" %}
+                    </span>
+                </button>
                 <!--/ko-->
-                <button data-bind="click: quitWorkflow" class="btn btn-dark btn-labeled"><i class="btn-label ion-android-cancel"></i>{% trans "Quit" %}</button>
+                <button 
+                    data-bind="click: quitWorkflow" 
+                    class="btn btn-danger"
+                >
+                    <i class=" ion-android-cancel"></i>
+                    <span>
+                        {% trans "Quit Workflow" %}
+                    </span>
+                </button>
             </div>
         </div>