From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Jul 2016 18:16:52 +0000 (+0000)
Subject: Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic... 
X-Git-Tag: timetracker_1.19-1~1700^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/ba0b5f34efabfeded3112115086eaa9d00f2a345?hp=83c8992f7e4be2e564ff66d7a317184cd1ee945e

Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic-taskChanges

Conflicts:
	.gitignore
	WEB-INF/config.php.dist
---

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 5afca00d..cc3d0cd7 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -218,3 +218,6 @@ define('AUTH_MODULE', 'db');
 // team manager can set monthly quota for years between these values:
 define('MONTHLY_QUOTA_YEARS_START', 2010); // if nothing is specified, it falls back to 2010
 define('MONTHLY_QUOTA_YEARS_END', 2031); // if nothing is specified it falls back to 2030
+
+// note input height in time.php
+define('NOTE_INPUT_HEIGHT', '40');
diff --git a/time.php b/time.php
index 9a34d30d..4042d7c5 100644
--- a/time.php
+++ b/time.php
@@ -194,7 +194,7 @@ if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READON
 }
 if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height: 40px;','value'=>$cl_note));
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable));