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
eab9a252
Commit
eab9a252
authored
14 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: rename constante
parent
0dc4f7db
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/lib/functions.lib.php
+2
-2
2 additions, 2 deletions
htdocs/lib/functions.lib.php
htdocs/main.inc.php
+1
-1
1 addition, 1 deletion
htdocs/main.inc.php
with
3 additions
and
3 deletions
htdocs/lib/functions.lib.php
+
2
−
2
View file @
eab9a252
...
@@ -3673,7 +3673,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
...
@@ -3673,7 +3673,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
$out
=
''
;
$out
=
''
;
$divstart
=
$divend
=
''
;
$divstart
=
$divend
=
''
;
if
(
!
empty
(
$conf
->
global
->
MAIN_D
ONOT
_JQUERY_JNOTIFY
)
&&
!
preg_match
(
'/<div class=".*">/i'
,
$out
))
if
(
!
empty
(
$conf
->
global
->
MAIN_D
ISABLE
_JQUERY_JNOTIFY
)
&&
!
preg_match
(
'/<div class=".*">/i'
,
$out
))
{
{
$divstart
=
'<div class="'
.
$style
.
'">'
;
$divstart
=
'<div class="'
.
$style
.
'">'
;
$divend
=
'</div>'
;
$divend
=
'</div>'
;
...
@@ -3703,7 +3703,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
...
@@ -3703,7 +3703,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
if
(
$out
)
if
(
$out
)
{
{
if
(
empty
(
$conf
->
global
->
MAIN_D
ONOT_US
E_JQUERY_JNOTIFY
)
&&
empty
(
$keepembedded
))
if
(
empty
(
$conf
->
global
->
MAIN_D
ISABL
E_JQUERY_JNOTIFY
)
&&
empty
(
$keepembedded
))
{
{
$return
=
'<script type="text/javascript">
$return
=
'<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function() {
...
...
This diff is collapsed.
Click to expand it.
htdocs/main.inc.php
+
1
−
1
View file @
eab9a252
...
@@ -959,7 +959,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
...
@@ -959,7 +959,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/jquery/plugins/layout/jquery.layout-latest.min'
.
$ext
.
'"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/jquery/plugins/layout/jquery.layout-latest.min'
.
$ext
.
'"></script>'
.
"
\n
"
;
}
}
// jQuery jnotify
// jQuery jnotify
if
(
empty
(
$conf
->
global
->
MAIN_D
ONOT_US
E_JQUERY_JNOTIFY
))
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'
.
"
\n
"
;
if
(
empty
(
$conf
->
global
->
MAIN_D
ISABL
E_JQUERY_JNOTIFY
))
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'
.
"
\n
"
;
// Flot
// Flot
print
'<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/flot/excanvas.min.js"></script><![endif]-->'
.
"
\n
"
;
print
'<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/flot/excanvas.min.js"></script><![endif]-->'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/flot/jquery.flot.min.js"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/flot/jquery.flot.min.js"></script>'
.
"
\n
"
;
...
...
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