holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

had to remove width: 100% from .prefValue as it conflicts with float: left, setting rows and cols for old eT

Browse Source
This commit is contained in:
Ralf Becker 2013-05-10 08:24:15 +00:00
parent b235658a1c
commit 6c4a7c5f34
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
preferences/inc/class.preferences_settings.inc.php
View File

@ -112,10 +112,9 @@ class preferences_settings
'old_type' => $content['type'], 'old_type' => $content['type'],
'types' => array(), 'types' => array(),
); );
if ($button == 'apply') $old_tab = $content['tabs']; if ($content['old_appname'] == $content['appname']) $old_tab = $content['tabs'];
$content = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl); $content = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl);
error_log(__METHOD__."() preserve=".array2string($preserve)); if (isset($old_tab)) $content['tabs'] = $old_tab;
if ($button == 'apply') $content['tabs'] = $old_tab;
// if not just saved, call validation before, to be able to show failed validation of current prefs // if not just saved, call validation before, to be able to show failed validation of current prefs
if (!isset($button)) if (!isset($button))
@ -298,7 +297,12 @@ class preferences_settings
case 'textarea': case 'textarea':
$setting['type'] = is_a($tpl, 'etemplate_old') ? 'textarea' : 'textbox'; $setting['type'] = is_a($tpl, 'etemplate_old') ? 'textarea' : 'textbox';
$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'multiline', 'true'); $tpl->setElementAttribute($tab.'['.$setting['name'].']', 'multiline', 'true');
// ignoring rows and cols in favor of hardcoded: width: 100%, height: 5em // anyway setting via css: width: 99%, height: 5em
// for old eT use size attribute
if (is_a($tpl, 'etemplate_old') && (!empty($setting['cols']) || !empty($setting['rows'])))
{
$setting['size'] = $setting['rows'].','.$setting['cols'];
}
break; break;
case 'password': case 'password':
case 'vfs_file': case 'vfs_file':

1
preferences/templates/default/app.css
View File

@ -39,7 +39,6 @@ tr.prefRow:hover .prefHelp {
} }
.prefValue { .prefValue {
margin-right: 5px; margin-right: 5px;
width: 100%;
} }
.prefValue textarea, textarea.prefValue { .prefValue textarea, textarea.prefValue {
width: 99%; width: 99%;