nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #3314626 [display] CharTextareaRows is not respected

Browse Source
This commit is contained in:
Hans Fr. Nordhaug
2011-09-29 12:47:48 -04:00
committed by Marc Delisle
parent 55d1360b7e
commit 6c980106b7
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
- bug #3390832 [display] Delete records from last page breaks search - bug #3390832 [display] Delete records from last page breaks search
- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken
- bug #3414744 [core] External link fails in 3.4.5 - bug #3414744 [core] External link fails in 3.4.5
- patch #3314626 [display] CharTextareaRows is not respected
3.4.5.0 (2011-09-14) 3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd - bug #3375325 [interface] Page list in navigation frame looks odd

2
tbl_change.php
View File

@@ -981,7 +981,7 @@ foreach ($rows as $row_id => $vrow) {
if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) { if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) {
echo "\n"; echo "\n";
?> ?>
<textarea name="fields<?php echo $field_name_appendix; ?>" <textarea class="char" name="fields<?php echo $field_name_appendix; ?>"
rows="<?php echo $cfg['CharTextareaRows']; ?>" rows="<?php echo $cfg['CharTextareaRows']; ?>"
cols="<?php echo $cfg['CharTextareaCols']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>"
dir="<?php echo $text_dir; ?>" dir="<?php echo $text_dir; ?>"

4
themes/original/css/theme_right.css.php
View File

@@ -109,6 +109,10 @@ textarea {
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
} }
textarea.char {
height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset { fieldset {
margin-top: 1em; margin-top: 1em;
border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px; border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;

3
themes/pmahomme/css/theme_right.css.php
View File

@@ -226,6 +226,9 @@ textarea {
overflow: visible; overflow: visible;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
} }
textarea.char {
height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset { fieldset {
margin-top: 1em; margin-top: 1em;