tonyair
/
silverstripe-webpack
mirror of https://github.com/a2nt/silverstripe-webpack.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

IMPR: Minor updates

This commit is contained in:
Tony Air 2020-08-02 22:40:05 +07:00
parent 883504ee6e
commit e50f0fe80a
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/Elements/MapElement.php
View File

@ -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;
}

28
app/templates/Includes/SiteWideMessage.ss
View File

@ -1,15 +1,17 @@
<div id="SiteWideMessage">
<div class="offline-message">
<div class="alert alert-fixed-top alert-danger alert-offline">
<div class="$DefaultContainer">
<b class="btn btn-danger btn-close" data-dismiss="alert" aria-label="Close">
<i class="fas fa-times"></i>
</b>
The Internet connection is missing right now, but you're able to browse previously opened pages offline.
</div>
<div id="SiteWideOffline" class="offline-message">
<div class="alert alert-fixed-top alert-danger alert-offline">
<div class="$DefaultContainer">
<div class="typography">
The Internet connection is missing right now, but you're able to browse previously opened pages offline.
</div>
<b class="btn btn-danger btn-close" data-dismiss="alert" aria-label="Close">
<i class="fas fa-times"></i>
</b>
</div>
</div>
</div>
<div id="SiteWideMessage">
<% if $SiteWideMessage %>
<div class="single-message">
<div class="alert alert-fixed-top alert-{$Type}">
@ -23,9 +25,7 @@
</div>
<% 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 %>
</div>

10
package.json
View File

@ -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",