diff --git a/ChangeLog b/ChangeLog index 695df2531..49bcbf574 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,11 @@ $Source$ 2004-04-27 Michal Cihar * calendar.php, libraries/tbl_change.js: Don't reset clock when moving in calendar. + * db_details_links.php, db_details_structure.php, left.php, + querywindow.php, tbl_change.php, tbl_indexes.php, + tbl_properties_links.php, tbl_properties_structure.php, + tbl_query_box.php, tbl_select.php, css/phpmyadmin.css.php, + libraries/common.lib.php, libraries/display_tbl.lib.php: Be valid XHTML. 2004-04-27 Garvin Hicking * libraries/display_tbl.lib.php: RFE #867284 - Click on result row diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index e7b2ea925..2ec0d820d 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -277,3 +277,7 @@ img.calendar { form.clock { text-align: center; } + +.nowrap { + white-space: nowrap; +} diff --git a/db_details_links.php b/db_details_links.php index c526ad959..74b71b4e9 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -47,8 +47,8 @@ if ($cfg['AllowUserDropDatabase']) { . '&zero_rows=' . urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db)))) . '&goto=main.php&back=db_details' . $sub_part . '.php&reload=1&purge=1'; - $att5 = 'class="drop" ' - . 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; + $att5 = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; + $class5 = 'drop'; } else { $lnk5 = ''; @@ -75,7 +75,7 @@ echo PMA_printTab($strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_q // Displays drop link if ($lnk5) { - echo PMA_printTab($strDrop, $lnk5, $arg5, $att5); + echo PMA_printTab($strDrop, $lnk5, $arg5, $att5, $class5); } // end if echo "\n"; diff --git a/db_details_structure.php b/db_details_structure.php index bf205a74d..3c8507a6b 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -176,7 +176,7 @@ if ($cfg['PropertiesIconic'] == true) { $propicon = (string)$cfg['PropertiesIconic']; if ($propicon == 'both') { - $iconic_spacer = ''; + $iconic_spacer = '
'; } else { $iconic_spacer = ''; } @@ -192,15 +192,15 @@ if ($cfg['PropertiesIconic'] == true) { $titles['NoEmpty'] = $iconic_spacer . '' . $strEmpty . ''; if ($propicon == 'both') { - $titles['Browse'] .= ' ' . $strBrowse . ''; - $titles['Search'] .= ' ' . $strSearch . ''; - $titles['NoBrowse'] .= ' ' . $strBrowse . ''; - $titles['NoSearch'] .= ' ' . $strSearch . ''; - $titles['Insert'] .= ' ' . $strInsert . ''; - $titles['Properties'] .= ' ' . $strProperties . ''; - $titles['Drop'] .= ' ' . $strDrop . ''; - $titles['Empty'] .= ' ' . $strEmpty . ''; - $titles['NoEmpty'] .= ' ' . $strEmpty . ''; + $titles['Browse'] .= ' ' . $strBrowse . '
'; + $titles['Search'] .= ' ' . $strSearch . ''; + $titles['NoBrowse'] .= ' ' . $strBrowse . ''; + $titles['NoSearch'] .= ' ' . $strSearch . ''; + $titles['Insert'] .= ' ' . $strInsert . ''; + $titles['Properties'] .= ' ' . $strProperties . ''; + $titles['Drop'] .= ' ' . $strDrop . ''; + $titles['Empty'] .= ' ' . $strEmpty . ''; + $titles['NoEmpty'] .= ' ' . $strEmpty . ''; } } else { $titles['Browse'] = $strBrowse; diff --git a/left.php b/left.php index 4b5a420ad..d7fea812d 100644 --- a/left.php +++ b/left.php @@ -94,9 +94,9 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_ echo "\n"; echo PMA_indent($indent * 5) . '
' . "\n"; - echo PMA_indent($indent * 6) . ''; + echo PMA_indent($indent * 6) . '
'; echo '+' . "\n"; - echo PMA_indent($indent * 6) . '' . htmlspecialchars($name) . '  (' . $counter . ')' . "\n"; + echo PMA_indent($indent * 6) . '' . htmlspecialchars($name) . '  (' . $counter . ')
' . "\n"; echo PMA_indent($indent * 5) . '
' . "\n"; echo "\n"; @@ -163,13 +163,13 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory $loops = 0; foreach($tablestack['pma_name'] AS $tkey => $tval) { - echo PMA_indent($indent * 5) . ''; + echo PMA_indent($indent * 5) . '
'; $items = explode("\n", $tablestack['pma_list_item'][$tkey]); foreach($items AS $ikey => $ival) { echo "\n"; echo PMA_indent(($indent * 5)) . $ival; } - echo "\n"; + echo "
\n"; $loops++; } @@ -383,13 +383,13 @@ if ($cfg['LeftDisplayServers']) { echo "\n"; ?> -
- +
+ - - + - @@ -491,27 +491,27 @@ if ($num_dbs > 1) { $on_mouse = (($cfg['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"'); echo "\n"; - echo '
'; + echo '
'; if (!empty($num_tables)) { echo "\n"; ?> - + + - - + - - ' . htmlspecialchars($db_tooltip) . '' : htmlspecialchars($db)); ?>  () + ' . htmlspecialchars($db_tooltip) . '' : htmlspecialchars($db)); ?>  ()
-
> +
> 1) { $list_item .= '' . $strBrowse . ': ' . $url_title . ''; $list_item .= ' ' . "\n"; $list_item .= ''; - $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '
' . "\n"; + $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '
' . "\n"; // garvin: Check whether to display nested sets if (!empty($cfg['LeftFrameTableSeparator'])) { @@ -588,13 +588,13 @@ if ($num_dbs > 1) { // natural order or not, use an array for the table list - $table_array[$table] .= ' ' . "\n"; + $table_array[$table] .= '
' . "\n"; $table_array[$table] .= ' ' . $strBrowse . ': ' . $url_title . ' ' . "\n"; if (PMA_USR_BROWSER_AGENT == 'IE') { - $table_array[$table] .= ' ' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '
' . "\n"; + $table_array[$table] .= ' ' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '

' . "\n"; } else { - $table_array[$table] .= ' ' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '
' . "\n"; + $table_array[$table] .= ' ' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '

' . "\n"; } $table_title[$table] = htmlspecialchars($table); @@ -721,19 +721,19 @@ else if ($num_dbs == 1) { if (!empty($num_tables)) { echo "\n"; ?> - +
+ - - +
- - ' . htmlspecialchars($db_tooltip) . '' : htmlspecialchars($db)); ?>  () + ' . htmlspecialchars($db_tooltip) . '' : htmlspecialchars($db)); ?>  ()
> @@ -741,9 +741,9 @@ else if ($num_dbs == 1) { } else { echo "\n"; ?> -
- -   () +
'; if ($cfg['LeftFrameLight']) { echo "\n"; ?> - + <?php echo $strBrowse . ': ' . $url_title; ?>  -
+

'; $list_item .= '' . $strBrowse . ': ' . $url_title . ''; $list_item .= ' ' . "\n"; $list_item .= ''; - $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '
'; + $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '

'; // garvin: Check whether to display nested sets if (!empty($cfg['LeftFrameTableSeparator'])) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 9b7d573f3..bce11d0b6 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1663,10 +1663,12 @@ if (typeof(document.getElementById) != 'undefined' * * @access public */ - function PMA_printTab($text, $link, $args = '', $attr = '', $sep = '?', $active = false) { + function PMA_printTab($text, $link, $args = '', $attr = '', $class = '', $sep = '?', $active = false) { global $PHP_SELF, $cfg; global $db_details_links_count_tabs; + if ($class != '') $class .= ' '; + if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || $active || (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link) @@ -1694,21 +1696,21 @@ if (typeof(document.getElementById) != 'undefined' if ($cfg['LightTabs']) { $out = ''; if (strlen($link) > 0) { - $out .= '' - . '' . $text . ''; + $out .= '' + . '' . $text . ''; } else { - $out .= '' . $text . ''; + $out .= '' . $text . ''; } $out = '[ ' . $out . ' ]   '; } else { $out = "\n" . ' ' - . '' + . '' . "\n" . ' '; if (strlen($link) > 0) { - $out .= '' - . '' . $text . ''; + $out .= '' + . '' . $text . ''; } else { - $out .= '' . $text . ''; + $out .= '' . $text . ''; } $out .= "\n" . ' ' . '' diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index cd7e2ad22..ad1778af9 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -261,7 +261,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query)
+ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', 1) && checkFormElementInRange(this, 'pos', 0, ))"> @@ -528,60 +528,44 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $span = $num_rows + floor($num_rows/$repeat_cells) + 1; } - ?> - - - ' . "\n"; - echo PMA_generate_common_hidden_inputs($db, $table, 5); - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo $GLOBALS['strSortByKey'] . ': ' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo $GLOBALS['strSortByKey'] . ':  '; + echo "\n"; + echo ''; + echo "\n"; + echo '
'; echo "\n"; - } - echo ''; - echo "\n"; - echo ' '; - echo "\n"; - echo ''; - echo "\n"; - echo ''; - echo "\n"; - ?> - - - - - - ' . "\n"; } + echo '' . "\n" + . '' . "\n"; + if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { + ?> + + + ' . "\n" . $comments_table_wrap_pre - . ' ' . "\n" - . ' ' . htmlspecialchars($fields_meta[$i]->name) . '' . $order_img . "\n" + . ' ' + . htmlspecialchars($fields_meta[$i]->name) . '' . $order_img . "\n" . $comments_table_wrap_post . ' ' . "\n"; } // end if (2.1) @@ -1045,7 +1060,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $propicon = (string)$GLOBALS['cfg']['PropertiesIconic']; if ($propicon == 'both') { - $iconic_spacer = ''; + $iconic_spacer = '
'; } else { $iconic_spacer = ''; } @@ -1069,7 +1084,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } else { $edit_str = $iconic_spacer . '' . $GLOBALS['strEdit'] . ''; if ($propicon == 'both') { - $edit_str .= ' ' . $GLOBALS['strEdit'] . ''; + $edit_str .= ' ' . $GLOBALS['strEdit'] . '
'; } } } // end if (1.2.1) @@ -1088,7 +1103,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } else { $bookmark_go .= $iconic_spacer . '' . $GLOBALS['strExecuteBookmarked'] . ''; if ($propicon == 'both') { - $bookmark_go .= ' ' . $GLOBALS['strExecuteBookmarked'] . ''; + $bookmark_go .= ' ' . $GLOBALS['strExecuteBookmarked'] . ''; } } @@ -1118,7 +1133,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } else { $del_str = $iconic_spacer . '' . $GLOBALS['strDelete'] . ''; if ($propicon == 'both') { - $del_str .= ' ' . $GLOBALS['strDelete'] . ''; + $del_str .= ' ' . $GLOBALS['strDelete'] . ''; } } } else if ($is_display['del_lnk'] == 'kp') { // kill process case @@ -1137,7 +1152,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } else { $del_str = $iconic_spacer . '' . $GLOBALS['strKill'] . ''; if ($propicon == 'both') { - $del_str .= ' ' . $GLOBALS['strKill'] . ''; + $del_str .= ' ' . $GLOBALS['strKill'] . ''; } } } // end if (1.2.2) @@ -1217,7 +1232,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' ' . "\n"; } else if ($row[$i] != '') { - $vertical_display['data'][$row_no][$i] = ' ' . "\n"; } else { - $vertical_display['data'][$row_no][$i] = ' ' . "\n"; + $vertical_display['data'][$row_no][$i] = ' ' . "\n"; } // b l o b @@ -1764,14 +1779,6 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) // end 2b // 3. ----- Displays the results table ----- - echo '' . "\n" - . '
> - - > - name)), "
\n") : htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name))); ?> - + '; + + if ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake') { + echo PMA_flipstring(htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name)), "
\n"); + } else { + echo htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name)); + } + + echo ''; + echo $order_img . "\n"; + echo $comments_table_wrap_post; + ?> 		NULL'; + $vertical_display['data'][$row_no][$i] = ' '; if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { foreach($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) { @@ -1267,7 +1282,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } $vertical_display['data'][$row_no][$i] .= '  
' . "\n"; PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt, $analyzed_sql); $url_query=''; PMA_displayTableBody($dt_result, $is_display, $map, $analyzed_sql); diff --git a/querywindow.php b/querywindow.php index bb161a93e..928c0fca1 100644 --- a/querywindow.php +++ b/querywindow.php @@ -103,12 +103,12 @@ if ($cfg['QueryFrameJS'] && !isset($no_js)) { '; } echo "\n"; - echo PMA_printTab($strSQL, '#', '', 'onClick="javascript:query_tab_commit(\'sql\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE)); - echo PMA_printTab($strImportFiles, '#', '', 'onClick="javascript:query_tab_commit(\'files\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE)); - echo PMA_printTab($strQuerySQLHistory, '#', '', 'onClick="javascript:query_tab_commit(\'history\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE)); + echo PMA_printTab($strSQL, '#', '', 'onClick="javascript:query_tab_commit(\'sql\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE)); + echo PMA_printTab($strImportFiles, '#', '', 'onClick="javascript:query_tab_commit(\'files\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE)); + echo PMA_printTab($strQuerySQLHistory, '#', '', 'onClick="javascript:query_tab_commit(\'history\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE)); if ($cfg['QueryWindowDefTab'] == 'full') { - echo PMA_printTab($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE)); + echo PMA_printTab($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE)); } if (!$cfg['LightTabs']) { @@ -129,7 +129,7 @@ if ($cfg['PropertiesIconic'] == true) { $propicon = (string)$cfg['PropertiesIconic']; if ($propicon == 'both') { - $iconic_spacer = ''; + $iconic_spacer = '
'; } else { $iconic_spacer = ''; } @@ -137,7 +137,7 @@ if ($cfg['PropertiesIconic'] == true) { $titles['Change'] = $iconic_spacer . '' . $strChange . ''; if ($propicon == 'both') { - $titles['Change'] .= ' ' . $strChange . ' '; + $titles['Change'] .= ' ' . $strChange . ' 
'; } } else { $titles['Change'] = $strChange; diff --git a/tbl_change.php b/tbl_change.php index 674a58830..693a916a6 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -178,7 +178,7 @@ if ($cfg['PropertiesIconic'] == true) { $propicon = (string)$cfg['PropertiesIconic']; if ($propicon == 'both') { - $iconic_spacer = ''; + $iconic_spacer = '
'; } else { $iconic_spacer = ''; } @@ -186,7 +186,7 @@ if ($cfg['PropertiesIconic'] == true) { $titles['Browse'] = $iconic_spacer . '' . $strBrowseForeignValues . ''; if ($propicon == 'both') { - $titles['Browse'] .= ' ' . $strBrowseForeignValues . ''; + $titles['Browse'] .= ' ' . $strBrowseForeignValues . '
'; } } else { $titles['Browse'] = $strBrowseForeignValues; diff --git a/tbl_indexes.php b/tbl_indexes.php index fe2cce2a2..aa8df74cf 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -404,16 +404,16 @@ else if (!defined('PMA_IDX_INCLUDED') $propicon = (string)$cfg['PropertiesIconic']; if ($cfg['PropertiesIconic'] === true || $propicon == 'both') { - $edit_link_text = '' . $strEdit . ''; - $drop_link_text = '' . $strDrop . ''; + $edit_link_text = '' . $strEdit . ''; + $drop_link_text = '' . $strDrop . ''; } if ($cfg['PropertiesIconic'] === false || $propicon == 'both') { $edit_link_text .= $strEdit; $drop_link_text .= $strDrop; } if ($propicon == 'both') { - $edit_link_text = '' . $edit_link_text . ''; - $drop_link_text = '' . $drop_link_text . ''; + $edit_link_text = '
' . $edit_link_text . '
'; + $drop_link_text = '
' . $drop_link_text . '
'; } if ($idx_cnt > 0) { diff --git a/tbl_properties_links.php b/tbl_properties_links.php index e5a87e027..5802d324a 100644 --- a/tbl_properties_links.php +++ b/tbl_properties_links.php @@ -43,7 +43,8 @@ if ($table_info_num_rows > 0) { . urlencode($ln6_stt . PMA_backquote($table)) . '&zero_rows=' . urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); - $att6 = 'class="drop" onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"'; + $att6 = 'onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"'; + $class6 = 'drop'; } else { $lnk2 = ''; $arg2 = ''; @@ -52,10 +53,12 @@ if ($table_info_num_rows > 0) { $lnk6 = ''; $arg6 = ''; $att6 = ''; + $class6 = ''; } $arg7 = $url_query . '&reload=1&purge=1&sql_query=' . urlencode('DROP TABLE ' . PMA_backquote($table) ) . '&zero_rows=' . urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); -$att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"'; +$att7 = 'onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"'; +$class7 = 'drop'; /** @@ -77,8 +80,8 @@ echo PMA_printTab($strStructure, 'tbl_properties_structure.php', $url_query) . PMA_printTab($strInsert, 'tbl_change.php', $url_query) . PMA_printTab($strExport, 'tbl_properties_export.php', $url_query . '&single_table=true') . PMA_printTab($strOperations, 'tbl_properties_operations.php', $url_query) - . PMA_printTab($strEmpty, $lnk6, $arg6, $att6) - . PMA_printTab($strDrop, 'sql.php', $arg7, $att7) + . PMA_printTab($strEmpty, $lnk6, $arg6, $att6, $class6) + . PMA_printTab($strDrop, 'sql.php', $arg7, $att7, $class7) . "\n"; if (!$cfg['LightTabs']) { diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index c21c787b9..e3e53025c 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -216,7 +216,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $propicon = (string)$cfg['PropertiesIconic']; if ($propicon == 'both') { - $iconic_spacer = ''; + $iconic_spacer = '
'; } else { $iconic_spacer = ''; } @@ -234,7 +234,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $titles['NoIdxFulltext'] = $iconic_spacer . '' . $strIdxFulltext . ''; if ($propicon == 'both') { - $titles['Change'] .= ' ' . $strChange . ''; + $titles['Change'] .= ' ' . $strChange . '
'; $titles['Drop'] .= ' ' . $strDrop . ''; $titles['NoDrop'] .= ' ' . $strDrop . ''; $titles['Primary'] .= ' ' . $strPrimary . ''; diff --git a/tbl_query_box.php b/tbl_query_box.php index 35826b9e5..0e13768b5 100644 --- a/tbl_query_box.php +++ b/tbl_query_box.php @@ -90,6 +90,7 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS' $form_items = 0; +echo "
  • \n"; if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) { ?>
    • '; + $iconic_spacer = '
    '; } else { $iconic_spacer = ''; } @@ -24,7 +24,7 @@ if ($cfg['PropertiesIconic'] == true) { $titles['Browse'] = $iconic_spacer . '' . $strBrowseForeignValues . ''; if ($propicon == 'both') { - $titles['Browse'] .= ' ' . $strBrowseForeignValues . ''; + $titles['Browse'] .= ' ' . $strBrowseForeignValues . '
    '; } } else { $titles['Browse'] = $strBrowseForeignValues;