xmas-modus für kivi

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 553909355cf5192348cb02f44422d8d11a21f8a9..4ffe0b7758f1ec148bda6531bbaff54e92306b96 100644 (file)
--- 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 SL::DB::Default;
 use SL::Form;
 use SL::Git;

+use DateTime;

 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/todo.pl";
 
 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;
 
   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};
 
   # create the logo screen
   $form->header() unless $form->{noheader};

diff --git a/doc/changelog b/doc/changelog
index a7a57ffe01fcc7404a74f4f429f6adac306e09ff..c8172818c8fb1142c4a0ced9211610758ca2e4a2 100644 (file)
--- 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:
 
 
 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.
 
 
   - 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:
 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 (file)
index 0000000..33b198a
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 1bd83c0620c04b825887d55fbde02fd828dd47dc..383ffff87222da72fb2edd318de238c848cf0c1e 100644 (file)
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -7,7 +7,7 @@
    %]
    </noscript>
  <center>
    %]
    </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>
 
 
   <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>