removes workflow-select template that was outstanding

archesproject · Jun 20, 2019 · aeb99a2 · aeb99a2
2 parents 522c58d + 2b79ea4
commit aeb99a2
Show file tree

Hide file tree

Showing 26 changed files with 1,387 additions and 3,760 deletions.
diff --git a/arches/app/datatypes/datatypes.py b/arches/app/datatypes/datatypes.py
@@ -643,6 +643,8 @@ def get_map_layer(self, node=None, preview=False):
         if not preview and node.config["layerIcon"] != "":
             layer_icon = node.config["layerIcon"]
 
+        layer_legend = node.config["layerLegend"]
+
         if not preview and node.config["advancedStyling"]:
             try:
                 style = json.loads(node.config["advancedStyle"])
@@ -1007,6 +1009,7 @@ def get_map_layer(self, node=None, preview=False):
             "name": layer_name,
             "layer_definitions": layer_def,
             "icon": layer_icon,
+            "legend": layer_legend,
             "addtomap": node.config['addToMap'],
         }
 

diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css
@@ -624,6 +624,15 @@ div.wf-multi-tile-card-info div {
     padding: 20px;
 }
 
+#workflow-container {
+    display: flex;
+    flex-direction: row;
+}
+
+div.workflow-content {
+    flex-grow: 2;
+}
+
 .workflow-panel-header a span {
     font-size: 16px;
     color: white;
@@ -644,9 +653,14 @@ div.wf-multi-tile-card-info div {
 
 .workflow-panel {
     background: #26476a;
-    width: 12%;
+    /* width: 12%; */
     color: white;
 }
+
+div.workflow-panel {
+    min-width: 250px;
+}
+
 .workflow-panel ul {
     /* text-decoration: none; */
     list-style-type: none;
@@ -684,6 +698,14 @@ div.wf-multi-tile-card-info div {
     margin-top: 15px;
 }
 
+.workflow-select-card-container-title {
+    font-size: 1.5em;
+    font-weight: 500;
+    padding-left: 30px;
+    margin-top: 5px;
+    margin-bottom: -15px;
+}
+
 .workflow-select-card-container {
     display: flex;
     flex-grow: inherit;
@@ -693,14 +715,20 @@ div.wf-multi-tile-card-info div {
 }
 
 .workflow-select-card {
-    width: 180px;
-    height: 180px;
+    width: 200px;
+    height: 200px;
     padding: 10px;
     color: white;
     text-align: center;
-    border: 1px solid black;
+    border: 1px solid #777;
     border-radius: 1px;
     margin: 10px;
+    opacity: 0.85;
+}
+
+.workflow-select-card:hover {
+    opacity: 1.0;
+    border: 1px solid black;
 }
 
 .workflow-select-wf-circle {
@@ -717,8 +745,14 @@ div.wf-multi-tile-card-info div {
     font-size: 40px;
 }
 
+.workflow-select-title {
+    font-size: 1.4em;
+    font-weight: 500;
+}
+
 .workflow-select-desc {
-    font-size: 11px;
+    font-size: 12px;
+    padding-top: 10px;
 }
 /* general styling for all tabs */
 .tab-subheader-sm p {

diff --git a/arches/app/media/js/views/components/cards/map.js b/arches/app/media/js/views/components/cards/map.js
@@ -33,8 +33,13 @@ define([
                     if (layer.addtomap) self.activeBasemap(layer);
                 }
                 else {
-                    layer.onMap = ko.observable(layer.addtomap);
-                    layer.opacity = ko.observable(100);
+                    layer.opacity = ko.observable(layer.addtomap ? 100 : 0);
+                    layer.onMap = ko.pureComputed({
+                        read: function() { return layer.opacity() > 0; },
+                        write: function(value) {
+                            layer.opacity(value ? 100 : 0);
+                        }
+                    });
                     self.overlays.push(layer);
                 }
             });

diff --git a/arches/app/media/js/views/components/datatypes/geojson-feature-collection.js b/arches/app/media/js/views/components/datatypes/geojson-feature-collection.js
@@ -6,7 +6,8 @@ define([
     'bindings/color-picker',
     'bindings/mapbox-gl',
     'bindings/codemirror',
-    'codemirror/mode/javascript/javascript'
+    'codemirror/mode/javascript/javascript',
+    'bindings/ckeditor'
 ], function($, arches, ko, _) {
     var name = 'geojson-feature-collection-datatype-config';
     ko.components.register(name, {