From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 24 Jan 2024 12:03:15 +0000 (+0100)
Subject: Merge branch 'backpack5' into quiz3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ccf545984e870e02e7b76ba029c44d0b8ce3cf7c;p=fluidbook-toolbox.git

Merge branch 'backpack5' into quiz3

# Conflicts:
#	resources/linkeditor/js/linkeditor.js
---

ccf545984e870e02e7b76ba029c44d0b8ce3cf7c
diff --cc resources/views/fluidbook_publication/link_editor.blade.php
index ea97c860e,0f9f8db80..170f67255
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@@ -141,15 -137,12 +141,16 @@@
  
  @section('content')
      @include('fluidbook_publication.link_editor_icons')
 +    <div id="token" data-token="{{$token}}"></div>
 +    @isset($connexionInfo)
 +        <div id="token-cache" data-token="{{$connexionInfo['token']}}"></div>
 +    @endisset
 +    <div id="userID" data-id="{{backpack_user()->id}}"></div>
      <div id="popup-overlay">
          <div id="popup-holder">
 -
          </div>
      </div>
+     <div id="loader"></div>
      <div id="popup-templates">
          <div class="popup" data-popup="moveLinks" style="max-width: 300px">
              <h2>{{__('Déplacer les liens')}}</h2>