Commit d64f51b4 authored by Nicolas Widart's avatar Nicolas Widart

Squashed 'Modules/Media/' changes from 7c04ced..b312928

b312928 Translate file management messages
8d8cab1 Ordering the table by descending order
267a63f Check for a configuration file

git-subtree-dir: Modules/Media
git-subtree-split: b312928a19760d6aed9b8addde6701f53c191af9
parent a7e188a1
...@@ -95,7 +95,7 @@ class MediaController extends AdminBaseController ...@@ -95,7 +95,7 @@ class MediaController extends AdminBaseController
{ {
$this->file->update($file, $request->all()); $this->file->update($file, $request->all());
Flash::success('File updated'); Flash::success(trans('media::messages.file updated'));
return Redirect::route('dashboard.media.index'); return Redirect::route('dashboard.media.index');
} }
...@@ -111,7 +111,7 @@ class MediaController extends AdminBaseController ...@@ -111,7 +111,7 @@ class MediaController extends AdminBaseController
$this->imagy->deleteAllFor($file); $this->imagy->deleteAllFor($file);
$this->file->destroy($file); $this->file->destroy($file);
Flash::success('File deleted'); Flash::success(trans('media::messages.file deleted'));
return Redirect::route('dashboard.media.index'); return Redirect::route('dashboard.media.index');
} }
} }
...@@ -31,7 +31,7 @@ class ThumbnailsManager ...@@ -31,7 +31,7 @@ class ThumbnailsManager
$thumbnails = []; $thumbnails = [];
foreach ($this->module->enabled() as $enabledModule) { foreach ($this->module->enabled() as $enabledModule) {
$configuration = $this->config->get(strtolower($enabledModule->getName()) . '::thumbnails'); $configuration = $this->config->get(strtolower($enabledModule->getName()) . '::thumbnails');
$thumbnails = array_merge($thumbnails, $configuration); if (!is_null($configuration)) $thumbnails = array_merge($thumbnails, $configuration);
} }
return $thumbnails; return $thumbnails;
......
<?php
return [
'file updated' => 'File updated',
'file deleted' => 'File deleted',
];
<?php
return [
'file updated' => 'Fichier mit à jour',
'file deleted' => 'File suprimer',
];
...@@ -140,20 +140,21 @@ $( document ).ready(function() { ...@@ -140,20 +140,21 @@ $( document ).ready(function() {
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('.data-table').dataTable({ $('.data-table').dataTable({
"bPaginate": true, "paginate": true,
"bLengthChange": true, "lengthChange": true,
"bFilter": true, "filter": true,
"bSort": true, "sort": true,
"bInfo": true, "info": true,
"bAutoWidth": true, "autoWidth": true,
"oLanguage": { "order": [[ 0, "desc" ]],
"sUrl": '<?php echo Module::asset("core:js/vendor/datatables/{$locale}.json") ?>' "language": {
"url": '<?php echo Module::asset("core:js/vendor/datatables/{$locale}.json") ?>'
}, },
"aoColumns": [ "columns": [
null, null,
null, null,
null, null,
{ "bSortable": false } { "sortable": false }
] ]
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment