projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
S:D:FollowUp: Namen der Relationen created_by…/created_for… eindeutig gemacht
[kivitendo-erp.git]
/
SL
/
Layout
/
None.pm
diff --git
a/SL/Layout/None.pm
b/SL/Layout/None.pm
index
0a2f6ca
..
72d3e75
100644
(file)
--- a/
SL/Layout/None.pm
+++ b/
SL/Layout/None.pm
@@
-14,9
+14,9
@@
sub javascripts_inline {
s/y+/yy/gi;
} $::myconfig{dateformat};
s/y+/yy/gi;
} $::myconfig{dateformat};
- return $self->render(
+ return $self->
presenter->
render(
'layout/javascript_setup',
'layout/javascript_setup',
- { type => 'js'
, output => 0,
},
+ { type => 'js' },
datefmt => $datefmt,
focus => $::request->layout->focus,
ajax_spinner => 1,
datefmt => $datefmt,
focus => $::request->layout->focus,
ajax_spinner => 1,
@@
-26,10
+26,12
@@
sub javascripts_inline {
sub use_javascript {
my $self = shift;
qw(
sub use_javascript {
my $self = shift;
qw(
- js/jquery.js
- js/common.js
- js/namespace.js
+ jquery.js
+ common.js
+ namespace.js
+ kivi.js
),
),
+ 'locale/'. $::myconfig{countrycode} .'.js',
$self->SUPER::use_javascript(@_);
}
$self->SUPER::use_javascript(@_);
}