diff --git a/ChangeLog b/ChangeLog index bdb6ede47..542ee2636 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-10-08 Garvin Hicking + * lots of files: Adjusted superfluous spaces, added + more CSS-ID attributes for better themeability. + 2004-10-04 Michal Čihař * tbl_query_box.php: Reenabled %f substitution. diff --git a/db_datadict.php b/db_datadict.php index 50f7b19e3..ab42e6dc0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -153,7 +153,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { * Displays the comments of the table if MySQL >= 3.23 */ if (!empty($show_comment)) { - echo $strTableComments . ' : ' . $show_comment . '

'; + echo $strTableComments . ': ' . $show_comment . '

'; } /** diff --git a/db_details.php b/db_details.php index 830af4140..c11c921e7 100644 --- a/db_details.php +++ b/db_details.php @@ -88,8 +88,7 @@ if (!empty($query_to_display)) { - - + diff --git a/db_details_importdocsql.php b/db_details_importdocsql.php index 0103be0b2..3b9ad746f 100644 --- a/db_details_importdocsql.php +++ b/db_details_importdocsql.php @@ -239,7 +239,7 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) { // garvin: displays import dump feature only if file upload available if ($is_upload) { echo '

'; - echo ' ' . $strOr . ' ' . $strLocationTextfile . ' :
' . "\n"; + echo ' ' . $strOr . ' ' . $strLocationTextfile . ':
' . "\n"; ?>

@@ -266,17 +266,13 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) { $is_bzip = ($cfg['BZipDump'] && @function_exists('bzdecompress')); if ($is_bzip || $is_gzip) { echo ' ' . $strCompression . ':' . "\n" - . ' ' . "\n" - . '    ' . "\n" - . ' ' . "\n" - . '    ' . "\n"; + . '    ' . "\n" + . '    ' . "\n"; if ($is_gzip) { - echo ' ' . "\n" - . '    ' . "\n"; + echo '    ' . "\n"; } if ($is_bzip) { - echo ' ' . "\n" - . '    ' . "\n"; + echo '    ' . "\n"; } } else { echo ' ' . "\n"; diff --git a/db_details_links.php b/db_details_links.php index 027431407..c20eba6a6 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -63,7 +63,7 @@ else { if ($cfg['LightTabs']) { echo ' '; } else { - echo '' . "\n" + echo '
' . "\n" . ' ' . "\n" . '
' . ' ' diff --git a/db_details_qbe.php b/db_details_qbe.php index 87d5ed77b..870aa67fe 100644 --- a/db_details_qbe.php +++ b/db_details_qbe.php @@ -395,7 +395,7 @@ for ($y = 0; $y <= $row; $y++) { -
-  : + : /> @@ -629,7 +629,7 @@ for ($x = 0; $x < $col; $x++) { - +   : @@ -1061,7 +1061,7 @@ if (!empty($qry_orderby)) {
+
0 } // end if ?> + +
0) { $takeaway = $url_query . '&table=' . urlencode($table); } -if (($cfgRelation['pdfwork'] && $num_tables > 0) || -($num_tables > 0 - && $cfgRelation['relwork'] && $cfgRelation['commwork'] - && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) - ) -) { ?>
0) { - ?> +if (($cfgRelation['pdfwork'] && $num_tables > 0) || + ($num_tables > 0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + )) { ?> +
+ 0) { ?> - - + } ?>PDF + + + + + 0) { $test_query = 'SELECT * FROM ' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; $test_rs = PMA_query_as_cu($test_query, NULL, PMA_DBI_QUERY_STORE); - if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { - echo "\n"; - ?> - - + - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + + + + + + - - 0 @@ -888,23 +885,29 @@ if ($num_tables > 0 ) { ?> - + + + 0) || -($num_tables > 0 - && $cfgRelation['relwork'] && $cfgRelation['commwork'] - && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) - ) -) { ?>
- + + '; - } -?>PDF
'; - if ($cfg['PropertiesIconic']) { - echo ''; - } - echo ''. $strEditPDFPages . ''; - ?>
+ '; + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo ''. $strEditPDFPages . ''; + ?> +
- 0) { ?> +
+ '; } - echo $strDisplayPDF; -?>: 
  -   -
  - -
  - -
  - -
  - -
  - -
  - -
  + +
+ +
+
+
+
+
+ + +
  - -
+ + +
  -   
   
'; - if ($cfg['PropertiesIconic']) { - echo ''; - } - echo $strImportDocSQL . ''; - ?> -
+ '; + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo $strImportDocSQL . ''; + ?> +
0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + )) { ?> + + +  - /> -  *
- /> -  *
- /> -
- /> -
+ /> *
+ /> *
+ />
+ />

*  diff --git a/header.inc.php b/header.inc.php index 6b2c520d9..242242c77 100644 --- a/header.inc.php +++ b/header.inc.php @@ -152,7 +152,7 @@ if (empty($GLOBALS['is_header_sent'])) { */ if (PMA_DISPLAY_HEADING) { - echo '' . "\n" + echo '
' . "\n" . ' ' . "\n"; $header_url_qry = '?' . PMA_generate_common_url(); $server_info = (!empty($cfg['Server']['verbose']) diff --git a/index.php b/index.php index 2138572f8..d6be3cca7 100644 --- a/index.php +++ b/index.php @@ -79,14 +79,14 @@ $query_frame_height = 0; if ($cfg['LeftDisplayLogo'] && @file_exists($logo_image)) { $tmp_imgsize = @getimagesize($logo_image); $query_frame_height = ($tmp_imgsize[1] + 60); - // increase the height to take into account font size differences in + // increase the height to take into account font size differences in // theme 'original'? (TODO: improve with a parameter in layout.inc.php) $query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 25 : 0); } if ($query_frame_height == 0) { $query_frame_height = 60; } -// increase the height to take into account font size differences in +// increase the height to take into account font size differences in // theme 'original'? (TODO: improve with a parameter in layout.inc.php) $query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 20 : 10); @@ -114,10 +114,10 @@ if ($cfg['QueryFrame']) { echo ' +
- +
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ea8cd3520..3259f7848 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -186,11 +186,9 @@ if (isset($sql_query)) { @@ -211,42 +208,33 @@ if (!$hide_structure) { ?> @@ -306,8 +286,7 @@ if (!$hide_structure) { ?> @@ -519,8 +491,7 @@ if (!$hide_structure) { ?>
:
- style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
- style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
:
- style="vertical-align: middle" /> - + style="vertical-align: middle" />
- onclick="if (!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" /> -
+ onclick="if (!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
    
-          style="vertical-align: middle" /> -
+          style="vertical-align: middle" />
-          style="vertical-align: middle" /> -
+          style="vertical-align: middle" />
-          style="vertical-align: middle" /> -
+          style="vertical-align: middle" />
-          style="vertical-align: middle" /> -
+          style="vertical-align: middle" />
@@ -259,26 +247,19 @@ if (!$hide_structure) { ?>
- onclick="if (!this.checked && (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" style="vertical-align: middle" /> -
+ onclick="if (!this.checked && (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
- - @@ -297,8 +278,7 @@ if (!$hide_structure) { ?>
- style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
- onclick="if (!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" style="vertical-align: middle" /> -
+ onclick="if (!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" style="vertical-align: middle" />
@@ -334,20 +313,17 @@ if (!$hide_structure) { ?> -      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
-      style="vertical-align: middle" /> -
+      style="vertical-align: middle" />
@@ -359,10 +335,8 @@ if (!$hide_structure) { ?>
     
- onclick="if (!this.checked && (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" style="vertical-align: middle" /> -
-      style="vertical-align: middle" /> -
+ onclick="if (!this.checked && (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" style="vertical-align: middle" />
+      style="vertical-align: middle" />
@@ -448,8 +422,7 @@ if (!$hide_structure) { ?>
    
- style="vertical-align: middle" /> - + style="vertical-align: middle" />
@@ -474,8 +447,7 @@ if (!$hide_structure) { ?>
- style="vertical-align: middle" /> - + style="vertical-align: middle" />
- /> - + />
@@ -565,17 +536,14 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
- style="vertical-align: middle" /> - + style="vertical-align: middle" />
-      style="vertical-align: middle" /> - ,
-      style="vertical-align: middle" /> - +      style="vertical-align: middle" />,
+      style="vertical-align: middle" />
@@ -605,8 +573,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) { echo '" '; ?> style="vertical-align: middle" /> ( - style="vertical-align: middle" /> - + style="vertical-align: middle" /> )* -
-
+
1 diff --git a/read_dump.php b/read_dump.php index f03dfb0a0..f84378b5d 100644 --- a/read_dump.php +++ b/read_dump.php @@ -411,7 +411,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) { $message = $strNoQuery; } } else if ($sql_query_cpy == '') { - $message = "$strSuccess :
$strTheContent ($pieces_count $strInstructions) "; + $message = "$strSuccess:
$strTheContent ($pieces_count $strInstructions) "; } else { $message = $strSuccess; } diff --git a/server_links.inc.php b/server_links.inc.php index 8dd7caede..0f724a4aa 100644 --- a/server_links.inc.php +++ b/server_links.inc.php @@ -44,7 +44,7 @@ if (!empty($message)) { if ($cfg['LightTabs']) { echo ' '; } else { - echo '' . "\n" + echo '
' . "\n" . ' ' . "\n" . ' diff --git a/tbl_printview.php b/tbl_printview.php index b63f6609a..647481a8d 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -58,7 +58,7 @@ if ($multi_tables) { $tbl_list .= (empty($tbl_list) ? '' : ', ') . PMA_backquote(urldecode($table)); } - echo ''. $strShowTables . ' : ' . $tbl_list . '' . "\n"; + echo ''. $strShowTables . ': ' . $tbl_list . '' . "\n"; echo '
' . "\n"; } // end if @@ -155,7 +155,7 @@ foreach ($the_tables AS $key => $table) { * Displays the comments of the table if MySQL >= 3.23 */ if (!empty($show_comment)) { - echo $strTableComments . ' : ' . $show_comment . '

'; + echo $strTableComments . ': ' . $show_comment . '

'; } /** @@ -301,7 +301,7 @@ foreach ($the_tables AS $key => $table) {

-  + 
' . ' ' diff --git a/server_privileges.php b/server_privileges.php index c0415991a..5d3551431 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -28,7 +28,7 @@ if (!empty($pred_tablename)) { if (!$is_superuser) { require('./server_links.inc.php'); echo '

' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') . ' ' . $strPrivileges . "\n" . '

' . "\n" . $strNoPrivileges . "\n"; @@ -255,8 +255,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } echo $spaces . '
' . "\n" . $spaces . ' ' . $GLOBALS['strOr'] . '
' . "\n" - . $spaces . ' ' . "\n" - . $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . ' ' . "\n"; unset($rowspan); list($current_grant, $current_grant_value) = each($row); @@ -537,7 +533,7 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0) . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . '' . "\n"; -} // end of the 'PMA_displayUserAndHostFields()' function +} // end of the 'PMA_displayUserAndHostFields()' function /** @@ -642,7 +638,7 @@ if (!empty($adduser_submit) || !empty($change_copy)) { $message = $strAddUserMessage; } else { $queries[] = $real_sql_query; - // we put the query containing the hidden password in + // we put the query containing the hidden password in // $queries_for_display, at the same position occupied // by the real query in $queries $tmp_count = count($queries); @@ -912,7 +908,7 @@ if (empty($adduser) && empty($checkprivs)) { if (!isset($username)) { // No username is given --> display the overview echo '

' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') . $strUserOverview . "\n" . '

' . "\n"; $oldPrivTables = FALSE; @@ -1000,15 +996,15 @@ if (empty($adduser) && empty($checkprivs)) { . ' ' . "\n" . '
' . "\n" . $spaces . '
' . "\n" . $spaces . ' ' . $GLOBALS['strOr'] . '
' . "\n" - . $spaces . ' ' . "\n" - . $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . ' 		' . "\n" . $spaces . '
' . "\n" . $spaces . ' ' . $GLOBALS['strOr'] . '
' . "\n" - . $spaces . ' ' . "\n" - . $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . ' 		' . "\n" . $spaces . '
' . "\n" . $spaces . ' ' . $GLOBALS['strOr'] . '
' . "\n" - . $spaces . ' ' . "\n" - . $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . '
' . "\n" . '
' . "\n" - . ' ' . "\n" . ' ' - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . '
' : 'width="20" nowrap="nowrap" align="center" valign="top">•' ). "\n" . ' ' . $strAddUser . '' . "\n" . ' ' . "\n" . '
' : 'width="20" nowrap="nowrap" align="center" valign="top">•' ). "\n" . ' ' . $strRemoveSelectedUsers . '' . "\n" - . '
 
' . "\n" . ' ' . $strChangeCopyMode . '
' . "\n" - . ' ' . "\n" - . ' 		- tabindex="" style="vertical-align: middle" /> -
+ tabindex="" style="vertical-align: middle" />
      
- tabindex="" style="vertical-align: middle" /> -
+ tabindex="" style="vertical-align: middle" />
      
- tabindex="" style="vertical-align: middle" /> - + tabindex="" style="vertical-align: middle" />
@@ -406,7 +406,7 @@ foreach ($the_tables AS $key => $table) {
-   +   @@ -462,7 +462,7 @@ foreach ($the_tables AS $key => $table) {
-   +   diff --git a/tbl_properties_links.php b/tbl_properties_links.php index 97990bf10..189ffb26f 100644 --- a/tbl_properties_links.php +++ b/tbl_properties_links.php @@ -68,7 +68,7 @@ $class7 = 'Drop'; if ($cfg['LightTabs']) { echo ' '; } else { - echo '
' . "\n" + echo '
' . "\n" . ' ' . "\n" . '
' . ' ' diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 3eb47fd8b..d33773441 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -106,7 +106,7 @@ unset($result); if (PMA_MYSQL_INT_VERSION >= 32334) { ?> - + @@ -218,32 +218,25 @@ for ($i = 0; $i < $num_dbs; $i++) { @@ -398,22 +391,18 @@ for ($i = 0; $i < $num_dbs; $i++) { '; } - echo $strPrintView; + echo $strPrintView; ?>    - + '; } echo $strStructPropose; -?>
- '; } echo sprintf($strAddFields, ''); ?> - - - - - - -', '', '') . "\n"; + + + - + > - - +
@@ -271,7 +269,7 @@ if ($is_upload && (!isset($is_inside_querywindow) || . '  ' . "\n"; } if ($is_bzip) { - echo ' ' + echo ' ' . '  ' . "\n"; } } else { @@ -411,7 +409,7 @@ if (($is_upload || $is_upload_dir) && } echo ' ' . "\n" . ' ' . "\n" - . ' ' . "\n\n"; + . ' ' . "\n\n"; } // Bookmark Support @@ -436,7 +434,7 @@ if (!isset($is_inside_querywindow) || echo ' ' . "\n"; } echo ' ' . "   \n"; - echo ' ' . $strVar; + echo ' ' . $strVar; echo ' ' . $cfg['ReplaceHelpImg'] ? '' . $strDocu . '' : '(' . $strDocu . ')'; echo ':
' . "\n"; echo ' ' . "\n"; @@ -500,7 +498,7 @@ if ($upload_dir_error!='') { ?>
- -   
- -   
- -   
- - -   
- -
+   
+   
+   
+ +   
+
- -
+
- style="vertical-align: middle" /> -    + style="vertical-align: middle" />   		@@ -262,7 +255,7 @@ for ($i = 0; $i < $num_dbs; $i++) {
-  :  + :   
style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
style="vertical-align: middle" /> -
+ style="vertical-align: middle" />
style="width: 30px; vertical-align: middle" />  - + style="width: 30px; vertical-align: middle" /> 
- &pos=0&sql_query=">'; } diff --git a/tbl_query_box.php b/tbl_query_box.php index 38db1698a..499cd4589 100644 --- a/tbl_query_box.php +++ b/tbl_query_box.php @@ -116,7 +116,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) . ' action="read_dump.php"' . ($is_upload ? ' enctype="multipart/form-data"' : '' ) . ' name="sqlform">' . "\n" . ' '; } else { -?> +?>
onsubmit="return checkSqlQuery(this)" name="sqlform"> '; } ?> -
+ +
> ' . $strOr . '' : '') + echo ' ' + . ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'full') || !isset($is_inside_querywindow) ? '' . $strOr . '' : '') . ' ' . $strLocationTextfile . ': ' . "\n"; ?>
- + \n"; if (!isset($is_inside_querywindow) || @@ -545,7 +543,7 @@ if (!isset($is_inside_querywindow) || 		- +
@@ -169,10 +169,8 @@ function PMA_tbl_select_operator(f, index, multiple) { } // end for ?>
- -
- - +
+
diff --git a/user_password.php b/user_password.php index 429b86eb3..3531078e3 100644 --- a/user_password.php +++ b/user_password.php @@ -95,7 +95,7 @@ echo '

' . $strChangePassword . '

' . "\n\n"; // Displays an error message if required if (!empty($error_msg)) { - echo '

' . $strError . ' : ' . $error_msg . '

' . "\n"; + echo '

' . $strError . ': ' . $error_msg . '

' . "\n"; } // loic1: autocomplete feature of IE kills the "onchange" event handler and it @@ -118,12 +118,12 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
-  :  + :  ="nopass[1].checked = true" />    -  :  + :  ="nopass[1].checked = true" />