projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git]
/
SL
/
Layout
/
None.pm
diff --git
a/SL/Layout/None.pm
b/SL/Layout/None.pm
index
57b9966
..
ac7d5fc
100644
(file)
--- a/
SL/Layout/None.pm
+++ b/
SL/Layout/None.pm
@@
-8,14
+8,30
@@
sub javascripts_inline {
_setup_focus(),
}
_setup_focus(),
}
+sub use_javascript {
+ my $self = shift;
+ qw(
+ js/jquery.js
+ js/common.js
+ ),
+ $self->SUPER::use_javascript(@_);
+}
+
+sub use_stylesheet {
+ my $self = shift;
+ qw(
+ main.css
+ ),
+ $self->SUPER::use_stylesheet(@_);
+}
sub _setup_formats {
sub _setup_formats {
- $::form->parse_html_template('
generic
/javascript_setup')
+ $::form->parse_html_template('
layout
/javascript_setup')
}
sub _setup_focus {
if ($::request->{layout}->focus || $::form->{fokus}) {
}
sub _setup_focus {
if ($::request->{layout}->focus || $::form->{fokus}) {
- return $::form->parse_html_template('
generic
/focus_setup', {
+ return $::form->parse_html_template('
layout
/focus_setup', {
focus => $::request->{layout}->focus,
fokus => $::form->{fokus},
})
focus => $::request->{layout}->focus,
fokus => $::form->{fokus},
})