From: Sven Schöling Date: Mon, 5 Mar 2012 10:25:39 +0000 (+0100) Subject: cebit version X-Git-Tag: release-3.0.0beta1~344^2~7^2~7 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bdb4cfbb995d4da17508b52d9cba1e4a2e843363;p=kivitendo-erp.git cebit version --- diff --git a/SL/Form.pm b/SL/Form.pm index 7eab5c294..32675d8ce 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -465,6 +465,8 @@ sub get_stylesheet_for_user { if (my $user_style = $::myconfig{stylesheet}) { $user_style =~ s/\.css$//; # nuke trailing .css, this is a remnand of pre 2.7.0 stylesheet handling $css_path = "$css_path/$user_style" if -d "$css_path/$user_style"; + } else { + $css_path = "$css_path/lx-office-erp"; } $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here @@ -501,7 +503,8 @@ sub 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, map { qq|| } - qw(main menu tabcontent list_accounts jquery.autocomplete jquery.multiselect2side frame_header/header); + 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 "", diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 28b1a5228..7549bc161 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -1066,7 +1066,7 @@ sub config { } $form->{STYLESHEETS} = []; - foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css)) { + foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css)) { push @{ $form->{STYLESHEETS} }, { 'name' => $item, 'value' => $item, diff --git a/css/lx-office-erp/frame_header/header.css b/css/lx-office-erp/frame_header/header.css index 805519711..2713bb413 100644 --- a/css/lx-office-erp/frame_header/header.css +++ b/css/lx-office-erp/frame_header/header.css @@ -13,6 +13,7 @@ body.frame-header { div.frame-header { background: url('../../../image/bg_titel.gif') repeat-x; + text-align: center; } .frame-header { @@ -23,7 +24,6 @@ div.frame-header { overflow: hidden; width: 100%; border-spacing: 0; - text-align: center; } .frame-header-left { @@ -39,7 +39,6 @@ div.frame-header { border-spacing: 0; color: white; padding: 0; - font-size: 12px; font-family: verdana,arial,sans-serif; vertical-align: middle; } diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html index 10adcc0aa..4dbe7a8b4 100644 --- a/templates/webpages/login/company_logo.html +++ b/templates/webpages/login/company_logo.html @@ -8,7 +8,7 @@ %]
- + diff --git a/templates/webpages/login/login_screen.html b/templates/webpages/login/login_screen.html index 8bfd2185e..9ec5733a8 100644 --- a/templates/webpages/login/login_screen.html +++ b/templates/webpages/login/login_screen.html @@ -5,7 +5,7 @@