From c7f8d98fab8f8c1751a5a49ba2c9fced3735e552 Mon Sep 17 00:00:00 2001 From: Andreas Moik Date: Fri, 20 Nov 2015 09:19:10 +0100 Subject: [PATCH 1/2] =?UTF-8?q?defaultconfig=20f=C3=BCr=20phantom=20entfer?= =?UTF-8?q?nt,=20da=20es=20in=20das=20reporting-Addon=20verschoben=20wurde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/global.config-default.inc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 965c98938..46af88f05 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -199,7 +199,4 @@ define('KOLLISIONSFREIE_USER',serialize(array('_DummyLektor'))); // Soll der Lageplan am Infoterminal angezeigt werden (true|false) define('CIS_INFOSCREEN_LAGEPLAN_ANZEIGEN', true); - -//PHANTOM -define('PHANTOM_SERVER','http://phantomjs.example.com:3003'); ?> From c301764467d7e3be29fde6ca2d17c9277b2b052d Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Fri, 20 Nov 2015 12:22:01 +0100 Subject: [PATCH 2/2] darstellung urlaubsblock leer - vorbereitung --- cis/private/profile/urlaubsfreigabe.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cis/private/profile/urlaubsfreigabe.php b/cis/private/profile/urlaubsfreigabe.php index 19ab27115..e40506d1f 100755 --- a/cis/private/profile/urlaubsfreigabe.php +++ b/cis/private/profile/urlaubsfreigabe.php @@ -228,7 +228,9 @@ if($uid!='') echo "Alle Mitarbeiter anzeigen
"; echo ''; echo ''; - + //echo '
'; + //echo ''; + //Anzeige Resturlaubsberechnung $resturlaub = new resturlaub(); @@ -305,6 +307,7 @@ if($uid!='') echo ''; echo ''; + } echo '
';