From d8678860cd1488e29a4ef7d7cd0addaaa499526b Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 25 Jan 2023 13:23:51 +0100 Subject: [PATCH] wip #5397 @0.5 --- .../fluidbook/toolbox/css/context-menu.less | 9 +++++++ .../packages/fluidbook/toolbox/css/style.less | 1 + .../fluidbook/toolbox/js/contextdownload.js | 9 +++---- .../fluidbook_publication/download.blade.php | 24 +++++++++++-------- 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 public/packages/fluidbook/toolbox/css/context-menu.less diff --git a/public/packages/fluidbook/toolbox/css/context-menu.less b/public/packages/fluidbook/toolbox/css/context-menu.less new file mode 100644 index 000000000..0edd22355 --- /dev/null +++ b/public/packages/fluidbook/toolbox/css/context-menu.less @@ -0,0 +1,9 @@ +.context-menu-item { + span.small { + display: block; + + span.grey { + opacity: 0.6; + } + } +} diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less index d4392b689..ef6e29e10 100644 --- a/public/packages/fluidbook/toolbox/css/style.less +++ b/public/packages/fluidbook/toolbox/css/style.less @@ -441,4 +441,5 @@ body.embeded { left: 0px; right: 80%; } +@import "context-menu"; diff --git a/public/packages/fluidbook/toolbox/js/contextdownload.js b/public/packages/fluidbook/toolbox/js/contextdownload.js index e030de709..f4500d442 100644 --- a/public/packages/fluidbook/toolbox/js/contextdownload.js +++ b/public/packages/fluidbook/toolbox/js/contextdownload.js @@ -20,15 +20,16 @@ $(function () { if (action.target === undefined) { action.target = '_self'; } + action.isHtmlName = true; } actions[key] = action; }); $.each(actions, function (key, action) { - if(action!=='---------') { - items[key] = {name: action.label}; - }else{ - items[key]=action; + if (action !== '---------') { + items[key] = {name: action.label, isHtmlName: true}; + } else { + items[key] = action; } }); diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php index 6a8313043..fd133dc5a 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php @@ -11,24 +11,28 @@ ]; foreach (\App\Models\FluidbookPublication::getDownloadVersions() as $k=>$v) { $actions['sep_download']='---------'; - if($allVersions || $entry->{'download_'.$k}){ + if($entry->{'download_'.$k}){ $actions['download_'.$k]=[ 'label'=>$v['label'], 'url'=>$basePackage.'/download/'.$k ]; } } - if(can('fluibook-publication:download:install-hosting')){ + if(can('fluibook-publication:download:install-hosting') && ($entry->install_online_hosting || $entry->install_online_ftp || $entry->scorm_enable)){ $actions['sep_install']='---------'; - $actions['install_hosting']=[ - 'label'=>__('Installer sur le serveur d\'hébergement'), - 'url'=> $basePackage.'/install_hosting/online', - ]; + if($entry->install_online_hosting){ + $actions['install_online_hosting']=[ + 'label'=>__('Installer sur le serveur d\'hébergement').' https://hosting.fluidbook.com/'.$entry->install_online_hosting.'', + 'url'=> $basePackage.'/install_hosting/online', + ]; + } - $actions['install_ftp']=[ - 'label'=>__('Installer sur un serveur FTP'), - 'url'=> $basePackage.'/install_ftp/online', - ]; + if($entry->install_online_ftp){ + $actions['install_online_ftp']=[ + 'label'=>__('Installer sur un serveur FTP').' ftp://'.$entry->install_online_ftp.'', + 'url'=> $basePackage.'/install_ftp/online', + ]; + } if($entry->scorm_enable){ $actions['scormcloud']=['label'=>__('Tester sur SCORM Cloud'), -- 2.39.5