From: Sven Schöling <s.schoeling@linet-services.de>
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|<script type="text/javascript" src="js/$_.js"></script>| }
        qw(jquery common jscalendar/calendar jscalendar/lang/calendar-de jscalendar/calendar-setup part_selection jquery-ui jqModal switchmenuframe);
   push @header, map { qq|<link rel="stylesheet" type="text/css" href="$css_path/$_.css">| }
-       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|<link rel="stylesheet" type="text/css" href="js/jscalendar/calendar-win2k-1.css">| }
   push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
   push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
   push @header, sprintf "<script type='text/javascript'>top.document.title='%s';</script>",
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 @@
    %]
    </noscript>
  <center>
-  <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0" title="[% 'Lx-Office Homepage' | $T8 %]"></a>
+  <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo.png" border="0" title="[% 'kivitendo Homepage' | $T8 %]"></a>
 
   <h3 class="login">[% 'Lx-Office' | $T8 %] [% version %]</h3>
 
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 @@
   <table class="login" border="3" cellpadding="20">
    <tr>
     <td class="login" align="center">
-     <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
+     <a href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo.png" border="0"></a>
      <h3 class="login" align="center">[% 'Lx-Office' | $T8 %] [% version %]</h3>
 
      [% IF error_message %]
diff --git a/templates/webpages/menu/menuv4.html b/templates/webpages/menu/menuv4.html
index 2b159b3a7..0a11fe48b 100644
--- a/templates/webpages/menu/menuv4.html
+++ b/templates/webpages/menu/menuv4.html
@@ -1,5 +1,26 @@
 [%- USE T8 %]
-[% USE HTML %]<body style="padding:0px; margin:0px;">
+[%- USE HTML %]
+<body class="frame-header menuv4">
+ <div class="frame-header">
+  <span class="frame-header-element frame-header-left">
+   [<a href="menuv4.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+   [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
+  </span>
+  <span class="frame-header-element frame-header-right">
+   [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+   <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
+   [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
+  </span>
+ </div>
+ <div id="menuv4">
+  [% menu %]
+ </div>
+ <div style="clear: both;"></div>
+ <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
+ </iframe>
+</body>
+
 
  <script type="text/javascript">
 <!--
@@ -13,34 +34,4 @@ function clockon() {
 window.onload=clockon
 //-->
  </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menuv4">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
- </iframe>
-</body>
 </html>