projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcc04be)
login Layout
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 21 Sep 2012 10:58:05 +0000 (12:58 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 17 Oct 2012 14:02:18 +0000 (16:02 +0200)
SL/Controller/Layout.pm patch | blob | history
SL/Controller/Layout/Login.pm [new file with mode: 0644] patch | blob
SL/Controller/LoginScreen.pm patch | blob | history
css/lx-office-erp/main.css patch | blob | history
templates/webpages/login_screen/user_login.html patch | blob | history

diff --git a/SL/Controller/Layout.pm b/SL/Controller/Layout.pm
index d618730..82d5da8 100644 (file)
--- a/SL/Controller/Layout.pm
+++ b/SL/Controller/Layout.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Controller::Base);
 
 use SL::Menu;
 use SL::Controller::Layout::Admin;
+use SL::Controller::Layout::Login;
 use SL::Controller::Layout::Classic;
 use SL::Controller::Layout::V3;
 use SL::Controller::Layout::V4;
@@ -20,6 +21,7 @@ sub new {
   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::Login->new      if $params{style} eq 'login';
   return SL::Controller::Layout::None->new;
 }
 
diff --git a/SL/Controller/Layout/Login.pm b/SL/Controller/Layout/Login.pm
new file mode 100644 (file)
index 0000000..60f6e94
--- /dev/null
+++ b/SL/Controller/Layout/Login.pm
@@ -0,0 +1,26 @@
+package SL::Controller::Layout::Login;
+
+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 {
+  "<div id='login' class='login'>\n";
+}
+
+sub end_content {
+  "</div>\n";
+}
+
+1;
diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index 9d0e94b..e73224b 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -7,6 +7,7 @@ use parent qw(SL::Controller::Base);
 use SL::Dispatcher::AuthHandler::User;
 use SL::User;
 
+__PACKAGE__->run_before('set_layout');
 #
 # actions
 #
@@ -116,4 +117,8 @@ sub error_state {
   }->{$_[0]};
 }
 
+sub set_layout {
+  $::request->{layout} = SL::Controller::Layout->new(style => 'login');
+}
+
 1;
diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index 6b08408..08b3c6d 100644 (file)
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -14,12 +14,17 @@ input:focus, textarea:focus, select:focus {
   background-color: yellow;
 }
 
+html {
+  height: 100%;
+}
+
 body {
   font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
   background-color: white;
   background-image: url("../../image/fade.png"); background-repeat:repeat-x;
   color: black;
+  height: 100%;
 }
 
 td {
@@ -51,7 +56,10 @@ th {
 .login {
   font-family: Verdana, Arial, Helvetica, sans-serif;
 }
-body.login {
+div.login {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
   background: #b8d1f3;
   color: #A0A0A0;
 }
diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html
index 118ba9b..08776e7 100644 (file)
--- a/templates/webpages/login_screen/user_login.html
+++ b/templates/webpages/login_screen/user_login.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="login" onLoad="document.loginscreen.login.focus()">
-
  <center>
   <table class="login" border="3" cellpadding="20">
    <tr>
@@ -25,7 +23,7 @@
           <table>
            <tr>
             <th align="right">[% 'Login Name' | $T8 %]</th>
-            <td><input class="login" name="{AUTH}login" size="30" tabindex="1"></td>
+            <td><input id='login' class="login" name="{AUTH}login" size="30" tabindex="1"></td>
            </tr>
            <tr>
             <th align="right">[% 'Password' | $T8 %]</th>
@@ -46,4 +44,6 @@
     </td>
    </tr>
   </table>
-
+  <script type='text/javascript'>
+    $(function(){ $('#login').focus() })
+  </script>
Unnamed repository; edit this file 'description' to name the repository.