Merge pull request #3387 from BookStackApp/editor_switching

Page editor switching

diff --combined resources/views/pages/parts/form.blade.php
index f199b86241ab00d3018c3c50739d2771b186c8fa,cec11462dc464016e7d8eb9c2d671633e2700124..8da5cbf39887af42f3ca1a172e411bfdf2c4b95b
--- 1/resources/views/pages/parts/form.blade.php
--- 2/resources/views/pages/parts/form.blade.php
+++ b/resources/views/pages/parts/form.blade.php
@@@ -1,71 -1,22 +1,22 @@@
  <div component="page-editor" class="page-editor flex-fill flex"
       option:page-editor:drafts-enabled="{{ $draftsEnabled ? 'true' : 'false' }}"
       @if(config('services.drawio'))
 -        drawio-url="{{ is_string(config('services.drawio')) ? config('services.drawio') : 'https://embed.diagrams.net/?embed=1&proto=json&spin=1' }}"
 +        drawio-url="{{ is_string(config('services.drawio')) ? config('services.drawio') : 'https://embed.diagrams.net/?embed=1&proto=json&spin=1&configure=1' }}"
       @endif
       @if($model->name === trans('entities.pages_initial_name'))
          option:page-editor:has-default-title="true"
       @endif
-      option:page-editor:editor-type="{{ setting('app-editor') }}"
+      option:page-editor:editor-type="{{ $editor }}"
       option:page-editor:page-id="{{ $model->id ?? '0' }}"
-      option:page-editor:page-new-draft="{{ ($model->draft ?? false) ? 'true' : 'false' }}"
-      option:page-editor:draft-text="{{ ($model->draft || $model->isDraft) ? trans('entities.pages_editing_draft') : trans('entities.pages_editing_page') }}"
+      option:page-editor:page-new-draft="{{ $isDraft ? 'true' : 'false' }}"
+      option:page-editor:draft-text="{{ ($isDraft || $isDraftRevision) ? trans('entities.pages_editing_draft') : trans('entities.pages_editing_page') }}"
       option:page-editor:autosave-fail-text="{{ trans('errors.page_draft_autosave_fail') }}"
       option:page-editor:editing-page-text="{{ trans('entities.pages_editing_page') }}"
       option:page-editor:draft-discarded-text="{{ trans('entities.pages_draft_discarded') }}"
       option:page-editor:set-changelog-text="{{ trans('entities.pages_edit_set_changelog') }}">
  
-     {{--Header Bar--}}
-     <div class="primary-background-light toolbar page-edit-toolbar">
-         <div class="grid third no-break v-center">
- 
-             <div class="action-buttons text-left px-m py-xs">
-                 <a href="{{ $page->draft ? $page->getParent()->getUrl() : $page->getUrl() }}"
-                    class="text-button text-primary">@icon('back')<span class="hide-under-l">{{ trans('common.back') }}</span></a>
-             </div>
- 
-             <div class="text-center px-m py-xs">
-                 <div component="dropdown"
-                      option:dropdown:move-menu="true"
-                      class="dropdown-container draft-display text {{ $draftsEnabled ? '' : 'hidden' }}">
-                     <button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" title="{{ trans('entities.pages_edit_draft_options') }}" class="text-primary text-button"><span refs="page-editor@draftDisplay" class="faded-text"></span>&nbsp; @icon('more')</button>
-                     @icon('check-circle', ['class' => 'text-pos draft-notification svg-icon', 'refs' => 'page-editor@draftDisplayIcon'])
-                     <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
-                         <li>
-                             <button refs="page-editor@saveDraft" type="button" class="text-pos">@icon('save'){{ trans('entities.pages_edit_save_draft') }}</button>
-                         </li>
-                         @if ($model->draft)
-                         <li>
-                             <a href="{{ $model->getUrl('/delete') }}" class="text-neg">@icon('delete'){{ trans('entities.pages_edit_delete_draft') }}</a>
-                         </li>
-                         @endif
-                         <li refs="page-editor@discardDraftWrap" class="{{ ($model->isDraft ?? false) ? '' : 'hidden' }}">
-                             <button refs="page-editor@discardDraft" type="button" class="text-neg">@icon('cancel'){{ trans('entities.pages_edit_discard_draft') }}</button>
-                         </li>
-                     </ul>
-                 </div>
-             </div>
- 
-             <div class="action-buttons px-m py-xs">
-                 <div component="dropdown" dropdown-move-menu class="dropdown-container">
-                     <button refs="dropdown@toggle" type="button" aria-haspopup="true" aria-expanded="false" class="text-primary text-button">@icon('edit') <span refs="page-editor@changelogDisplay">{{ trans('entities.pages_edit_set_changelog') }}</span></button>
-                     <ul refs="dropdown@menu" class="wide dropdown-menu">
-                         <li class="px-l py-m">
-                             <p class="text-muted pb-s">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
-                             <input refs="page-editor@changelogInput"
-                                    name="summary"
-                                    id="summary-input"
-                                    type="text"
-                                    placeholder="{{ trans('entities.pages_edit_enter_changelog') }}" />
-                         </li>
-                     </ul>
-                     <span>{{-- Prevents button jumping on menu show --}}</span>
-                 </div>
- 
-                 <button type="submit" id="save-button" class="float-left text-primary text-button text-pos-hover hide-under-m">@icon('save')<span>{{ trans('entities.pages_save') }}</span></button>
-             </div>
-         </div>
-     </div>
+     {{--Header Toolbar--}}
+     @include('pages.parts.editor-toolbar', ['model' => $model, 'editor' => $editor, 'isDraft' => $isDraft, 'draftsEnabled' => $draftsEnabled])
  
      {{--Title input--}}
      <div class="title-input page-title clearfix">
@@@ -78,19 -29,35 +29,35 @@@
      <div class="edit-area flex-fill flex">
  
          {{--WYSIWYG Editor--}}
-         @if(setting('app-editor') === 'wysiwyg')
+         @if($editor === 'wysiwyg')
              @include('pages.parts.wysiwyg-editor', ['model' => $model])
          @endif
  
          {{--Markdown Editor--}}
-         @if(setting('app-editor') === 'markdown')
+         @if($editor === 'markdown')
              @include('pages.parts.markdown-editor', ['model' => $model])
          @endif
  
      </div>
  
+     {{--Mobile Save Button--}}
      <button type="submit"
              id="save-button-mobile"
              title="{{ trans('entities.pages_save') }}"
              class="text-primary text-button hide-over-m page-save-mobile-button">@icon('save')</button>
+ 
+     {{--Editor Change Dialog--}}
+     @component('common.confirm-dialog', ['title' => trans('entities.pages_editor_switch_title'), 'ref' => 'page-editor@switchDialog'])
+         <p>
+             {{ trans('entities.pages_editor_switch_are_you_sure') }}
+             <br>
+             {{ trans('entities.pages_editor_switch_consider_following') }}
+         </p>
+ 
+         <ul>
+             <li>{{ trans('entities.pages_editor_switch_consideration_a') }}</li>
+             <li>{{ trans('entities.pages_editor_switch_consideration_b') }}</li>
+             <li>{{ trans('entities.pages_editor_switch_consideration_c') }}</li>
+         </ul>
+     @endcomponent
  </div>