From: vincent@cubedesigners.com Date: Thu, 17 Jun 2021 10:56:33 +0000 (+0000) Subject: wait #4542 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fd47bfffb2204381670e44fa7a1deb16ff428d42;p=cubeextranet.git wait #4542 @0.5 --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 55826a78b..bfc79a7b7 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -543,6 +543,7 @@ class wsUrl $versions = array(); $versions['online'] = array('title' => __('Version online') . $default, 'icon' => cubeMedia::silk('page_world.png')); + $versions['sharepoint'] = array('title' => __('Version Sharepoint') . $default, 'icon' => cubeMedia::silk('page_world.png')); $versions['scorm'] = array('title' => __('Version SCORM') . $default, 'icon' => cubeMedia::silk('page_world.png')); $versions['win-inss-html'] = array('title' => __('Version offline') . ' - ' . __('Executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png')); $versions['win-ins-html'] = array('title' => __('Version offline') . ' - ' . __('Installeur Auto-executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png')); @@ -1149,11 +1150,12 @@ html.tall{height:150%}' . "\n"; public static function loadingCompile($url, $book, $theme) { - + global $core; $tcolor = $theme->parametres->couleurL; if ($tcolor == $theme->parametres->backgroundColor) { $tcolor = $theme->parametres->loadingSecColor; } + $res = ''; $res .= ''; $res .= ''; diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 49e5237e4..2dc6545a6 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -758,7 +758,7 @@ class wsBookParametres extends wsParametres 'fieldsnames' => array('themeEnableAfterSearch')); $this->fields['forceCompileOnDownload'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Forcer la compilation lors du téléchargement'), 'grade' => 3); - $this->fields['htmlExtension'] = array('type' => 'text', 'default' => 'html', 'editable' => true, 'label' => __('Extension des fichiers html'), 'grade' => 5, 'hint' => __('Ex : php, htm, html, phtml, asp'), 'grade' => 5); + $this->fields['htmlExtension'] = array('type' => 'text', 'default' => 'html', 'editable' => true, 'label' => __('Extension des fichiers html'), 'grade' => 5, 'hint' => __('Ex : php, htm, html, phtml, asp, aspx'), 'grade' => 5); $this->fields['actualHtmlExtension'] = array('type' => 'text', 'default' => 'html', 'editable' => false, 'label' => __('Extension des fichiers html réellement appliquée au fluidbook'), 'grade' => 5, 'hint' => __('Ex : php, htm, html, phtml, asp'), 'grade' => 5); $this->fields['htmlPrepend'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code à insérer en tête des fichiers'), 'grade' => 5); $this->fields['baseUrl'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Base de l\'url'), 'grade' => 5,); diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php index 1028db200..bc27dea43 100644 --- a/inc/ws/Util/packager/_common.php +++ b/inc/ws/Util/packager/_common.php @@ -2,6 +2,7 @@ $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php'; $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php'; +$__autoload['wsPackagerSharepoint'] = dirname(__FILE__) . '/class.ws.packager.sharepoint.php'; $__autoload['wsPackagerSCORM'] = dirname(__FILE__) . '/class.ws.packager.scorm.php'; $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php'; diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 4d4e88464..7d1e946da 100644 --- a/inc/ws/Util/packager/class.ws.packager.php +++ b/inc/ws/Util/packager/class.ws.packager.php @@ -28,7 +28,9 @@ class wsPackager $packager = new wsPackagerHTML($book_id); } else if ($version == 'scorm') { $packager = new wsPackagerSCORM($book_id); - } elseif ($version == 'win-html') { + } else if($version=='sharepoint'){ + $packager=new wsPackagerSharepoint($book_id); + }elseif ($version == 'win-html') { $packager = new wsPackagerWinHTML($book_id); } else if ($version == 'phonegap') { $packager = new wsPackagerPhonegap($book_id); diff --git a/inc/ws/Util/packager/class.ws.packager.sharepoint.php b/inc/ws/Util/packager/class.ws.packager.sharepoint.php new file mode 100644 index 000000000..61a20532d --- /dev/null +++ b/inc/ws/Util/packager/class.ws.packager.sharepoint.php @@ -0,0 +1,13 @@ +version = 'sharepoint'; + $this->book->parametres->seoVersion = false; + $this->book->parametres->maxResolution = 150; + $this->book->parametres->htmlExtension = 'aspx'; + } +} \ No newline at end of file