wip #7634 @1:30

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
index 8e7c1b0b8f0ecb2c54cba47bcee2edb2c77b08bc..25fd881e11f758d2260ee2956c3d5dd0c83f9f50 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
@@ -34,7 +34,6 @@ trait MarkdownOperation
         $file = $dir . 'latest.markdown3.gz';
         $basefile = $dir . 'latest.markdown.gz';
         $latest = json_decode(gzdecode(file_get_contents($file))) == "[]" ? gzdecode(file_get_contents($basefile)) : gzdecode(file_get_contents($file));
-        //dd(gzdecode(file_get_contents($file)) === "[]");
         $fluidbook=FluidbookPublication::find($id);
         $isArray = gettype(json_decode($latest,true));
         $contents=($isArray === "array" ? json_decode($latest,true) : json_decode(json_decode($latest, true),true)) ?? $fluidbook->getAccessibleContents()['pages'];
@@ -49,7 +48,7 @@ trait MarkdownOperation
         }
 
         $markdowns = request('markdowns', $md);
-        $comments = $message ?? request('message');
+        $comments = request('message', $message);
         $user_id = backpack_user()->id;
 
         /** @var FluidbookPublication $fluidbook */
@@ -137,8 +136,8 @@ trait MarkdownOperation
         $dir = self::getMarkdownsDir($fluidbook_id);
         $markdowns = Files::firstThatExists($dir . '/' . $version . '.markdown3.gz', $dir . '/' . $version . '.markdown.gz');
         $markdowns = gzdecode(file_get_contents($markdowns));
-        $this->saveMarkdown($fluidbook_id, __('Restaurer la sauvegarde des liens :date', ['date' => date('Y-m-d H:i:s', $version)]), $markdowns);
+        $this->saveMarkdown($fluidbook_id, __('Restaurer la sauvegarde du markdown :date', ['date' => date('Y-m-d H:i:s', $version)]), $markdowns);
 
-        //return response()->json(['success' => 'ok']);
+        return response()->json(['success' => 'ok']);
     }
 }

diff --git a/resources/markdowneditor/js/markdowneditor.js b/resources/markdowneditor/js/markdowneditor.js
index 10f2fecfe143b08fb4e6b5c2856cdbcb325997b2..bf3113f831279887b8fd47ca7331ca3b7d7b1bf5 100644 (file)
--- a/resources/markdowneditor/js/markdowneditor.js
+++ b/resources/markdowneditor/js/markdowneditor.js
@@ -263,6 +263,11 @@ MarkdownEditor.prototype = {
         }
     },
 
+    toggleRevisions: function() {
+        console.log("ok")
+        $("#markdown-revision").width("25%")
+    }
+
     /*isSpecialPage: function (page) {
         if (page === undefined) {
             page = this.linkeditor.currentPage;

diff --git a/resources/markdowneditor/js/markdowneditor.save.js b/resources/markdowneditor/js/markdowneditor.save.js
index 20c91fa6461e949d17e019b2c5d315273498fa1c..6ac7cfe2d9ca60e6a74f47123af2bc3af5ca1c1a 100644 (file)
--- a/resources/markdowneditor/js/markdowneditor.save.js
+++ b/resources/markdowneditor/js/markdowneditor.save.js
@@ -43,6 +43,7 @@ MarkdowneditorSave.prototype = {
     },
 
     save: function (message, notify, callback) {
+        console.log(message)
         if (notify === undefined) {
             notify = true;
         }

diff --git a/resources/views/fluidbook_publication/markdown_editor.blade.php b/resources/views/fluidbook_publication/markdown_editor.blade.php
index 7c66caae0aadaa1925b7f5202493c79786890a1e..616f0081168282c04695d1ec1f8ce22118095ae7 100644 (file)
--- a/resources/views/fluidbook_publication/markdown_editor.blade.php
+++ b/resources/views/fluidbook_publication/markdown_editor.blade.php
@@ -11,7 +11,7 @@
         'automatic_save_message'=>__('Sauvegarde automatique'),
         'warning_unsaved_changes'=>__('Des données n\'ont pas été sauvegardées'),
         'before_export_save_message'=>__("Sauvegarde avant export"),
-        'before_restore_message'=>__("Sauvegarde avant la restauration des liens"),
+        'before_restore_message'=>__("Sauvegarde avant la restauration du markdown"),
         'upload_save_message'=>__("Après l'upload d'un fichier"),
         'restore_version_tooltip'=>__('Restaurer cette version'),
         'export_version_tooltip'=>__('Exporter les liens au format xlsx'),
@@ -73,7 +73,7 @@
         <div id="markdown-revision" class="markdown-revision">
             <div class="markdown-revision-nav">
                 <a href="#" id="linkeditor-icon-versions" data-panel="form" data-icon="wayback-machine"
-                   data-action="panels.toggleForm"
+                   data-action="toggleRevisions"
                    data-tooltip="{{__('Paramètres du lien')}} (F8)" data-key="f8"></a>
             </div>
             <div class="markdown-revision-panel">