not in a sub folder

master
Gnieark 7 years ago
parent 2f1cb7259f
commit 57ac632b4a

@ -25,10 +25,10 @@ if (!defined('DC_CONTEXT_ADMIN')) { return; }
// dead but useful code, in order to have translations
__('YASH').__('Yet Another Syntax Highlighter');
$_menu['Blog']->addItem(__('YASH'),
'plugin.php?p=yash',
$_menu['Blog']->addItem(__('YASH3'),
'plugin.php?p=yash3',
urldecode(dcPage::getPF('yash/icon.png')),
preg_match('/plugin.php\?p=yash(&.*)?$/',$_SERVER['REQUEST_URI']),
preg_match('/plugin.php\?p=yash3(&.*)?$/',$_SERVER['REQUEST_URI']),
$core->auth->check('contentadmin',$core->blog->id));
$core->addBehavior('adminPostEditor',array('yashBehaviors','adminPostEditor'));

@ -24,9 +24,9 @@ if (!defined('DC_RC_PATH')) { return; }
$this->registerModule(
/* Name */ "YASH Fork",
/* Description*/ "Fork of Yet Another Syntax Highlighter",
/* Description*/ "Fork of Yet Another Syntax Highlighter. Modification: Juste one javascript call on public pages for yash",
/* Author */ "Forked and modified by Gnieark, origin Pep and contributors",
/* Version */ '1.6.3.1',
/* Version */ '1.6.3.2',
array(
/* Dependencies */ 'requires' => array(array('core','2.9')),
/* Permissions */ 'permissions' => 'contentadmin',

@ -1,8 +1,10 @@
<?php
# ***** BEGIN LICENSE BLOCK *****
# This file is part of YASH, a plugin for DotClear2.
# Copyright (c) 2008 Pep and contributors. All rights
# reserved.
# This file is part of YASH3, a plugin for DotClear2.
# Copyright (c) 2016 Gnieark https://blog-du-grouik.tinad.fr
#
# Forked and pimped from Yash Copyright (c) 2008 Pep and contributors
# licensed under GNU/GPL license
#
# This plugin is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -49,13 +51,13 @@ class dcYASH
else {
$theme = (string)$core->blog->settings->yash->yash_theme;
if ($theme == '') {
$css = $core->blog->getPF('yash/syntaxhighlighter/css/shThemeDefault.css');
$css = $core->blog->getPF('yash3/syntaxhighlighter/css/shThemeDefault.css');
} else {
$css = $core->blog->getPF('yash/syntaxhighlighter/css/shTheme'.$theme.'.css');
$css = $core->blog->getPF('yash3/syntaxhighlighter/css/shTheme'.$theme.'.css');
}
}
echo
dcUtils::cssLoad($core->blog->getPF('yash/syntaxhighlighter/css/shCore.css')).
dcUtils::cssLoad($core->blog->getPF('yash3/syntaxhighlighter/css/shCore.css')).
dcUtils::cssLoad($css);
}
}
@ -65,9 +67,9 @@ class dcYASH
global $core;
$core->blog->settings->addNamespace('yash');
if ($core->blog->settings->yash->yash_active)
{
echo dcUtils::jsLoad($core->blog->getPF('yash/syntaxhighlighter/js/shALLMinified.js'));
if ($core->blog->settings->yash->yash_active){
//to do differents files if dotclear is path info or not
echo dcUtils::jsLoad($core->blog->getPF('yash3/syntaxhighlighter/js/shALLMinified.js'));
}
}
}

Before

Width:  |  Height:  |  Size: 920 B

After

Width:  |  Height:  |  Size: 920 B

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 337 B

Loading…
Cancel
Save