From: Sven Schöling Date: Fri, 21 Sep 2012 09:48:35 +0000 (+0200) Subject: auf Admin Layout umgeschrieben. X-Git-Tag: release-3.0.0beta1~143 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5d73c408bfee2d7fbd4dd1789073f86b9cfc518f;p=kivitendo-erp.git auf Admin Layout umgeschrieben. --- diff --git a/SL/Controller/Layout.pm b/SL/Controller/Layout.pm index 5c33b1743..d618730b6 100644 --- a/SL/Controller/Layout.pm +++ b/SL/Controller/Layout.pm @@ -4,6 +4,7 @@ use strict; use parent qw(SL::Controller::Base); use SL::Menu; +use SL::Controller::Layout::Admin; use SL::Controller::Layout::Classic; use SL::Controller::Layout::V3; use SL::Controller::Layout::V4; @@ -18,6 +19,7 @@ sub new { return SL::Controller::Layout::V3->new if $params{style} eq 'v3'; return SL::Controller::Layout::V4->new if $params{style} eq 'v4'; return SL::Controller::Layout::Javascript->new if $params{style} eq 'neu'; + return SL::Controller::Layout::Admin->new if $params{style} eq 'admin'; return SL::Controller::Layout::None->new; } diff --git a/SL/Controller/Layout/Admin.pm b/SL/Controller/Layout/Admin.pm new file mode 100644 index 000000000..9d8f30c61 --- /dev/null +++ b/SL/Controller/Layout/Admin.pm @@ -0,0 +1,26 @@ +package SL::Controller::Layout::Admin; + +use strict; +use parent qw(SL::Controller::Layout::Base); + +sub new { + my ($class, @slurp) = @_; + + my $self = $class->SUPER::new(@slurp); + + $self->add_sub_layouts([ + SL::Controller::Layout::None->new, + ]); + + $self; +} + +sub start_content { + "

\n"; +} + +sub end_content { + "

\n"; +} + +1; diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index bea2315ea..5175aaca5 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -91,6 +91,7 @@ sub run { $locale = $::locale; $auth = $::auth; + $::request->{layout} = SL::Controller::Layout->new(style => 'admin'); $::request->{layout}->use_stylesheet("lx-office-erp.css"); $form->{favicon} = "favicon.ico"; diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index 9714d4ac3..77fe0978d 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -115,8 +115,9 @@ td.login { th.login { text-align: right; } -body.admin { +div.admin { background-color: #FFFFE0; + padding: 8px; color: #000000; } body.menu { diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 87f17b840..6b08408bf 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -69,9 +69,9 @@ th.login { text-align: right; } -body.admin { - background-color:#ffffff; +div.admin { color: black; + margin: 8px; } .message_error_login { diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html index 652dff68b..543f228e2 100644 --- a/templates/webpages/admin/adminlogin.html +++ b/templates/webpages/admin/adminlogin.html @@ -1,8 +1,6 @@ [%- USE T8 %] [% USE HTML %] [% USE LxERP%] - - diff --git a/templates/webpages/admin/backup_dataset.html b/templates/webpages/admin/backup_dataset.html index fbe5fd3fa..756247a5f 100644 --- a/templates/webpages/admin/backup_dataset.html +++ b/templates/webpages/admin/backup_dataset.html @@ -1,7 +1,5 @@ [%- USE T8 %] [%- USE HTML %] - -