diff --git a/arches/app/media/css/arches.scss b/arches/app/media/css/arches.scss index 0dc19cf46ba..c1ce7bf2e9e 100644 --- a/arches/app/media/css/arches.scss +++ b/arches/app/media/css/arches.scss @@ -777,6 +777,25 @@ h4.branch-xl-title { margin-top: 25px; } +.etl-module-component .delete-type-container{ + display: flex; + flex-direction: row; + margin-top: 10px; +} +.etl-module-component .delete-type-button{ + flex: 1; + justify-content: center; + align-items: center; + display: flex; + padding: 10px 20px; + background-color: #fdfdfd; + border: 1px solid #ddd; + margin-right: 12px; +} +.etl-module-component .delete-type-button.active { + font-weight: bold; +} + .tabbed-workflow-footer, .etl-module-footer { background-color: #445769; border-top: 1px solid #0E2031; diff --git a/arches/app/media/js/views/components/etl_modules/bulk-data-deletion.js b/arches/app/media/js/views/components/etl_modules/bulk-data-deletion.js index f65bc74b4a2..8527170386c 100644 --- a/arches/app/media/js/views/components/etl_modules/bulk-data-deletion.js +++ b/arches/app/media/js/views/components/etl_modules/bulk-data-deletion.js @@ -39,6 +39,7 @@ define([ this.numberOfTiles = ko.observable(); this.showCount = ko.observable(false); + this.activeTab = ko.observable("TileDeletion"); this.deleteTiles.subscribe((val) => { if (!val){ self.selectedNodegroup(null); diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm index d3e53562cf2..f9b03b9f1fe 100644 --- a/arches/app/templates/javascript.htm +++ b/arches/app/templates/javascript.htm @@ -251,7 +251,7 @@ concept-collection='{% trans "Concept Collection" as conceptCollection %} "{{ conceptCollection|escapejs }}"' select-a-concept-collection='{% trans "Select a concept collection" as selectAConceptCollection %} "{{ selectAConceptCollection|escapejs }}"' search-url='{% trans "Search Url" as SearchUrl %} "{{ SearchUrl|escapejs }}"' - use-search-url='{% trans "Use search url (optional)" as useSearchUrl %} "{{ useSearchUrl|escapejs }}"' + use-search-url='{% trans "Use search url" as useSearchUrl %} "{{ useSearchUrl|escapejs }}"' before='{% trans "Before" as before %} "{{ before|escapejs }}"' after='{% trans "After" as after %} "{{ after|escapejs }}"' case-insensitive='{% trans "Case Insensitive" as caseInsensitive %} "{{ caseInsensitive|escapejs }}"' diff --git a/arches/app/templates/views/components/etl_modules/bulk-data-deletion.htm b/arches/app/templates/views/components/etl_modules/bulk-data-deletion.htm index d9425716edc..05d2b71a843 100644 --- a/arches/app/templates/views/components/etl_modules/bulk-data-deletion.htm +++ b/arches/app/templates/views/components/etl_modules/bulk-data-deletion.htm @@ -4,119 +4,135 @@ {% block task_details %}
- {% blocktrans %}Delete The Selected Resources or Tiles{% endblocktrans %} -
-- {% blocktrans %}You can delete the tiles by selecting the nodegroup. - The selections can be further limited using the optional search url.{% endblocktrans %} -
- - +- {% blocktrans %}You can delete the resources by selecting the graph or using search url. - If you choose both, only the intersection will be deleted.{% endblocktrans %} + {% blocktrans %}Delete The Selected Resources or Tiles{% endblocktrans %}
- -
-
- {% blocktrans %}This selection will delete the resource instances from search url{% endblocktrans %}
+
+ {% blocktrans %}You can delete the tiles by selecting the nodegroup.
+ The selections can be further limited using the optional search url.{% endblocktrans %}
+
+ {% blocktrans %}You can delete the resources by selecting the graph.{% endblocktrans %}
+
+ {% blocktrans %}You can delete the resources using search url.{% endblocktrans %}
+
+
+
+
+
+
+
+
+