Fix styles, #10186

archesproject · Oct 26, 2023 · a661753 · a661753
1 parent d156ddc
commit a661753
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/arches/app/media/css/arches.scss b/arches/app/media/css/arches.scss
@@ -13706,13 +13706,17 @@ ul.select2-choices:after {
     font-weight: 400;
 }
 
-.etl-module-body section h3 {
+.etl-module-body section h3, .etl-module-subtitle {
     font-size: 15px;
     color: #565656;
-    font-weight: 300;
+    font-weight: normal;
     margin: 10px 0px 5px 0px;
 }
 
+.etl-module-body section .switch-small {
+    margin: 0px 8px 3px;
+}
+
 .etl-module-body section .etl-module-component-block {
     padding-bottom: 15px;
 }

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
@@ -78,6 +78,7 @@ define([
                     )
                 );
             }).always( function(){
+                self.deleteAllFormData();
                 self.counting(false);
             });
         };

diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm
@@ -778,6 +778,8 @@
         count-of-tiles-deleted='(count) => {return {% trans "Tiles deleted: ${count}" as countOfTilesDeleted %} `{{ countOfTilesDeleted|escapejs }}` }'
         delete-tile-count='(tile, resource) => {return {% trans "${tile} tiles from ${resource} resources will be deleted" as deleteTileCount %} `{{ deleteTileCount|escapejs }}` }'
         delete-resource-count='(resource) => {return {% trans "${resource} resources will be deleted" as deleteResourceCount %} `{{ deleteResourceCount|escapejs }}` }'
+        delete-tiles='{% trans "Delete Tiles" as deleteTiles %} "{{ deleteTiles|escapejs }}"'
+        delete-resources='{% trans "Delete Resources" as deleteResources %} "{{ deleteResources|escapejs }}"'
         bulk-edit-limit-warning='(limit) => {return {% trans "For safety, only ${limit} bulk edits are allowed at a time.  If you need to edit more than ${limit} entries, you will need to perform the operation multiple times." as bulkEditLimitWarning %} `{{ bulkEditLimitWarning|escapejs }}`}'
         show='{% trans "show" as show %} "{{ show|escapejs }}"'
         hide='{% trans "hide" as hide %} "{{ hide|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
@@ -12,14 +12,14 @@ <h2>
         {% blocktrans %}Delete The Selected Resources or Tiles{% endblocktrans %}
     </p>
     <section class="etl-module-component">
-        <div class="form-group">
-            <h3>{% trans "Delete Resources" %}</h3>
+        <div class="form-group etl-module-component-block">
+            <span class="etl-module-subtitle" data-bind="text: $root.translations.deleteResources"></span>
             <span class="switch switch-small" tabindex="0" role="switch"
                 data-bind="
                     css: {'on': deleteTiles()},
                     click: function(){deleteTiles(!deleteTiles())}
                 "><small></small></span>
-            <h3>{% trans "Delete Tiles" %}</h3>
+            <span class="etl-module-subtitle" data-bind="text: $root.translations.deleteTiles"></span>
         </div>
         <div class="etl-module-component-block">
             <h3>
@@ -90,7 +90,7 @@ <h3>
         </p>
         <!-- /ko -->
         <!-- ko if: showCount() && !deleteTiles() -->
-        <p>
+        <p style="margin-top: 15px;" >
             <i class="fa fa-info-circle"></i>
             <span data-bind="text: $root.translations.deleteResourceCount(numberOfResources())"></span>
         </p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,7 @@ define([ @@
                         )
                     );
                 }).always( function(){
+                    self.deleteAllFormData();
                     self.counting(false);
                 });
             };
@@ Expand Down @@