ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 11:40:48 +03:00
Code Issues Releases Wiki Activity

Исправлено подключение ассетов в редакторе

Browse source
This commit is contained in:
Denis Shakhov 2014-06-16 16:33:51 +07:00
parent d5cc4b1e7d
commit aea9b3bbc5
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
application/frontend/skin/developer/components/editor/editor.tpl
View file

@ -39,12 +39,22 @@
{* Визуальный редактор *}
{if Config::Get('view.wysiwyg')}
{hookb run='editor_visual'}
{asset type='js' name='editor_visual' file="{Config::Get('path.framework.frontend.web')}/js/vendor/tinymce/tiny_mce.js"}
{asset type='js' name='editor_visual_options' file="{Config::Get('path.application.web')}/frontend/common/js/editor.visual.js"}
{editor_textarea}
{/hookb}
{* Markup редактор *}
{else}
{hookb run='editor_markup'}
{asset type='js' name='editor_markup' file="{Config::Get('path.framework.frontend.web')}/js/vendor/markitup/jquery.markitup.js"}
{asset type='js' name='editor_markup_options' file="{Config::Get('path.application.web')}/frontend/common/js/editor.markup.js"}
{asset type='css' name='editor_markup' file="{Config::Get('path.framework.frontend.web')}/js/vendor/markitup/skins/synio/style.css"}
{asset type='css' name='editor_markup_set' file="{Config::Get('path.framework.frontend.web')}/js/vendor/markitup/sets/synio/style.css"}
{asset type='css' name='editor_markup_component' file="{Config::Get('path.skin.assets.web')}/css/components/editor.css"}
{editor_textarea}
{if $smarty.local.bShowHelp|default:true}

18
application/frontend/skin/developer/settings/config/config.php
View file

@ -81,24 +81,6 @@ if ( Config::Get('view.rtl') ) {
$aCss[] = "___path.skin.assets.web___/css/components/vote-rtl.css";
}
// Подключение редакторов
if ( Config::Get('view.wysiwyg') ) {
$config['head']['default']['js'] = array_merge($config['head']['default']['js'], array(
"___path.framework.frontend.web___/js/vendor/tinymce/tiny_mce.js",
"___path.application.web___/frontend/common/js/editor.visual.js"
));
} else {
$config['head']['default']['js'] = array_merge($config['head']['default']['js'], array(
"___path.framework.frontend.web___/js/vendor/markitup/jquery.markitup.js",
"___path.application.web___/frontend/common/js/editor.markup.js"
));
$aCss = array_merge($aCss, array(
"___path.framework.frontend.web___/js/vendor/markitup/skins/synio/style.css",
"___path.framework.frontend.web___/js/vendor/markitup/sets/synio/style.css",
"___path.skin.assets.web___/css/components/editor.css"
));
}
// Подключение фронтенд фреймворка
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), $aCss);