From: Vincent Vanwaelscappel Date: Wed, 22 Feb 2023 18:36:40 +0000 (+0100) Subject: wait #5750 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=603a67e320fb37e43f208d56e5fab4370d473b8d;p=fluidbook-toolbox.git wait #5750 @1 --- diff --git a/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php index 63d3dfa0e..6105a4cd7 100644 --- a/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php +++ b/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers\Admin\Operations\ELearningMedia; +// __('!! e-Learning') + use App\Jobs\ElearningMediaDownload; use App\Models\ELearningMedia; use Illuminate\Support\Facades\Route; diff --git a/app/Http/Controllers/Admin/Operations/ELearningMedia/ImportOperation.php b/app/Http/Controllers/Admin/Operations/ELearningMedia/ImportOperation.php index cd16b0346..07691e6ca 100644 --- a/app/Http/Controllers/Admin/Operations/ELearningMedia/ImportOperation.php +++ b/app/Http/Controllers/Admin/Operations/ELearningMedia/ImportOperation.php @@ -1,5 +1,7 @@ 'traductions', 'oneinstance' => true]; + protected $_enableTrackEmptyValues = true; + public function getPaths() { return array_merge(parent::getPaths(), ['vendor/cubedesigners']); diff --git a/app/SubForms/CollectionPublication.php b/app/SubForms/CollectionPublication.php index bf42404c5..34e4c8245 100644 --- a/app/SubForms/CollectionPublication.php +++ b/app/SubForms/CollectionPublication.php @@ -5,7 +5,7 @@ namespace App\SubForms; use App\Fields\FluidbookID; use Cubist\Backpack\Magic\Fields\Text; use Cubist\Backpack\Magic\SubForm; - +// __('!! Collections de fluidbooks') class CollectionPublication extends SubForm { public function init() diff --git a/app/SubForms/ElearningPackageContent.php b/app/SubForms/ElearningPackageContent.php index 4f28abfe2..052ee6a48 100644 --- a/app/SubForms/ElearningPackageContent.php +++ b/app/SubForms/ElearningPackageContent.php @@ -14,6 +14,7 @@ use Cubist\Backpack\Magic\Fields\Text; use Cubist\Backpack\Magic\SubForm; +// __('!! e-Learning') class ElearningPackageContent extends SubForm { public function init() diff --git a/app/SubForms/FluidbookChapter.php b/app/SubForms/FluidbookChapter.php index 7e3987055..eded3bf66 100644 --- a/app/SubForms/FluidbookChapter.php +++ b/app/SubForms/FluidbookChapter.php @@ -8,7 +8,7 @@ use Cubist\Backpack\Magic\Fields\Field; use Cubist\Backpack\Magic\Fields\SelectFromArray; use Cubist\Backpack\Magic\Fields\Text; use Cubist\Backpack\Magic\SubForm; - +// __('!! Paramètres des fluidbooks') class FluidbookChapter extends SubForm { public function init() diff --git a/app/SubForms/FluidbookTranslationOverwrite.php b/app/SubForms/FluidbookTranslationOverwrite.php index 9bdbbc03d..242d86564 100644 --- a/app/SubForms/FluidbookTranslationOverwrite.php +++ b/app/SubForms/FluidbookTranslationOverwrite.php @@ -6,7 +6,7 @@ use App\Fields\FluidbookTranslatedString; use Cubist\Backpack\Magic\Fields\Text; use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; use Cubist\Backpack\Magic\SubForm; - +// __('!! Paramètres des fluidbooks') class FluidbookTranslationOverwrite extends SubForm { public function init() diff --git a/app/SubForms/Fluidbook_Setting.php b/app/SubForms/Fluidbook_Setting.php deleted file mode 100644 index 5b25ddc8a..000000000 --- a/app/SubForms/Fluidbook_Setting.php +++ /dev/null @@ -1,17 +0,0 @@ -addField('key', Text::class, __('Nom du paramètre')); - $this->addField('value', Textarea::class, __('Valeur')); - } -} diff --git a/app/SubForms/Link/Anchor.php b/app/SubForms/Link/Anchor.php index c1aff03d7..a292faf95 100644 --- a/app/SubForms/Link/Anchor.php +++ b/app/SubForms/Link/Anchor.php @@ -1,7 +1,7 @@ =5.4.0" }, "require-dev": { - "orchestra/testbench": "~3.0" + "orchestra/testbench": "~3.0|^8.0" }, "type": "library", "extra": { @@ -12395,7 +12395,7 @@ "issues": "https://github.com/VentureCraft/revisionable/issues", "source": "https://github.com/VentureCraft/revisionable" }, - "time": "2022-01-20T05:56:12+00:00" + "time": "2023-02-18T01:49:34+00:00" }, { "name": "vlucas/phpdotenv", @@ -13295,16 +13295,16 @@ }, { "name": "laravel/tinker", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad" + "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad", - "reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad", + "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", + "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", "shasum": "" }, "require": { @@ -13357,9 +13357,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.8.0" + "source": "https://github.com/laravel/tinker/tree/v2.8.1" }, - "time": "2023-01-10T18:03:30+00:00" + "time": "2023-02-15T16:40:09+00:00" }, { "name": "mockery/mockery", diff --git a/resources/views/elearningmedia/index.blade.php b/resources/views/elearningmedia/index.blade.php index 3ba358a15..27e725996 100644 --- a/resources/views/elearningmedia/index.blade.php +++ b/resources/views/elearningmedia/index.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! e-Learning') --}} diff --git a/resources/views/fields/fluidbook_chapter_level.blade.php b/resources/views/fields/fluidbook_chapter_level.blade.php index 9ac99dd14..7fe3440f6 100644 --- a/resources/views/fields/fluidbook_chapter_level.blade.php +++ b/resources/views/fields/fluidbook_chapter_level.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Paramètres des fluidbooks') --}} @php $v=old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; if(!is_string($v)){ diff --git a/resources/views/fields/fluidbook_chapters.blade.php b/resources/views/fields/fluidbook_chapters.blade.php index 64498e54d..b1bcbd4e3 100644 --- a/resources/views/fields/fluidbook_chapters.blade.php +++ b/resources/views/fields/fluidbook_chapters.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Paramètres des fluidbooks') --}} @if (!isset($seenFluidbookChapters)) @php $seenFluidbookChapters=true;@endphp @push('crud_fields_scripts') diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php index 2a97cc0f5..df603fa73 100644 --- a/resources/views/fields/fluidbook_composition.blade.php +++ b/resources/views/fields/fluidbook_composition.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Paramètres des fluidbooks') --}} @if (!isset($seenFluidbookComposition)) @php $seenFluidbookComposition=true;@endphp @push('crud_fields_scripts') diff --git a/resources/views/fields/fluidbook_theme_selector.blade.php b/resources/views/fields/fluidbook_theme_selector.blade.php index bac499d93..0abe85cfb 100644 --- a/resources/views/fields/fluidbook_theme_selector.blade.php +++ b/resources/views/fields/fluidbook_theme_selector.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Paramètres des thèmes') --}} @if (!isset($seenThemeSelector)) @php $seenThemeSelector=true;@endphp @push('crud_fields_scripts') diff --git a/resources/views/fields/fluidbook_translation_overwrite.blade.php b/resources/views/fields/fluidbook_translation_overwrite.blade.php index 77e2a496e..ef94358b6 100644 --- a/resources/views/fields/fluidbook_translation_overwrite.blade.php +++ b/resources/views/fields/fluidbook_translation_overwrite.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Paramètres des fluidbooks') --}} @if (!isset($seenTranslationOverwrite)) @php $seenTranslationOverwrite=true;@endphp @push('crud_fields_scripts') diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php index f40526dbd..5480cd697 100644 --- a/resources/views/fluidbook_publication/link_editor.blade.php +++ b/resources/views/fluidbook_publication/link_editor.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Editeur de liens') --}} @php $title='#'.$id.' - '.__('Editeur de liens'); /** @var $fluidbook \App\Models\FluidbookPublication */ diff --git a/resources/views/fluidbook_publication/link_editor_form.blade.php b/resources/views/fluidbook_publication/link_editor_form.blade.php index 486ef2810..6c35ab66a 100644 --- a/resources/views/fluidbook_publication/link_editor_form.blade.php +++ b/resources/views/fluidbook_publication/link_editor_form.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Editeur de liens') --}} @php start_measure('Render form '.$form->getTitle()); $action='create'; diff --git a/resources/views/fluidbook_publication/link_editor_icons.blade.php b/resources/views/fluidbook_publication/link_editor_icons.blade.php index 1250c8014..9d3cea4b5 100644 --- a/resources/views/fluidbook_publication/link_editor_icons.blade.php +++ b/resources/views/fluidbook_publication/link_editor_icons.blade.php @@ -1,3 +1,4 @@ +{{-- __('!! Editeur de liens') --}}