wip #5631 @1

diff --git a/resources/linkeditor/js/linkeditor.panels.js b/resources/linkeditor/js/linkeditor.panels.js
index fe3d02c02ca93e8299536d62bea61be83ffa9ab7..b4c0b167d142f6d8adf95a8ea47e7387dc063ada 100644 (file)
--- a/resources/linkeditor/js/linkeditor.panels.js
+++ b/resources/linkeditor/js/linkeditor.panels.js
@@ -15,8 +15,6 @@ LinkeditorPanels.prototype = {
             var width = $this.normalizeWidth($this.linkeditor.settings.get(tool + '_width'));
             var icon = $("#linkeditor-icon-" + tool);
             var panelContainer = $("#linkeditor-" + side + '-panel').data('tool', tool);
-
-            $("#linkeditor-" + side + '-icons').append(icon);
             panelContainer.append($("#linkeditor-panel-" + tool));
             if (open) {
                 icon.addClass('active');

diff --git a/resources/linkeditor/style/panels.sass b/resources/linkeditor/style/panels.sass
index fb87cb597aa67940b23646492fcdf802a08f3e4a..f71cf7a5d27dadb1ebe3437b927ae7f85815d653 100644 (file)
--- a/resources/linkeditor/style/panels.sass
+++ b/resources/linkeditor/style/panels.sass
@@ -13,10 +13,10 @@
         height: 100%
 
         [data-icon]
-            display: inline-block
+            display: block
             vertical-align: top
             height: 30px
-            min-width: 30px
+            width: 30px
             padding: 5px
             border-radius: 5px
             margin: 6px 0 0 7px

diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 22a87ba7aeb67f78aaffebadc00700a4f644d07c..b3ef3d1f97860c2d1d51e112c281c1d052e7fbce 100644 (file)
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -33,12 +33,6 @@
     @include('fluidbook_publication.link_editor_icons')
     <div draggable="false" id="linkeditor">
         <div style="display: none" id="panels-setups">
-            <a href="#" id="linkeditor-icon-layers" data-icon="layers" data-action="panels.toggleLayers"
-               data-tooltip="{{__('Liste des liens')}} (F7)"
-               data-key="f7"></a>
-            <a href="#" id="linkeditor-icon-form" data-icon="settings" data-action="panels.toggleForm"
-               data-tooltip="{{__('Paramètres du lien')}} (F8)"
-               data-key="f8"></a>
             <div id="linkeditor-panel-layers">
             </div>
             <div id="linkeditor-panel-form">
@@ -46,7 +40,11 @@
         </div>
         <aside id="linkeditor-left" class="linkeditor-sidebar" data-side="left">
             <nav id="linkeditor-left-icons">
-
+                <a href="#" id="linkeditor-icon-layers" data-icon="layers" data-action="panels.toggleLayers"
+                   data-tooltip="{{__('Liste des liens')}} (F7)"
+                   data-key="f7"></a>
+                <a href="#" id="linkeditor-icon-versions" data-action="panels.toggleVersions" data-icon="wayback-machine"
+                   data-tooltip="{{__('Restaurer une version précédente')}} (F6)" data-key="f6"></a>
             </nav>
             <div id="linkeditor-left-panel" class="linkeditor-panel">
 
@@ -58,8 +56,6 @@
                 <nav id="linkeditor-toolbar-left">
                     <a href="#" data-icon="save" data-action="save.save" data-tooltip="{{__('Sauvegarder')}} (Ctrl+S)"
                        data-key="ctrl+s"></a>
-                    <a href="#" data-action="openVersions" data-icon="wayback-machine"
-                       data-tooltip="{{__('Restaurer une version précédente')}}"></a>
                     <div class="separator"></div>
                     <a href="#" data-action="zoom.reset" data-icon="zoom-reset"
                        data-tooltip="{{__('Réinitialiser le zoom')}} (Esc)" data-key="esc, ctrl+0, ctrl+numpad0"></a>
@@ -115,7 +111,9 @@
             </div>
         </div>
         <aside id="linkeditor-right" class="linkeditor-sidebar" data-side="right">
-            <nav id="linkeditor-right-icons"></nav>
+            <nav id="linkeditor-right-icons">            <a href="#" id="linkeditor-icon-form" data-icon="settings" data-action="panels.toggleForm"
+                                                            data-tooltip="{{__('Paramètres du lien')}} (F8)"
+                                                            data-key="f8"></a></nav>
             <div id="linkeditor-right-panel" class="linkeditor-panel"></div>
             <div class="handle"></div>
         </aside>