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

some more nobr fixes

Browse Source
This commit is contained in:
Michal Čihař
2004-04-29 14:22:10 +00:00
parent 76089df69e
commit 2bb3740852
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -19,6 +19,8 @@ $Source$
now correctly works with multibyte strings (bug #936161). now correctly works with multibyte strings (bug #936161).
* libraries/dbi/mysql.dbi.lib.php: Do not break TEXT fields (bug #860160). * libraries/dbi/mysql.dbi.lib.php: Do not break TEXT fields (bug #860160).
* libraries/display_tbl.lib.php: Show if BLOB is null (RFE #941528). * libraries/display_tbl.lib.php: Show if BLOB is null (RFE #941528).
* tbl_properties_structure.php: Forgotten </nobr> -> </div>.
* libraries/display_tbl.lib.php: Fixed class="nobr" -> class="nowrap".
2004-04-28 Michal Cihar <michal@cihar.com> 2004-04-28 Michal Cihar <michal@cihar.com>
* css/phpmyadmin.css.php: Force <button> to be displayed inline. * css/phpmyadmin.css.php: Force <button> to be displayed inline.

4
libraries/display_tbl.lib.php
View File

@@ -824,9 +824,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_last_word = $order_link_words[$order_last_word_index]; $order_last_word = $order_link_words[$order_last_word_index];
unset($order_link_words[$order_last_word_index]); unset($order_link_words[$order_last_word_index]);
$order_link = $order_link_pre . implode(' ', $order_link_words) $order_link = $order_link_pre . implode(' ', $order_link_words)
. ' <div class="nobr">' . $order_last_word . $order_img . '</div>' . $order_link_post . "\n"; . ' <div class="nowrap">' . $order_last_word . $order_img . '</div>' . $order_link_post . "\n";
} else { } else {
$order_link = '<div class="nobr">' . $order_link_pre . $order_link_content . $order_link_post . $order_img . '</div>' . "\n"; $order_link = '<div class="nowrap">' . $order_link_pre . $order_link_content . $order_link_post . $order_img . '</div>' . "\n";
} }
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {

20
tbl_properties_structure.php
View File

@@ -235,16 +235,16 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Change'] .= '&nbsp;' . $strChange . '</div>'; $titles['Change'] .= '&nbsp;' . $strChange . '</div>';
$titles['Drop'] .= '&nbsp;' . $strDrop . '</nobr>'; $titles['Drop'] .= '&nbsp;' . $strDrop . '</div>';
$titles['NoDrop'] .= '&nbsp;' . $strDrop . '</nobr>'; $titles['NoDrop'] .= '&nbsp;' . $strDrop . '</div>';
$titles['Primary'] .= '&nbsp;' . $strPrimary . '</nobr>'; $titles['Primary'] .= '&nbsp;' . $strPrimary . '</div>';
$titles['Index'] .= '&nbsp;' . $strIndex . '</nobr>'; $titles['Index'] .= '&nbsp;' . $strIndex . '</div>';
$titles['Unique'] .= '&nbsp;' . $strUnique . '</nobr>'; $titles['Unique'] .= '&nbsp;' . $strUnique . '</div>';
$titles['IdxFulltext' ] .= '&nbsp;' . $strIdxFulltext . '</nobr>'; $titles['IdxFulltext' ] .= '&nbsp;' . $strIdxFulltext . '</div>';
$titles['NoPrimary'] .= '&nbsp;' . $strPrimary . '</nobr>'; $titles['NoPrimary'] .= '&nbsp;' . $strPrimary . '</div>';
$titles['NoIndex'] .= '&nbsp;' . $strIndex . '</nobr>'; $titles['NoIndex'] .= '&nbsp;' . $strIndex . '</div>';
$titles['NoUnique'] .= '&nbsp;' . $strUnique . '</nobr>'; $titles['NoUnique'] .= '&nbsp;' . $strUnique . '</div>';
$titles['NoIdxFulltext'] .= '&nbsp;' . $strIdxFulltext . '</nobr>'; $titles['NoIdxFulltext'] .= '&nbsp;' . $strIdxFulltext . '</div>';
} }
} else { } else {
$titles['Change'] = $strChange; $titles['Change'] = $strChange;