From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 14 Dec 2015 07:34:10 +0000 (+0100)
Subject: xmas-modus für kivi
X-Git-Tag: release-3.4.1~526
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e8e60f67de5e5825d1097c78f96bbd29977a3a7a;p=kivitendo-erp.git

xmas-modus für kivi
---

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 553909355..4ffe0b775 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -30,6 +30,7 @@
 use SL::DB::Default;
 use SL::Form;
 use SL::Git;
+use DateTime;
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/todo.pl";
@@ -54,6 +55,7 @@ sub company_logo {
 
   my $git             = SL::Git->new;
   ($form->{git_head}) = $git->get_log(since => 'HEAD~1', until => 'HEAD') if $git->is_git_installation;
+  $form->{xmas}       = '_xmas' if (DateTime->today->month == 12 && DateTime->today->day < 27);
 
   # create the logo screen
   $form->header() unless $form->{noheader};
diff --git a/doc/changelog b/doc/changelog
index a7a57ffe0..c8172818c 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -3,7 +3,7 @@
 ###############################
 
 
-2015-xx-xx - Release 3.x.x
+2016-xx-xx - Release 3.x.x
 
 Größere neue Features:
 
@@ -53,6 +53,8 @@ Kleinere neue Features und Detailverbesserungen:
 
   - Langtext kann in der Auswahlliste bei mehreren Treffern im Positionsbeleg  zusätzlich angezeigt werden.
 
+  - Besseren kivi-Adventssupport
+
 2015-08-20 - Release 3.3
 
 Größere neue Features:
diff --git a/image/kivitendo_xmas.png b/image/kivitendo_xmas.png
new file mode 100644
index 000000000..33b198a42
Binary files /dev/null and b/image/kivitendo_xmas.png differ
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
index 1bd83c062..383ffff87 100644
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -7,7 +7,7 @@
    %]
    </noscript>
  <center>
-  <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo.png" border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
+  <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo[% xmas %].png" border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
 
   <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>