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
46e2ed28
Commit
46e2ed28
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
NEW: All variant of ckeditor config can be tested into the setup page of
module.
parent
170dc467
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/admin/fckeditor.php
+13
-1
13 additions, 1 deletion
htdocs/admin/fckeditor.php
htdocs/core/class/doleditor.class.php
+6
-2
6 additions, 2 deletions
htdocs/core/class/doleditor.class.php
htdocs/langs/en_US/admin.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/admin.lang
with
20 additions
and
4 deletions
htdocs/admin/fckeditor.php
+
13
−
1
View file @
46e2ed28
...
@@ -189,7 +189,19 @@ else
...
@@ -189,7 +189,19 @@ else
show_skin
(
null
,
1
);
show_skin
(
null
,
1
);
print
'<br>'
.
"
\n
"
;
print
'<br>'
.
"
\n
"
;
print
load_fiche_titre
(
$langs
->
trans
(
"TestSubmitForm"
),
'(mode='
.
$mode
.
')'
,
''
);
$listofmodes
=
array
(
'dolibarr_mailings'
,
'dolibarr_notes'
,
'dolibarr_details'
,
'Full'
);
$linkstomode
=
''
;
foreach
(
$listofmodes
as
$newmode
)
{
if
(
$linkstomode
)
$linkstomode
.
=
' - '
;
$linkstomode
.
=
'<a href="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?mode='
.
$newmode
.
'">'
;
if
(
$mode
==
$newmode
)
$linkstomode
.
=
'<strong>'
;
$linkstomode
.
=
$newmode
;
if
(
$mode
==
$newmode
)
$linkstomode
.
=
'</strong>'
;
$linkstomode
.
=
'</a>'
;
}
$linkstomode
.
=
''
;
print
load_fiche_titre
(
$langs
->
trans
(
"TestSubmitForm"
),
$linkstomode
,
''
);
print
'<input type="hidden" name="mode" value="'
.
dol_escape_htmltag
(
$mode
)
.
'">'
;
print
'<input type="hidden" name="mode" value="'
.
dol_escape_htmltag
(
$mode
)
.
'">'
;
$uselocalbrowser
=
true
;
$uselocalbrowser
=
true
;
$readonly
=
(
$mode
==
'dolibarr_readonly'
?
1
:
0
);
$readonly
=
(
$mode
==
'dolibarr_readonly'
?
1
:
0
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/doleditor.class.php
+
6
−
2
View file @
46e2ed28
...
@@ -148,6 +148,9 @@ class DolEditor
...
@@ -148,6 +148,9 @@ class DolEditor
{
{
global
$conf
,
$langs
;
global
$conf
,
$langs
;
$fullpage
=
False
;
$disallowAnyContent
=
empty
(
$conf
->
global
->
FCKEDITOR_ALLOW_ANY_CONTENT
);
// Only predefined list of html tags are allowed
$found
=
0
;
$found
=
0
;
$out
=
''
;
$out
=
''
;
...
@@ -186,7 +189,8 @@ class DolEditor
...
@@ -186,7 +189,8 @@ class DolEditor
customConfig : ckeditorConfig,
customConfig : ckeditorConfig,
readOnly : '
.
(
$this
->
readonly
?
'true'
:
'false'
)
.
',
readOnly : '
.
(
$this
->
readonly
?
'true'
:
'false'
)
.
',
htmlEncodeOutput :'
.
$htmlencode_force
.
',
htmlEncodeOutput :'
.
$htmlencode_force
.
',
allowedContent :'
.
(
empty
(
$conf
->
global
->
FCKEDITOR_ALLOW_ANY_CONTENT
)
?
'false'
:
'true'
)
.
',
allowedContent :'
.
(
$disallowAnyContent
?
'false'
:
'true'
)
.
',
fullPage : '
.
(
$fullpage
?
'true'
:
'false'
)
.
',
toolbar: \''
.
$this
->
toolbarname
.
'\',
toolbar: \''
.
$this
->
toolbarname
.
'\',
toolbarStartupExpanded: '
.
(
$this
->
toolbarstartexpanded
?
'true'
:
'false'
)
.
',
toolbarStartupExpanded: '
.
(
$this
->
toolbarstartexpanded
?
'true'
:
'false'
)
.
',
width: '
.
(
$this
->
width
?
'\''
.
$this
->
width
.
'\''
:
'\'\''
)
.
',
width: '
.
(
$this
->
width
?
'\''
.
$this
->
width
.
'\''
:
'\'\''
)
.
',
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/admin.lang
+
1
−
1
View file @
46e2ed28
...
@@ -521,7 +521,7 @@ Module1520Desc=Mass mail document generation
...
@@ -521,7 +521,7 @@ Module1520Desc=Mass mail document generation
Module1780Name=Tags/Categories
Module1780Name=Tags/Categories
Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
Module2000Name=WYSIWYG editor
Module2000Name=WYSIWYG editor
Module2000Desc=Allow to edit some text area using an advanced editor
Module2000Desc=Allow to edit some text area using an advanced editor
(Based on CKEditor)
Module2200Name=Dynamic Prices
Module2200Name=Dynamic Prices
Module2200Desc=Enable the usage of math expressions for prices
Module2200Desc=Enable the usage of math expressions for prices
Module2300Name=Cron
Module2300Name=Cron
...
...
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