diff --git a/ChangeLog b/ChangeLog index af4550572..0ce3e6064 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,18 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-05-16 Alexander M. Turek + * db_details.php, db_details_structure.php, sql.php, tbl_indexes.php, + tbl_properties_structure.php, tbl_query_box.php, + images/b_dbstatistics.png, images/b_tbloptimize.png, + images/b_useradd.png, images/b_usercheck.png, images/b_userdrop.png, + images/b_useredit, libraries/display_tbl.lib.php, + libraries/display_tbl_links.lib.php: + Patch #947190 (Redesign) - Part 2, thanks to Michael Keck (mkkeck). + * libraries/functions.js: Bugfix for (un)check all features if + $cfg['ModifyAtLeft'] and $cfg['ModifyAtRight'] are enabled both, thanks + to Michael Keck (mkkeck). + 2004-05-14 Michal Čihař * libraries/auth/cookie.auth.lib.php: Use one cookie set for each server, not just one global (patch #952917, bug #687009). diff --git a/db_details.php b/db_details.php index 6d7c53ae5..9a22ef98f 100644 --- a/db_details.php +++ b/db_details.php @@ -48,19 +48,38 @@ $auto_sel = ($cfg['TextareaAutoSelect'] && !(PMA_USR_OS == 'Win' && PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER >= 7)) ? "\n" . ' onfocus="if (typeof(document.layers) == \'undefined\' || typeof(textarea_selected) == \'undefined\') {textarea_selected = 1; this.form.elements[\'sql_query\'].select();}"' : ''; + + +// added by mkkeck +$strErrorUploadDir = ''; +// is needed to check if an error in $cfg['UploadDir'] (or this dir not exist) + +// for better administration +$strHiddenFields = ' ' ."\n" + . ' ' .PMA_generate_common_hidden_inputs($db) . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n"; ?> -
+ + - - - - - - -  :
-
+
+ + + + +' . $strOr . ' ' . $strLocationTextfile . ' :
' . "\n"; - ?> -
-  
+?> +
+ + + + + + ' . "\n" + . '' . "\n" + . '' . "\n" + . ' +' . $strOr . ' ' . $strWebServerUploadDirectory . ' :
' . "\n"; - echo '
' . "\n"; + echo '
' . "\n"; + echo ' ' + . ' ' . "\n\n"; } // end if (isfirst > 0) @closedir($handle); + $strErrorUploadDir=''; // please see 'else {' below ;) } else { - echo '
' . "\n"; - echo ' ' . $strError . '
' . "\n"; - echo ' ' . $strWebServerUploadDirectoryError . "\n"; - echo '
' . "\n"; + // modified by mkkeck 2004-05-08 + // showing UploadDir Error at the end of all option for SQL-Queries + $strErrorUploadDir = ' ' . "\n"; + $strErrorUploadDir.= ' '; + $strErrorUploadDir.= '' . "\n"; } } // end if (web-server upload directory) - // Charset conversion options if ($is_upload || $is_upload_dir) { if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) { - echo '
' . "\n"; + echo '
' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; + }else{ + echo ' ' . "\n\n"; } // end if (recoding) } - // Bookmark Support if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) { - echo " $strOr $strBookmarkQuery :
\n"; - echo '
' . "\n"; + echo '
' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; + echo ' '; + echo ' ' . "\n"; + } } // Encoding setting form appended by Y.Kawada if (function_exists('PMA_set_enc_form')) { echo PMA_set_enc_form(' '); } +// modified by mkkeck 2004-05-08 +// showing UploadDir Error at the end of all option for SQL-Queries +if ($strErrorUploadDir!='') { + echo "\n\n" . '' . "\n" . $strErrorUploadDir . "\n\n"; +} ?> - - - +
+ ' + . htmlspecialchars($db) . ''; + // else use + // $strDBLink = htmlspecialchars($db); + echo ' ' . sprintf($strRunSQLQuery, $strDBLink) . ': ' . PMA_showMySQLDocu('Reference', 'SELECT'); + + ?> +

-   -
- +?> +
+ + +
 ' . $strOr . '' . "\n"; + ?> +
 
+   + '; // some browsers should respect this :) echo ' ' . PMA_generateHiddenMaxFileSize($max_upload_size) . "\n"; - $is_gzip = ($cfg['GZipDump'] && @function_exists('gzopen')); $is_bzip = ($cfg['BZipDump'] && @function_exists('bzdecompress')); if ($is_bzip || $is_gzip) { - echo ' ' . $strCompression . ':' . "\n" - . ' ' . "\n" - . '    ' . "\n" - . ' ' . "\n" - . '    ' . "\n"; + echo '
' . "\n"; + echo '   ' . $strCompression . ':
   ' . "\n" + . '   ' . "\n" + . '   ' . "\n"; if ($is_gzip) { - echo ' ' . "\n" - . '    ' . "\n"; + echo '   ' . "\n"; } if ($is_bzip) { - echo ' ' . "\n" - . '    ' . "\n"; + echo '   ' . "\n"; } } else { - echo ' ' . "\n"; - } ?> - + +
' . "\n"; + echo '  ' . $strWebServerUploadDirectory . ': ' . "\n"; + echo '
' . "\n"; + // add 2004-05-08 by mkkeck + // todo: building a php script for indexing files in UploadDir + //if ($cfg['UploadDirIndex']) { + // echo ' ' . $cfg['UploadDir'] . ' '; + //} + // end indexing echo ' ' . "\n" - . ' ' . "\n\n"; + . '
'; + if($cfg['PropertiesIconic']){ + $strErrorUploadDir.= ''; + } + $strErrorUploadDir.= ' ' . $strError . '' . "\n"; + $strErrorUploadDir.= '
'; + $strErrorUploadDir.= '  ' . wordwrap($strWebServerUploadDirectoryError,80,'
 ') . "\n"; + $strErrorUploadDir.= '
' . "\n"; $temp_charset = reset($cfg['AvailableCharsets']); - echo $strCharsetOfFile . "\n" + echo ' ' . $strCharsetOfFile . "\n" . '
' . "\n" . ' '; - echo ' ' . "\n"; + echo '
 ' . $strOr . '
' . "\n"; + echo ' ' . $strBookmarkQuery . ': ' . "\n"; echo ' ' . "
\n"; - echo ' ' . $strVar . ' (' . $strDocu . '): ' . "\n"; + echo ' ' . "\n"; + echo '
'; + echo ' ' . $strVar . ' '; + if($cfg['ReplaceHelpImg']){ + echo '' + . '' . $strDocu . ''; + }else{ + echo '(' . $strDocu . '): '; + } + echo ' ' . "\n"; + echo '
'; echo ' ' . "\n"; echo '  ' . "\n"; echo '  ' . "\n"; - echo '
' . "\n"; - echo ' ' . "\n"; - } + echo '
- + -
+ - +
' . "\n"; if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { @@ -637,7 +637,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ ?> @@ -650,7 +650,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ align="center"> - <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> ' . "\n" . ' ' . "\n" - . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" + . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" . ' ' . "\n"; } // end vertical mode } @@ -802,11 +802,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ } else if (preg_match('@[[:space:]]ASC$@i', $sort_expression)) { $sort_order .= ' DESC'; - $order_img = ' '. $GLOBALS['strAscending'] . ''; + $order_img = ' '. $GLOBALS['strAscending'] . ''; } else if (preg_match('@[[:space:]]DESC$@i', $sort_expression)) { $sort_order .= ' ASC'; - $order_img = ' '. $GLOBALS['strDescending'] . ''; + $order_img = ' '. $GLOBALS['strDescending'] . ''; } if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) { $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2]; @@ -884,14 +884,14 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ ?> align="center"> - <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> ' . "\n" . ' ' . "\n" - . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" + . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" . ' ' . "\n"; } // end vertical mode } @@ -1106,7 +1106,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { $edit_str = $GLOBALS['strEdit']; } else { - $edit_str = $iconic_spacer . '' . $GLOBALS['strEdit'] . ''; + $edit_str = $iconic_spacer . '' . $GLOBALS['strEdit'] . ''; if ($propicon == 'both') { $edit_str .= ' ' . $GLOBALS['strEdit'] . ''; } @@ -1125,7 +1125,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { $bookmark_go .= $GLOBALS['strExecuteBookmarked']; } else { - $bookmark_go .= $iconic_spacer . '' . $GLOBALS['strExecuteBookmarked'] . ''; + $bookmark_go .= $iconic_spacer . '' . $GLOBALS['strExecuteBookmarked'] . ''; if ($propicon == 'both') { $bookmark_go .= ' ' . $GLOBALS['strExecuteBookmarked'] . ''; } @@ -1155,7 +1155,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { $del_str = $GLOBALS['strDelete']; } else { - $del_str = $iconic_spacer . '' . $GLOBALS['strDelete'] . ''; + $del_str = $iconic_spacer . '' . $GLOBALS['strDelete'] . ''; if ($propicon == 'both') { $del_str .= ' ' . $GLOBALS['strDelete'] . ''; } @@ -1174,7 +1174,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { $del_str = $GLOBALS['strKill']; } else { - $del_str = $iconic_spacer . '' . $GLOBALS['strKill'] . ''; + $del_str = $iconic_spacer . '' . $GLOBALS['strKill'] . ''; if ($propicon == 'both') { $del_str .= ' ' . $GLOBALS['strKill'] . ''; } @@ -1184,6 +1184,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // 1.3 Displays the links at left if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { + $doWriteModifyAt = 'left'; require('./libraries/display_tbl_links.lib.php'); } // end if (1.3) echo (($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') ? "\n" : ''); @@ -1204,7 +1205,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $column_style = ''; } - $column_style .= ' onmousedown="if (document.getElementById(\'id_rows_to_delete' . $row_no . '\')) { document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true); }" '; + //$column_style .= ' onmousedown="if (document.getElementById(\'id_rows_to_delete' . $row_no . '\')) { document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true); }" '; + $column_style .= ' onmousedown="setCheckboxColumn(\'id_rows_to_delete' . $row_no . '\');" '; // garvin: Wrap MIME-transformations. [MIME] $default_function = 'default_function'; // default_function @@ -1446,6 +1448,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // 3. Displays the modify/delete links on the right if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { + $doWriteModifyAt = 'right'; require('./libraries/display_tbl_links.lib.php'); } // end if (3) @@ -1466,15 +1469,19 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - $vertical_display['row_delete'][$row_no] .= ' ' . "\n"; } else { unset($vertical_display['row_delete'][$row_no]); } if (isset($edit_url)) { - $vertical_display['edit'][$row_no] .= ' ' . "\n"; @@ -1483,7 +1490,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } if (isset($del_url)) { - $vertical_display['delete'][$row_no] .= ' ' . "\n"; } else { @@ -1529,7 +1536,8 @@ function PMA_displayVerticalTable() echo '' . "\n"; } - echo $val; + // echo $val; // + echo preg_replace("/%s/","",$val); $foo_counter++; } // end while echo '' . "\n"; @@ -1619,7 +1627,8 @@ function PMA_displayVerticalTable() echo '' . "\n"; } - echo $val; + // echo $val; // + echo preg_replace("/%s/","r",$val); $foo_counter++; } // end while echo '' . "\n"; @@ -1826,7 +1835,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) $delete_text = $is_display['del_lnk'] == 'dr' ? $GLOBALS['strDelete'] : $GLOBALS['strKill']; $propicon = (string)$GLOBALS['cfg']['PropertiesIconic']; ?> -   <?php echo $GLOBALS['strWithChecked']; ?> +   <?php echo $GLOBALS['strWithChecked']; ?>  /  @@ -1840,23 +1849,23 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) /* IE has trouble with '; echo ' '; if ($analyzed_sql[0]['querytype'] == 'SELECT') { echo ' '; } } else { - echo ' ' . (($propicon == 'both') ? ' ' . $GLOBALS['strEdit'] : ''); - echo ' ' . (($propicon == 'both') ? ' ' . $delete_text : ''); + echo ' ' . (($propicon == 'both') ? ' ' . $GLOBALS['strEdit'] : ''); + echo ' ' . (($propicon == 'both') ? ' ' . $delete_text : ''); if ($analyzed_sql[0]['querytype'] == 'SELECT') { - echo ' ' . (($propicon == 'both') ? ' ' . $GLOBALS['strExport'] : ''); + echo ' ' . (($propicon == 'both') ? ' ' . $GLOBALS['strExport'] : ''); } } echo "\n"; diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 0ed9e0dcf..d7d961846 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -2,20 +2,50 @@ /* $Id$ */ // vim: expandtab sw=4 ts=4 sts=4: -if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - echo ' ' . "\n"; -} -if (!empty($edit_url)) { - echo ' ' . "\n"; -} -if (!empty($del_url)) { - echo ' ' . "\n"; +// modified 2004-05-08 by Michael Keck +// - bugfix for select all checkboxes +// - copy right to left (or left to right) if user click on a check box +// - reversed the right modify links: 1. drop, 2. edit, 3. checkbox +// - also changes made in libraries/functions.js + +if ( $doWriteModifyAt == 'left' ){ + + if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { + echo ' ' . "\n"; + } + if (!empty($edit_url)) { + echo ' ' . "\n"; + } + if (!empty($del_url)) { + echo ' ' . "\n"; + } +} else if ($doWriteModifyAt == 'right') { + if (!empty($del_url)) { + echo ' ' . "\n"; + } + if (!empty($edit_url)) { + echo ' ' . "\n"; + } + if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { + echo ' ' . "\n"; + } } ?> diff --git a/libraries/functions.js b/libraries/functions.js index 35bce3c5f..da3ebe148 100644 --- a/libraries/functions.js +++ b/libraries/functions.js @@ -571,7 +571,10 @@ function setVerticalPointer(theRow, theRowNum, theAction, theDefaultColor1, theD newColor = thePointerColor; } else if (theAction == 'click' && theMarkColor != '') { newColor = theMarkColor; - marked_row[theRowNum] = true; +// marked_row[theRowNum] = true; + marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum]) + ? true + : null; } } // 4.1.2 Current color is the pointer one @@ -586,7 +589,10 @@ function setVerticalPointer(theRow, theRowNum, theAction, theDefaultColor1, theD } else if (theAction == 'click' && theMarkColor != '') { newColor = theMarkColor; - marked_row[theRowNum] = true; +// marked_row[theRowNum] = true; + marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum]) + ? true + : null; } } // 4.1.3 Current color is the marker one @@ -657,17 +663,64 @@ function setCheckboxes(the_form, do_check) * * @return boolean always true */ +// modified 2004-05-08 by Michael Keck +// - set the other checkboxes (if available) too function setCheckboxesRange(the_form, do_check, basename, min, max) -{ +{ for (var i = min; i < max; i++) { if (typeof(document.forms[the_form].elements[basename + i]) != 'undefined') { document.forms[the_form].elements[basename + i].checked = do_check; } + if (typeof(document.forms[the_form].elements[basename + i + 'r']) != 'undefined') { + document.forms[the_form].elements[basename + i + 'r'].checked = do_check; + } } return true; } // end of the 'setCheckboxesRange()' function +// added 2004-05-08 by Michael Keck +// copy the checked from left to right or from right to left +// so it's easier for users to see, if $cfg['ModifyAtRight']=true, what they've checked ;) +function copyCheckboxesRange(the_form, the_name, the_clicked) +{ + if (typeof(document.forms[the_form].elements[the_name]) != 'undefined' && typeof(document.forms[the_form].elements[the_name + 'r']) != 'undefined') { + if (the_clicked !== 'r') { + if (document.forms[the_form].elements[the_name].checked == true) { + document.forms[the_form].elements[the_name + 'r'].checked = true; + }else { + document.forms[the_form].elements[the_name + 'r'].checked = false; + } + } else if (the_clicked == 'r') { + if (document.forms[the_form].elements[the_name + 'r'].checked == true) { + document.forms[the_form].elements[the_name].checked = true; + }else { + document.forms[the_form].elements[the_name].checked = false; + } + } + } +} + + +// added 2004-05-08 by Michael Keck +// - this was directly written to each td, so why not a function ;) +// setCheckboxColumn(\'id_rows_to_delete' . $row_no . ''\'); +function setCheckboxColumn(theCheckbox){ + if (document.getElementById(theCheckbox)) { + document.getElementById(theCheckbox).checked = (document.getElementById(theCheckbox).checked ? false : true); + if (document.getElementById(theCheckbox + 'r')) { + document.getElementById(theCheckbox + 'r').checked = document.getElementById(theCheckbox).checked; + } + } else { + if (document.getElementById(theCheckbox + 'r')) { + document.getElementById(theCheckbox + 'r').checked = (document.getElementById(theCheckbox +'r').checked ? false : true); + if (document.getElementById(theCheckbox)) { + document.getElementById(theCheckbox).checked = document.getElementById(theCheckbox + 'r').checked; + } + } + } +} + /** * Checks/unchecks all options of a - - + + ' . "\n"; + echo '
' . "\n"; // Displays "Insert a new row" link if required if ($disp_mode[6] == '1') { @@ -692,9 +692,9 @@ else { . '&goto=' . urlencode($lnk_goto); echo ' ' . "\n" - . ' ' . $strInsertNewRow . ''; + . ' ' . ($cfg['PropertiesIconic'] ? '' : '') . $strInsertNewRow . ''; if ($disp_mode[9] == '1') { - echo '
'; + echo '  '; } echo "\n"; } // end insert new row @@ -712,16 +712,20 @@ else { echo ' ' . "\n" . ' ' . $strPrintView . '' . "\n"; + . '" target="print_view">' + . ($cfg['PropertiesIconic'] ? '' : '') + . $strPrintView . '' . "\n"; if (!$dontlimitchars) { - echo '
' . "\n" + echo '   ' . "\n" . ' ' . $strPrintViewFull . '' . "\n"; + . '" target="print_view">' + . ($cfg['PropertiesIconic'] ? '' : '') + . $strPrintViewFull . '  ' . "\n"; } } // end displays "printable view" - echo '

' . "\n"; + echo "\n"; } // Export link @@ -735,10 +739,12 @@ else { $single_table = ''; } echo ' ' . "\n" - . ' ' . $strExport . '' . "\n"; + . '">' + . ($cfg['PropertiesIconic'] ? '' : '') + . $strExport . '' . "\n"; } // Bookmark Support if required @@ -758,24 +764,36 @@ else { . '&id_bookmark=1'; ?> -
' . $strOr . '' . "\n"; - } + }else echo '

'; ?> -

+
- <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>
- <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>
' . "\n" - . ' ' . "\n" + $vertical_display['row_delete'][$row_no] .= ' ' . "\n" +// . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + $vertical_display['edit'][$row_no] .= ' ' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) . $bookmark_go . ' ' . "\n" + $vertical_display['delete'][$row_no] .= ' ' . "\n" . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) . '  
 
' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . $bookmark_go - . ' ' . "\n" - . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) - . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) + . $bookmark_go + . ' ' . "\n" + . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) + . ' ' . "\n" + . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) + . ' ' . "\n" + . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) + . $bookmark_go + . ' ' . "\n" + . ' ' . "\n" + . '
+ + + + + + + +
' : '') + . $strBookmarkThis; +?>
: + - +
+
- +
-
+ +
- -

+ +
- + + - + -
   - -   +
'; + } +?>
     +

- + + +
:  @@ -369,11 +374,7 @@ else if (!defined('PMA_IDX_INCLUDED') echo "\n"; ?> -

- -
- - 		'; @@ -381,22 +382,31 @@ else if (!defined('PMA_IDX_INCLUDED') if (isset($idx_num_fields)) { echo ' ' . "\n"; } - echo '

' . "\n"; - echo ' ' . sprintf($strAddToIndex, '') . "\n"; - echo '  ' . "\n"; - + echo ' ' . "\n"; + echo ' ' . sprintf($strAddToIndex, '') . "\n"; + echo '  ' . "\n"; +?>
+ + + + -
+ + + '; - $drop_link_text = '' . $strDrop . ''; + $edit_link_text = '' . $strEdit . ''; + $drop_link_text = '' . $strDrop . ''; } + //print_r($cfg['PropertiesIconic']); 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) { ?> -
' ."\n"; + echo ' ' . $strIndexes . ':' . "\n"; + echo ' ' . PMA_showMySQLDocu('MySQL_Optimisation', 'Optimising_Database_Structure') . "\n"; +?>
+ @@ -492,26 +503,29 @@ else if (!defined('PMA_IDX_INCLUDED') } // end while } // end while ?> -

+ ' . "\n"; - echo ' ' . $strNoIndex . '

' . "\n\n"; + echo "\n" . ' ' . "\n"; + if($cfg['ErrorIconic']){ + echo 'Warning'; + } + echo ' ' . $strNoIndex . '' . "\n\n"; } - echo ' ' . sprintf($strCreateIndex, '') . "\n"; - echo '  ' . "\n"; - echo ' '; + echo ' ' + . sprintf($strCreateIndex, '') . "\n"; + echo '  ' . "\n"; + echo ' '; +?> +
+ - - - - +
@@ -231,17 +231,18 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $iconic_spacer = ''; } - $titles['Change'] = $iconic_spacer . '' . $strChange . ''; - $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; - $titles['NoDrop'] = $iconic_spacer . '' . $strDrop . ''; - $titles['Primary'] = $iconic_spacer . '' . $strPrimary . ''; - $titles['Index'] = $iconic_spacer . '' . $strIndex . ''; - $titles['Unique'] = $iconic_spacer . '' . $strUnique . ''; - $titles['IdxFulltext'] = $iconic_spacer . '' . $strIdxFulltext . ''; - $titles['NoPrimary'] = $iconic_spacer . '' . $strPrimary . ''; - $titles['NoIndex'] = $iconic_spacer . '' . $strIndex . ''; - $titles['NoUnique'] = $iconic_spacer . '' . $strUnique . ''; - $titles['NoIdxFulltext'] = $iconic_spacer . '' . $strIdxFulltext . ''; + // images replaced 2004-05-08 by mkkeck + $titles['Change'] = $iconic_spacer . '' . $strChange . ''; + $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; + $titles['NoDrop'] = $iconic_spacer . '' . $strDrop . ''; + $titles['Primary'] = $iconic_spacer . '' . $strPrimary . ''; + $titles['Index'] = $iconic_spacer . '' . $strIndex . ''; + $titles['Unique'] = $iconic_spacer . '' . $strUnique . ''; + $titles['IdxFulltext'] = $iconic_spacer . '' . $strIdxFulltext . ''; + $titles['NoPrimary'] = $iconic_spacer . '' . $strPrimary . ''; + $titles['NoIndex'] = $iconic_spacer . '' . $strIndex . ''; + $titles['NoUnique'] = $iconic_spacer . '' . $strUnique . ''; + $titles['NoIdxFulltext'] = $iconic_spacer . '' . $strIdxFulltext . ''; if ($propicon == 'both') { $titles['Change'] .= ' ' . $strChange . ''; @@ -283,7 +284,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { */ if (PMA_USR_BROWSER_AGENT != 'IE') { echo '' . "\n"; } else { - echo ' ' . (($propicon == 'both') ? ' ' . $strChange : '') . "\n"; + echo ' ' . (($propicon == 'both') ? ' ' . $strChange : '') . "\n"; } // Drop button if there is at least two fields if ($fields_cnt > 1) { if (PMA_USR_BROWSER_AGENT != 'IE') { echo ' ' . "\n"; } else { - echo ' ' . (($propicon == 'both') ? ' ' . $strDrop : '') . "\n"; + echo ' ' . (($propicon == 'both') ? ' ' . $strDrop : '') . "\n"; } } } else { @@ -428,9 +429,78 @@ if ($cfg['PropertiesIconic']) {
   bgcolor="" nowrap="nowrap">  bgcolor="" nowrap="nowrap">  - + @@ -292,7 +293,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { if ($fields_cnt > 1) { echo "\n"; ?> - - - + - + - +
- +
+ + + + + + + + + +
+ + '; + } + echo $strPrintView; + ?>   + + + + '; + } + echo $strRelationView; + ?>   + + + '; + } + echo $strStructPropose; + ?> +
+ '; + } + echo $strAddNewField . ': '; + ?> + + + +
+
-
@@ -503,9 +572,9 @@ if ($cfg['ShowStats']) {   - - +
+ @@ -556,8 +625,13 @@ if ($cfg['ShowStats']) { echo "\n"; ?> -
- [] + + '; + } + echo $strOptimizeTable; + ?>
  - - +
+ @@ -718,73 +792,13 @@ echo "\n";
- - - - -
    - - -
  • - -
    • - - -
  • -
    - -  : - - - -
    -
    • - - - -
  • - -
    • - - - -
  • - - - -
    • - -
- - -
+ -
+   +