D3Public/tinymce-editor
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

adjust template paths

Browse Source
This commit is contained in:
O3-Shop 2023-04-03 00:03:09 +02:00
parent db0e810653
commit 42a11bcf9c
6 changed files with 21 additions and 18 deletions

2
Application/Controller/Admin/TinyFileManager.php

@ -25,6 +25,6 @@ use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
class TinyFileManager extends AdminController class TinyFileManager extends AdminController
{ {
protected $_sThisTemplate = "tiny/filemanager.tpl"; protected $_sThisTemplate = "TinyFilemanager.tpl";
} }

2
Application/Controller/Admin/TinyHelper.php

@ -26,7 +26,7 @@ use OxidEsales\Eshop\Core\Output;
class TinyHelper extends AdminController class TinyHelper extends AdminController
{ {
protected $_sThisTemplate = "tiny/helper.tpl"; protected $_sThisTemplate = "TinyHelper.tpl";
protected $_errors; protected $_errors;
protected $_content; protected $_content;

11
Application/Core/ViewConfig.php

@ -71,14 +71,13 @@ class ViewConfig extends ViewConfig_parent
); );
$sLang = $aLang[$oLang->getLanguageAbbr($oLang->getTplLanguage())] ?? "en"; $sLang = $aLang[$oLang->getLanguageAbbr($oLang->getTplLanguage())] ?? "en";
// processing editor config & other stuff // processing editor config & other stuff
// default config, updated on 2021-10-10 according to // default config, updated on 2021-10-10 according to
$aConfig = array( $aConfig = array(
// integration options https://www.tiny.cloud/docs/configure/integration-and-setup/ // integration options https://www.tiny.cloud/docs/configure/integration-and-setup/
// 'auto_focus' => '', // don't think we need me, maybe for cms pages? // 'auto_focus' => '', // don't think we need me, maybe for cms pages?
'base_url' => q($this->getBaseDir().'modules/vt/TinyMCE/out/tinymce/'), 'base_url' => q($this->getBaseDir().'modules/o3-shop/tinymce-editor/out/tinymce/'),
'cache_suffix' => q('?v=20211010'), 'cache_suffix' => q('?v=20211010'),
'selector' => '"textarea:not(.mceNoEditor)"', 'selector' => '"textarea:not(.mceNoEditor)"',
@ -188,7 +187,7 @@ class ViewConfig extends ViewConfig_parent
// external plugins // external plugins
$aConfig['external_plugins'] = '{ "oxfullscreen":"' . $this->getModuleUrl( $aConfig['external_plugins'] = '{ "oxfullscreen":"' . $this->getModuleUrl(
'vt-tinymce', 'tinymce-editor',
'out/plugins/oxfullscreen/plugin.js' 'out/plugins/oxfullscreen/plugin.js'
) . '" '; ) . '" ';
//$aConfig['external_plugins'] .= ', "oxwidget":"' . $this->getModuleUrl('bla-tinymce', 'plugins/oxwidget/plugin.js') . '" '; //$aConfig['external_plugins'] .= ', "oxwidget":"' . $this->getModuleUrl('bla-tinymce', 'plugins/oxwidget/plugin.js') . '" ';
@ -204,7 +203,7 @@ class ViewConfig extends ViewConfig_parent
Registry::get(UtilsServer::class)->setOxCookie("filemanagerkey", $sFilemanagerKey); Registry::get(UtilsServer::class)->setOxCookie("filemanagerkey", $sFilemanagerKey);
$aConfig['external_plugins'] .= ',"roxy":' . q($this->getModuleUrl( $aConfig['external_plugins'] .= ',"roxy":' . q($this->getModuleUrl(
'vt-tinymce', 'tinymce-editor',
'out/plugins/roxy/plugin.js' 'out/plugins/roxy/plugin.js'
)); ));
} }
@ -278,7 +277,7 @@ copyLongDesc = function(sIdent) {
}'; }';
// adding scripts to template // adding scripts to template
$smarty = Registry::get("oxUtilsView")->getSmarty(); $smarty = Registry::getUtilsView()->getSmarty();
$sSufix = ($smarty->_tpl_vars["__oxid_include_dynamic"]) ? '_dynamic' : ''; $sSufix = ($smarty->_tpl_vars["__oxid_include_dynamic"]) ? '_dynamic' : '';
$aScript = (array)$cfg->getGlobalParameter('scripts' . $sSufix); $aScript = (array)$cfg->getGlobalParameter('scripts' . $sSufix);
@ -296,7 +295,7 @@ copyLongDesc = function(sIdent) {
} }
} }
$aInclude[3][] = $this->getModuleUrl('vt-tinymce', 'out/tinymce/tinymce.min.js'); $aInclude[3][] = $this->getModuleUrl('tinymce-editor', 'out/tinymce/tinymce.min.js');
$cfg->setGlobalParameter('includes' . $sSufix, $aInclude); $cfg->setGlobalParameter('includes' . $sSufix, $aInclude);
return '<li style="margin-left: 50px;"><button style="border: 1px solid #0089EE; color: #0089EE;padding: 3px 10px; margin-top: -10px; background: white;" ' . return '<li style="margin-left: 50px;"><button style="border: 1px solid #0089EE; color: #0089EE;padding: 3px 10px; margin-top: -10px; background: white;" ' .

16
Application/views/admin/filemanager.tpl

@ -23,15 +23,15 @@
Contact: Lyubomir Arsov, liubo (at) web-lobby.com Contact: Lyubomir Arsov, liubo (at) web-lobby.com
--> -->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<base href='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/")}]'> <base href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/")}]'>
<title>Roxy File Manager</title> <title>Roxy File Manager</title>
<link href='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/css/jquery-ui-1.10.4.custom.min.css")}]' rel="stylesheet" type="text/css" /> <link href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/css/jquery-ui-1.10.4.custom.min.css")}]' rel="stylesheet" type="text/css" />
<link href='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/css/main.min.css")}]' rel="stylesheet" type="text/css" /> <link href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/css/main.min.css")}]' rel="stylesheet" type="text/css" />
<script type="text/javascript" src='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/js/jquery-1.11.1.min.js")}]'></script> <script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-1.11.1.min.js")}]'></script>
<script type="text/javascript" src='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/js/jquery-ui-1.10.4.custom.min.js")}]'></script> <script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-ui-1.10.4.custom.min.js")}]'></script>
<script type="text/javascript" src='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/js/custom.js")}]'></script> <script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/custom.js")}]'></script>
<script type="text/javascript" src='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/js/main.min.js")}]'></script> <script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/main.min.js")}]'></script>
<script type="text/javascript" src='[{$oViewConf->getModuleUrl("vt-tinymce","Application/fileman/js/jquery-dateFormat.min.js")}]'></script> <script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-dateFormat.min.js")}]'></script>
</head> </head>
<body> <body>
<table cellpadding="0" cellspacing="0" id="wraper"> <table cellpadding="0" cellspacing="0" id="wraper">

4
composer.json

@ -19,6 +19,10 @@
], ],
"extra": { "extra": {
"oxideshop": { "oxideshop": {
"blacklist-filter": [
"composer.json",
"README.md"
],
"target-directory": "o3-shop/tinymce-editor" "target-directory": "o3-shop/tinymce-editor"
} }
}, },

4
metadata.php

@ -37,8 +37,8 @@ $aModule = [
'tinyhelper' => O3\TinyMCE\Application\Controller\Admin\TinyHelper::class 'tinyhelper' => O3\TinyMCE\Application\Controller\Admin\TinyHelper::class
], ],
'templates' => [ 'templates' => [
'tiny/filemanager.tpl' => 'vt/TinyMCE/Application/views/admin/filemanager.tpl', 'TinyFilemanager.tpl' => 'o3-shop/tinymce-editor/Application/views/admin/filemanager.tpl',
'tiny/helper.tpl' => 'vt/TinyMCE/Application/views/admin/helper.tpl' 'TinyHelper.tpl' => 'o3-shop/tinymce-editor/Application/views/admin/helper.tpl'
], ],
'blocks' => [ 'blocks' => [
[ [