forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge develop

Browse source
This commit is contained in:
Vincent BRIDIER 2022-04-07 09:16:14 +02:00
commit 5aaf5c642b
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/js/components/media-manager/BasketComponent.vue
View file

@ -228,8 +228,8 @@
let d = new Date();
let strDate = ("0" + d.getDate()).slice(-2) + "/" + ("0" + (d.getMonth() + 1)).slice(-2) + "/" + d.getFullYear();
let defaultTitle = "Panier du " + strDate;
let title = prompt("Indiquez le libellé de votre nouveau panier", defaultTitle);
if (title !== "") {
let title = prompt("Indiquez le libellé de votre nouveau panier", defaultTitle) ?? ''
if (title.length) {
this.$loading.show({delay:0});
axios.post('/ajax/add-basket', {
title: title,

18
resources/views/layouts/app.blade.php
View file

@ -7,12 +7,12 @@
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Styles -->
<link href="{{ asset('css/jquery.fancybox.min.css') }}" rel="stylesheet">
<link href="{{ asset('css/app.css') }}?ver=2.2" rel="stylesheet">
<link href="{{ asset('css/solid.css') }}?ver=1.0" rel="stylesheet">
<link href="{{ asset('css/brands.css') }}?ver=1.0" rel="stylesheet">
<link href="{{ asset('css/regular.css') }}?ver=1.0" rel="stylesheet">
<link href="{{ asset('css/fontawesome.css') }}?ver=1.0" rel="stylesheet">
<link href="{{ mix('css/jquery.fancybox.min.css') }}" rel="stylesheet">
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
<link href="{{ mix('css/solid.css') }}" rel="stylesheet">
<link href="{{ mix('css/brands.css') }}" rel="stylesheet">
<link href="{{ mix('css/regular.css') }}" rel="stylesheet">
<link href="{{ mix('css/fontawesome.css') }}" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-148734400-1"></script>
@ -27,7 +27,7 @@
gtag('config', 'UA-148734400-1');
</script>
<script src="{{ asset('js/openseadragon.min.js') }}"></script>
<script src="{{ mix('js/openseadragon.min.js') }}"></script>
</head>
<body>
<div id="vue-app" style="display: inline;">
@ -62,8 +62,8 @@
@yield('media_edit')
</div>
<!-- Scripts -->
<script src="{{ asset('js/jquery.fancybox.min.js') }}" defer></script>
<script src="{{ asset('js/app.js') }}?ver=2.2"></script>
<script src="{{ mix('js/jquery.fancybox.min.js') }}" defer></script>
<script src="{{ mix('js/app.js') }}"></script>
@yield('scripts')
</body>
</html>

8
resources/views/media_manager.blade.php
View file

@ -28,10 +28,10 @@
@endsection
@section('scripts')
<!-- TODO : Faire le tri des js ci-dessous -->
<script src="{{ asset('js/jquery.nestable.min.js') }}" defer></script>
<script src="{{ mix('js/jquery.nestable.min.js') }}" defer></script>
<script src="{{ asset('js/uploadfile/vendor/jquery.ui.widget.js') }}"></script>
<script src="{{ asset('js/uploadfile/jquery.iframe-transport.js') }}"></script>
<script src="{{ asset('js/fabric.js') }}"></script>
<script src="{{ asset('js/darkroom.js') }}"></script>
<script src="{{ asset('js/jquery.caret.min.js') }}"></script>
<script src="{{ mix('js/fabric.js') }}"></script>
<script src="{{ mix('js/darkroom.js') }}"></script>
<script src="{{ mix('js/jquery.caret.min.js') }}"></script>
@endsection

2
webpack.mix.js vendored
View file

@ -49,7 +49,7 @@ mix.js([
enabled: true,
useBuiltIns: "usage",
targets: { "firefox": "50", "ie": 11 }
});
}).version();
// * COPY JS STATIC VENDORS
mix.copyDirectory('resources/vendor/js', "public/js");