projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c52f43e)
<body class=admin> auf Admin Layout umgeschrieben.
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 21 Sep 2012 09:48:35 +0000 (11:48 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 17 Oct 2012 14:02:10 +0000 (16:02 +0200)
18 files changed:
SL/Controller/Layout.pm patch | blob | history
SL/Controller/Layout/Admin.pm [new file with mode: 0644] patch | blob
bin/mozilla/admin.pl patch | blob | history
css/kivitendo/main.css patch | blob | history
css/lx-office-erp/main.css patch | blob | history
templates/webpages/admin/adminlogin.html patch | blob | history
templates/webpages/admin/backup_dataset.html patch | blob | history
templates/webpages/admin/backup_dataset_email_done.html patch | blob | history
templates/webpages/admin/create_dataset.html patch | blob | history
templates/webpages/admin/dbadmin.html patch | blob | history
templates/webpages/admin/dbcreate.html patch | blob | history
templates/webpages/admin/dbdelete.html patch | blob | history
templates/webpages/admin/delete_dataset.html patch | blob | history
templates/webpages/admin/edit_user.html patch | blob | history
templates/webpages/admin/list_users.html patch | blob | history
templates/webpages/admin/restore_dataset.html patch | blob | history
templates/webpages/admin/restore_dataset_start_header.html patch | blob | history
templates/webpages/admin/update_dataset.html patch | blob | history

diff --git a/SL/Controller/Layout.pm b/SL/Controller/Layout.pm
index 5c33b17..d618730 100644 (file)
--- 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 (file)
index 0000000..9d8f30c
--- /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 {
+  "<div id='admin' class='admin'>\n";
+}
+
+sub end_content {
+  "</div>\n";
+}
+
+1;
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index bea2315..5175aac 100755 (executable)
--- 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 9714d4a..77fe097 100644 (file)
--- 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 87f17b8..6b08408 100644 (file)
--- 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 652dff6..543f228 100644 (file)
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP%]
-<body class="admin">
-
  <script type='text/javascript'>
     $(function(){ document.getElementsById('rpw').focus();});
  </script>
diff --git a/templates/webpages/admin/backup_dataset.html b/templates/webpages/admin/backup_dataset.html
index fbe5fd3..756247a 100644 (file)
--- a/templates/webpages/admin/backup_dataset.html
+++ b/templates/webpages/admin/backup_dataset.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
  <script type="text/javascript">
   <!--
       $(function(){
diff --git a/templates/webpages/admin/backup_dataset_email_done.html b/templates/webpages/admin/backup_dataset_email_done.html
index 2bb2b13..bb29cf9 100644 (file)
--- a/templates/webpages/admin/backup_dataset_email_done.html
+++ b/templates/webpages/admin/backup_dataset_email_done.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %]
-<body class="admin">
-
  <h2>[% title %]</h2>
 
  <p>[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]</p>
diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html
index 2ed8614..3a106f5 100644 (file)
--- a/templates/webpages/admin/create_dataset.html
+++ b/templates/webpages/admin/create_dataset.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/dbadmin.html b/templates/webpages/admin/dbadmin.html
index fcadd5b..74e1467 100644 (file)
--- a/templates/webpages/admin/dbadmin.html
+++ b/templates/webpages/admin/dbadmin.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/dbcreate.html b/templates/webpages/admin/dbcreate.html
index ee854cf..f832912 100644 (file)
--- a/templates/webpages/admin/dbcreate.html
+++ b/templates/webpages/admin/dbcreate.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
-<body class="admin">
-
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/dbdelete.html b/templates/webpages/admin/dbdelete.html
index 83437e9..6926c9c 100644 (file)
--- a/templates/webpages/admin/dbdelete.html
+++ b/templates/webpages/admin/dbdelete.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %]
-<body class="admin">
-
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/delete_dataset.html b/templates/webpages/admin/delete_dataset.html
index 17de8b1..2e891ee 100644 (file)
--- a/templates/webpages/admin/delete_dataset.html
+++ b/templates/webpages/admin/delete_dataset.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
  <h2>[% title %]</h2>
  <p><a href="admin.pl?action=pg_database_administration">[% 'Back' | $T8 %]</a></p>
  <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
index 7b3c7ae..8db61d9 100644 (file)
--- a/templates/webpages/admin/edit_user.html
+++ b/templates/webpages/admin/edit_user.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
-<body class="admin">
-
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/jquery.js"></script>
  <script type="text/javascript">
diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html
index 664a614..02a4706 100644 (file)
--- a/templates/webpages/admin/list_users.html
+++ b/templates/webpages/admin/list_users.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
  <h1>[% title %]</h1>
 
  <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/restore_dataset.html b/templates/webpages/admin/restore_dataset.html
index f110c70..7758fec 100644 (file)
--- a/templates/webpages/admin/restore_dataset.html
+++ b/templates/webpages/admin/restore_dataset.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
   <script type='text/javascript'>
     $(function(){ document.getElementsByName('dbname')[0].focus();});
   </script>
diff --git a/templates/webpages/admin/restore_dataset_start_header.html b/templates/webpages/admin/restore_dataset_start_header.html
index ede5e7c..2cef649 100644 (file)
--- a/templates/webpages/admin/restore_dataset_start_header.html
+++ b/templates/webpages/admin/restore_dataset_start_header.html
@@ -1,6 +1,4 @@
 [%- USE T8 %]
-<body class="admin">
-
  <h2>[% title %]</h2>
 
  <p>[%- 'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
diff --git a/templates/webpages/admin/update_dataset.html b/templates/webpages/admin/update_dataset.html
index 2d65b39..80fdd56 100644 (file)
--- a/templates/webpages/admin/update_dataset.html
+++ b/templates/webpages/admin/update_dataset.html
@@ -1,7 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<body class="admin">
-
  <h2>[% title %]</h2>
  <p><a href="admin.pl?action=pg_database_administration">[% 'Back' | $T8 %]</a></p>
  [% IF ALL_UPDATED %]
Unnamed repository; edit this file 'description' to name the repository.