From e50f0fe80aaa9e59a3b2064d9212785452dc3dc6 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Sun, 2 Aug 2020 22:40:05 +0700 Subject: [PATCH] IMPR: Minor updates --- app/src/Elements/MapElement.php | 2 ++ app/templates/Includes/SiteWideMessage.ss | 28 +++++++++++------------ package.json | 10 ++++---- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/src/Elements/MapElement.php b/app/src/Elements/MapElement.php index 64451e4..bff0578 100644 --- a/app/src/Elements/MapElement.php +++ b/app/src/Elements/MapElement.php @@ -10,6 +10,7 @@ namespace Site\Elements; use A2nt\SilverStripeMapboxField\MapboxField; use BetterBrief\GoogleMapField; +use Colymba\BulkManager\BulkManager; use DNADesign\Elemental\Models\ElementContent; use SilverStripe\Core\Config\Config; use SilverStripe\Forms\FieldList; @@ -70,6 +71,7 @@ class MapElement extends ElementContent return $v ? 'YES' : 'NO'; } ]); + $cfg->addComponent(new BulkManager()); return $fields; } diff --git a/app/templates/Includes/SiteWideMessage.ss b/app/templates/Includes/SiteWideMessage.ss index 0c54194..318329d 100644 --- a/app/templates/Includes/SiteWideMessage.ss +++ b/app/templates/Includes/SiteWideMessage.ss @@ -1,15 +1,17 @@ -
-
-
-
- - - - The Internet connection is missing right now, but you're able to browse previously opened pages offline. -
+
+
+
+
+ The Internet connection is missing right now, but you're able to browse previously opened pages offline. +
+ + +
+
+
<% if $SiteWideMessage %>
@@ -23,9 +25,7 @@
<% end_if %> - <% if $URLSegment = 'home' && $Action = 'index' %> - <% with $SiteConfig %> - <% include Site\Objects\NotificationsList %> - <% end_with %> - <% end_if %> + <% with $SiteConfig %> + <% include Site\Objects\NotificationsList NotificationsToday=$NotificationsToday.filter('Area', 'Site') %> + <% end_with %>
diff --git a/package.json b/package.json index faa0a20..e307ecb 100755 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ ], "dependencies": { "@a2nt/meta-lightbox": "^2.2.1", - "@a2nt/ss-bootstrap-ui-webpack-boilerplate": "^2.3.6", + "@a2nt/ss-bootstrap-ui-webpack-boilerplate": "^2.3.7", "bootbox": "^4.4.0", "bootstrap": "^4.5.0", "bootstrap-confirmation2": "^4.1.0", @@ -64,13 +64,13 @@ }, "devDependencies": { "@a2nt/image-sprite-webpack-plugin": "^0.2.5", - "@babel/core": "^7.10.5", - "@babel/plugin-proposal-object-rest-spread": "^7.10.4", + "@babel/core": "^7.11.0", + "@babel/plugin-proposal-object-rest-spread": "^7.11.0", "@babel/plugin-transform-react-jsx": "^7.10.4", - "@babel/preset-env": "^7.10.4", + "@babel/preset-env": "^7.11.0", "@google/markerclusterer": "^1.0.3", "animate.css": "^3.7.2", - "autoprefixer": "^9.8.5", + "autoprefixer": "^9.8.6", "babel-eslint": "^8.2.6", "babel-loader": "^8.1.0", "copy-webpack-plugin": "^4.6.0",