Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
a6bb785b
Commit
a6bb785b
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Compatibility with v4 of ckeditor (for debian)
parent
555a49d6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/class/doleditor.class.php
+2
-1
2 additions, 1 deletion
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
+7
-2
7 additions, 2 deletions
htdocs/main.inc.php
with
9 additions
and
3 deletions
htdocs/core/class/doleditor.class.php
+
2
−
1
View file @
a6bb785b
...
@@ -169,6 +169,7 @@ class DolEditor
...
@@ -169,6 +169,7 @@ class DolEditor
//$skin='office2003';
//$skin='office2003';
//$skin='v2';
//$skin='v2';
$skin
=
'kama'
;
$skin
=
'kama'
;
if
(
constant
(
'JS_CKEDITOR'
))
$skin
=
'moono'
;
// To use external ckeditor 4 js lib
if
(
$this
->
toolbarname
==
'dolibarr_mailings'
)
{
$htmlencode_force
=
'true'
;}
if
(
$this
->
toolbarname
==
'dolibarr_mailings'
)
{
$htmlencode_force
=
'true'
;}
else
{
$htmlencode_force
=
'false'
;}
else
{
$htmlencode_force
=
'false'
;}
...
...
This diff is collapsed.
Click to expand it.
htdocs/main.inc.php
+
7
−
2
View file @
a6bb785b
...
@@ -1051,14 +1051,19 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
...
@@ -1051,14 +1051,19 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
{
print
'<!-- Includes JS for CKEditor -->'
.
"
\n
"
;
print
'<!-- Includes JS for CKEditor -->'
.
"
\n
"
;
$pathckeditor
=
DOL_URL_ROOT
.
'/includes/ckeditor/'
;
$pathckeditor
=
DOL_URL_ROOT
.
'/includes/ckeditor/'
;
if
(
constant
(
'JS_CKEDITOR'
))
$pathckeditor
=
JS_CKEDITOR
;
// To use external ckeditor js lib
$jsckeditor
=
'ckeditor_basic.js'
;
if
(
constant
(
'JS_CKEDITOR'
))
// To use external ckeditor 4 js lib
{
$pathckeditor
=
constant
(
'JS_CKEDITOR'
);
$jsckeditor
=
'ckeditor.js'
;
}
print
'<script type="text/javascript">'
;
print
'<script type="text/javascript">'
;
print
'var CKEDITOR_BASEPATH = \''
.
$pathckeditor
.
'\';'
.
"
\n
"
;
print
'var CKEDITOR_BASEPATH = \''
.
$pathckeditor
.
'\';'
.
"
\n
"
;
print
'var ckeditorConfig = \''
.
dol_buildpath
(
'/theme/'
.
$conf
->
theme
.
'/ckeditor/config.js'
,
1
)
.
'\';'
.
"
\n
"
;
print
'var ckeditorConfig = \''
.
dol_buildpath
(
'/theme/'
.
$conf
->
theme
.
'/ckeditor/config.js'
,
1
)
.
'\';'
.
"
\n
"
;
print
'var ckeditorFilebrowserBrowseUrl = \''
.
DOL_URL_ROOT
.
'/core/filemanagerdol/browser/default/browser.php?Connector='
.
DOL_URL_ROOT
.
'/core/filemanagerdol/connectors/php/connector.php\';'
.
"
\n
"
;
print
'var ckeditorFilebrowserBrowseUrl = \''
.
DOL_URL_ROOT
.
'/core/filemanagerdol/browser/default/browser.php?Connector='
.
DOL_URL_ROOT
.
'/core/filemanagerdol/connectors/php/connector.php\';'
.
"
\n
"
;
print
'var ckeditorFilebrowserImageBrowseUrl = \''
.
DOL_URL_ROOT
.
'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='
.
DOL_URL_ROOT
.
'/core/filemanagerdol/connectors/php/connector.php\';'
.
"
\n
"
;
print
'var ckeditorFilebrowserImageBrowseUrl = \''
.
DOL_URL_ROOT
.
'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='
.
DOL_URL_ROOT
.
'/core/filemanagerdol/connectors/php/connector.php\';'
.
"
\n
"
;
print
'</script>'
.
"
\n
"
;
print
'</script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
$pathckeditor
.
'
ckeditor
_basic.js
"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
$pathckeditor
.
$js
ckeditor
.
'
"></script>'
.
"
\n
"
;
}
}
// jQuery Timepicker
// jQuery Timepicker
if
(
!
empty
(
$conf
->
global
->
MAIN_USE_JQUERY_TIMEPICKER
)
||
defined
(
'REQUIRE_JQUERY_TIMEPICKER'
))
if
(
!
empty
(
$conf
->
global
->
MAIN_USE_JQUERY_TIMEPICKER
)
||
defined
(
'REQUIRE_JQUERY_TIMEPICKER'
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment