X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FForm.pm;h=ff7d0efa045962c838ab8167cebfafb429e3e225;hb=d474d344ca4da456830578b034c4f54ec45cdeba;hp=537799a343db5bfa9b189f094b50b0a64576c80b;hpb=00f9b4aace493f778a1470a00bd750d6ce298cd5;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 537799a34..ff7d0efa0 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -460,6 +460,24 @@ sub use_stylesheet {
return @{ $self->{stylesheet} };
}
+sub get_stylesheet_for_user {
+ my $css_path = 'css';
+ if (my $user_style = $::myconfig{stylesheet}) {
+ $user_style =~ s/\.css$//; # nuke trailing .css, this is a remnand of pre 2.7.0 stylesheet handling
+ if (-d "$css_path/$user_style" &&
+ -f "$css_path/$user_style/main.css") {
+ $css_path = "$css_path/$user_style";
+ } else {
+ $css_path = "$css_path/lx-office-erp";
+ }
+ } else {
+ $css_path = "$css_path/lx-office-erp";
+ }
+ $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here
+
+ return $css_path;
+}
+
sub header {
$::lxdebug->enter_sub;
@@ -471,6 +489,8 @@ sub header {
$::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
+ my $css_path = $self->get_stylesheet_for_user;
+
$self->{favicon} ||= "favicon.ico";
$self->{titlebar} = "$self->{title} - $self->{titlebar}" if $self->{title};
@@ -481,21 +501,16 @@ sub header {
push @header, "";
}
- push @header, map { qq|| } $self->use_stylesheet;
+ push @header, map { qq|| } $self->use_stylesheet;
push @header, "" if $self->{landscape};
push @header, "" if -f $self->{favicon};
- push @header, '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '';
+ push @header, map { qq|| }
+ qw(jquery common jscalendar/calendar jscalendar/lang/calendar-de jscalendar/calendar-setup part_selection jquery-ui jqModal switchmenuframe);
push @header, $self->{javascript} if $self->{javascript};
+ push @header, map { qq|| }
+ qw(main menu tabcontent list_accounts jquery.autocomplete jquery.multiselect2side frame_header/header ui-lightness/jquery-ui-1.8.12.custom);
+ push @header, map { qq|| }
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
push @header, "" if $self->{fokus};
push @header, sprintf "",
@@ -531,9 +546,7 @@ sub header {
EOT
print " $_\n" for @header;
print <
-