[eGroupWare-svn] r30423 - in /trunk: felamimail/inc/class.uipreferences.inc.php phpgwapi/inc/class.html.inc.php

[<lei...@us...>]

Author: leithoff
Date: Fri May 28 10:07:17 2010
New Revision: 30423

URL: http://www.egroupware.org/viewvc/egroupware?rev=30423&view=rev
Log:
control height of CKEditor; set a more convinient height for signature edit

Modified:
    trunk/felamimail/inc/class.uipreferences.inc.php
    trunk/phpgwapi/inc/class.html.inc.php

Modified: trunk/felamimail/inc/class.uipreferences.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/felamimail/inc/class.uipreferences.inc.php?rev=30423&r1=30422&r2=30423&view=diff
==============================================================================
--- trunk/felamimail/inc/class.uipreferences.inc.php (original)
+++ trunk/felamimail/inc/class.uipreferences.inc.php Fri May 28 10:07:17 2010
@@ -164,7 +164,7 @@
 				'menuaction'    => 'felamimail.uipreferences.editSignature'
 			);
 			$this->t->set_var('form_action', $GLOBALS['egw']->link('/index.php',$linkData));
-
+			$height = "350px";
 			if(isset($_GET['signatureID'])) {
 
 				$this->t->set_var('description', @htmlspecialchars($signatureData->fm_description, ENT_QUOTES, $this->charset));
@@ -174,7 +174,7 @@
 				$this->t->set_var('tinymce',html::fckEditorQuick(
 					'signature', 'advanced', 
 					$signatureData->fm_signature, 
-					'450px')
+					$height)
 				);
 
 				$this->t->set_var('checkbox_isDefaultSignature',html::checkbox(
@@ -185,7 +185,7 @@
 					)
 				);
 			} else {
-				$this->t->set_var('tinymce',html::fckEditorQuick('signature', 'advanced', '', '450px'));
+				$this->t->set_var('tinymce',html::fckEditorQuick('signature', 'advanced', '', $height));
 
 				$this->t->set_var('checkbox_isDefaultSignature',html::checkbox(
 					'isDefaultSignature', false, 'true', 'id="isDefaultSignature"'

Modified: trunk/phpgwapi/inc/class.html.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/class.html.inc.php?rev=30423&r1=30422&r2=30423&view=diff
==============================================================================
--- trunk/phpgwapi/inc/class.html.inc.php (original)
+++ trunk/phpgwapi/inc/class.html.inc.php Fri May 28 10:07:17 2010
@@ -612,7 +612,7 @@
 		$oCKeditor->config['filebrowserWindowWidth'] = 640;
 		$oCKeditor->config['filebrowserWindowHeight'] = 580;
 		//Only heights with "px" set are supported		
-		$pxheight = (strpos('px', $_height) === false) ? 400 : str_replace('px', '', $_height);
+		$pxheight = (strpos('px', $_height) === false) ? (empty($_height)?400:$_height) : str_replace('px', '', $_height);
 		$oCKeditor->config['height'] = $pxheight;
 
 		// By default the editor start expanded