diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index aec1352cb..c5abe54a1 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -15,63 +15,13 @@ PMA_setFontSizes(); $ctype = 'css'; require_once('./libraries/header_http.inc.php'); - -if (!isset($js_frame)) { - $js_frame = 'left'; -} - -if ($js_frame == 'left') { -/************************************************************************************ - * LEFT FRAME - ************************************************************************************/ - // 2004-05-30: Michael Keck (mail@michaelkeck.de) - // Check, if theme_left.css.php exists and include - $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_left.css.php'; - if (@file_exists($tmp_file)) { - include($tmp_file); - } // end of include theme_left.css.php -} elseif ($js_frame == 'print') { -/************************************************************************************ - * PRINT VIEW - ************************************************************************************/ - // 2004-05-30: Michael Keck (mail@michaelkeck.de) - // Check, if theme_print.css.php exists and include - $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_print.css.php'; - if (@file_exists($tmp_file)) { - include($tmp_file); - } // end of include theme_print.css.php - ?> -table#serverinfo,td.serverinfo,table.noborder,table.noborder td { - border: none; -} - /* Calendar */ -table.calendar { - width: 100%; -} - -table.calendar td { - text-align: center; -} - -table.calendar td a { - display: block; -} +table.calendar { width: 100%; } +table.calendar td { text-align: center; } +table.calendar td a { display: block; } table.calendar td a:hover { background-color: ; @@ -85,83 +35,115 @@ table.calendar td.selected { background-color: ; } -img.calendar { - border: none; -} +img.calendar { border: none; } +form.clock { text-align: center; } +/* end Calendar */ -form.clock { - text-align: center; -} +.nowrap { white-space: nowrap; } +div.nowrap { margin: 0; padding: 0; } -.nowrap { - white-space: nowrap; -} +li { padding-bottom: 1em; } +li form { display: inline; } -div.nowrap { - margin: 0px; - padding: 0px; -} - -li { - padding-bottom: 1em; -} - -li form { - display: inline; -} - -ul.main { - margin: 0px; - padding-left:2em; - padding-right:2em; -} - -/* no longer needed -ul.main li { - list-style-image: url(../images/dot_violet.png); - padding-bottom: 0.1em; -} -*/ - -button { - /* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */ - display: inline; -} - -/* Tabs */ - -/* For both light and non light */ -.tab { - white-space: nowrap; - font-weight: bolder; -} - -/* For non light */ -td.tab { - width: 64px; - text-align: center; - background-color: #dfdfdf; -} - -td.tab a { - display: block; -} - -/* For light */ -div.tab { } - -/* Highlight active tab */ -td.activetab { - background-color: silver; -} +/* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */ +button { display: inline; } /* Textarea */ +textarea { overflow: auto; } -textarea { - overflow: auto; +.nospace { margin: 0; padding: 0; } + +/* topmenu */ +#topmenu { + font-weight: bold; } -.nospace { - margin: 0px; - padding: 0px; +/* default tab styles */ +.tab, .tabcaution, .tabactive { + margin-right: 0.1em; + margin-left: 0.1em; } + +/* disbaled tabs */ +span.tab { + color: #666666; +} + +/* disabled drop/empty tabs */ +span.tabcaution { + color: #ff6666; +} + +/* enabled drop/empty tabs */ +a.tabcaution { + color: #FF0000; +} +a.tabcaution:hover { + color: #FFFFFF; + background-color: #FF0000; +} + + +/* active tab */ +a.tabactive { + border-bottom: 0.1em solid black; + color: black; +} + +#topmenu { + margin-top: 0.5em; + border-bottom: 0.1em solid black; + padding: 0.1em 0.3em 0.1em 0.3em; +} + +/* default tab styles */ +.tab, .tabcaution, .tabactive { + background-color: #E5E5E5; + border: 0.1em solid silver; + border-bottom: 0.1em solid black; + border-radius-topleft: 0.5em; + border-radius-topright: 0.5em; + -moz-border-radius-topleft: 0.5em; + -moz-border-radius-topright: 0.5em; + padding: 0.1em 0.2em 0.1em 0.2em; +} + +/* enabled hover/active tabs */ +a.tab:hover, a.tabcaution:hover, .tabactive { + margin-right: 0; + margin-left: 0; + padding: 0.3em 0.3em 0.1em 0.3em; +} +a.tab:hover, .tabactive { + background-color: #CCCCCC; +} + +/* disabled drop/empty tabs */ +span.tab, span.tabcaution { + cursor: url(themes/original/img/error.ico), default; +} + +/* end topmenu */ + \ No newline at end of file diff --git a/db_details_links.php b/db_details_links.php index 8880cb85b..c4fbc22f4 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -3,12 +3,6 @@ // vim: expandtab sw=4 ts=4 sts=4: -/** - * Counts amount of navigation tabs - */ -$db_details_links_count_tabs = 0; - - /** * If coming from a Show MySQL link on the home page, * put something in $sub_part @@ -23,79 +17,70 @@ if (empty($sub_part)) { */ // Export link if there is at least one table if ($num_tables > 0) { - $lnk3 = 'db_details_export.php'; - $arg3 = $url_query; - $lnk4 = 'db_search.php'; - $arg4 = $url_query; -} -else { - $lnk3 = ''; - $arg3 = ''; - $lnk4 = ''; - $arg4 = ''; + $tab_export['link'] = 'db_details_export.php'; + $tab_search['link'] = 'db_search.php'; + $tab_qbe['link'] = 'db_details_qbe.php'; } +$tab_structure['link'] = 'db_details_structure.php'; +$tab_sql['link'] = 'db_details.php'; +$tab_sql['args']['db_query_force'] = 1; +$tab_operation['link'] = 'db_operations.php'; + // Drop link if allowed -if (!$cfg['AllowUserDropDatabase']) { +if (!$GLOBALS['cfg']['AllowUserDropDatabase']) { // Check if the user is a Superuser - $cfg['AllowUserDropDatabase'] = PMA_DBI_select_db('mysql'); + $GLOBALS['cfg']['AllowUserDropDatabase'] = PMA_DBI_select_db('mysql'); PMA_DBI_select_db($db); } // rabus: Don't even try to drop information_schema. You won't be able to. // Believe me. You won't. -$cfg['AllowUserDropDatabase'] = $cfg['AllowUserDropDatabase'] && !(PMA_MYSQL_INT_VERSION >= 50000 && $db == 'information_schema'); -if ($cfg['AllowUserDropDatabase']) { - $lnk5 = 'sql.php'; - $arg5 = $url_query . '&sql_query=' - . urlencode('DROP DATABASE ' . PMA_backquote($db)) - . '&zero_rows=' - . urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db)))) - . '&goto=main.php&back=db_details' . $sub_part . '.php&reload=1&purge=1'; - $att5 = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; - $class5 = 'Drop'; -} -else { - $lnk5 = ''; - $class5 = 'Drop'; +$GLOBALS['cfg']['AllowUserDropDatabase'] = $GLOBALS['cfg']['AllowUserDropDatabase'] && !(PMA_MYSQL_INT_VERSION >= 50000 && $db == 'information_schema'); +if ($GLOBALS['cfg']['AllowUserDropDatabase']) { + $tab_drop['link'] = 'sql.php'; + $tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db); + $tab_drop['args']['zero_rows'] = sprintf($GLOBALS['strDatabaseHasBeenDropped'], htmlspecialchars(PMA_backquote($db))); + $tab_drop['args']['goto'] = 'main.php'; + $tab_drop['args']['back'] = 'db_details' . $sub_part . '.php'; + $tab_drop['args']['reload'] = 1; + $tab_drop['args']['purge'] = 1; + $tab_drop['attr'] = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; + $tab_drop['class'] = 'caution'; } +// text +$tab_structure['text'] = $GLOBALS['strStructure']; +$tab_sql['text'] = $GLOBALS['strSQL']; +$tab_export['text'] = $GLOBALS['strExport']; +$tab_search['text'] = $GLOBALS['strSearch']; +$tab_drop['text'] = $GLOBALS['strDrop']; +$tab_qbe['text'] = $GLOBALS['strQBE']; +$tab_operation['text'] = $GLOBALS['strOperations']; + +// icons +$tab_structure['icon'] = 'b_props.png'; +$tab_sql['icon'] = 'b_sql.png'; +$tab_export['icon'] = 'b_export.png'; +$tab_search['icon'] = 'b_search.png'; +$tab_drop['icon'] = 'b_deltbl.png'; +$tab_qbe['icon'] = 's_db.png'; +$tab_operation['icon'] = 'b_tblops.png'; /** * Displays tab links */ - -if ($cfg['LightTabs']) { - echo ' '; -} else { - echo '' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . '
' - . ' ' - . ' ' - . ' '; +$tabs = array(); +$tabs[] =& $tab_structure; +$tabs[] =& $tab_sql; +$tabs[] =& $tab_search; +$tabs[] =& $tab_qbe; +$tabs[] =& $tab_export; +$tabs[] =& $tab_operation; +if ($GLOBALS['cfg']['AllowUserDropDatabase']) { + $tabs[] =& $tab_drop; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStructure.'' : '') . $strStructure, 'db_details_structure.php', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSQL.'' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSearch.'' : '') . $strSearch, $lnk4, $arg4); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strQBE.'' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, $lnk3, $arg3); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strOperations.'' : '') . $strOperations,'db_operations.php', $url_query); - -// Displays drop link -if ($lnk5) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDrop.'' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); -} // end if -echo "\n"; - -if (!$cfg['LightTabs']) { - echo ' ' - . '
' . "\n" - . '
'; -} else { - echo '
'; -} +echo PMA_getTabs( $tabs ); +unset( $tabs ); /** * Settings for relations stuff diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 948b0251f..89704e830 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2033,117 +2033,98 @@ if (typeof(document.getElementById) != 'undefined' /** - * Prints out a tab for tabbed navigation. + * returns a tab for tabbed navigation. * If the variables $link and $args ar left empty, an inactive tab is created * - * @param string the text to be displayed as link - * @param string main link file, e.g. "test.php" - * @param string link arguments - * @param string link attributes - * @param string include '?' even though no attributes are set. Can be set empty, should be '?'. - * @param boolean force display TAB as active + * @param array $tab array with all options * - * @return string two table cells, the first beeing a separator, the second the tab itself + * @return string html code for one tab, a link if valid otherwise a span * * @access public */ -/* replaced with a newer function - 2004-05-20 by Michael Keck -*/ -/* - function PMA_printTab($text, $link, $args = '', $attr = '', $class = '', $sep = '?', $active = false) { - global $PHP_SELF, $cfg; - global $db_details_links_count_tabs; - - if (!empty($class)) { - $class = ' class="' . $class . '"'; - $addclass = ' ' . $class; - } else { - $addclass = ''; + function PMA_getTab( $tab ) + { + // default values + $defaults = array( + 'text' => '', + 'class' => '', + 'active' => false, + 'link' => '', + 'sep' => '?', + 'attr' => '', + 'args' => '', + ); + + $tab = array_merge( $defaults, $tab ); + + // determine aditional style-class + if ( empty( $tab['class'] ) ) { + if ($tab['text'] == $GLOBALS['strEmpty'] || $tab['text'] == $GLOBALS['strDrop']) { + $tab['class'] = 'caution'; + } + elseif ( isset( $tab['active'] ) && $tab['active'] + || isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $tab['link'] + || basename($_SERVER['PHP_SELF']) == $tab['link'] ) + { + $tab['class'] = 'active'; + } + } + + // build the link + if ( ! empty( $tab['link'] ) ) { + $tab['link'] = htmlentities( $tab['link'] ); + $tab['link'] = $tab['link'] . $tab['sep'] . ( empty( $GLOBALS['url_query'] ) ? PMA_generate_common_url() : $GLOBALS['url_query'] ); + if ( ! empty( $tab['args'] ) ) { + foreach( $tab['args'] as $param => $value ) { + $tab['link'] .= '&' . urlencode( $param ) . '=' . urlencode( $value ); + } + } + } + + // display icon, even if iconic is disabled but the link-text is missing + if ( ( $GLOBALS['cfg']['MainPageIconic'] || empty( $tab['text'] ) ) + && isset( $tab['icon'] ) ) { + $image = '%2$s%2$s'; + $tab['text'] = sprintf( $image, htmlentities( $tab['icon'] ), $tab['text'] ); + } + // check to not display an empty link-text + elseif ( empty( $tab['text'] ) ) { + $tab['text'] = '?'; + trigger_error( __FILE__ . '(' . __LINE__ . '): ' . 'empty linktext in function ' . __FUNCTION__ . '()', E_USER_NOTICE ); } - if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || - $active || - (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link) - ) && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) { - $addclass .= ' activetab'; - } - - $db_details_links_count_tabs++; - - if ($cfg['LightTabs']) { - $out = ''; - if (strlen($link) > 0) { - $out .= '' - . '' . $text . ''; - } else { - $out .= '' . $text . ''; - } - $out = '[ ' . $out . ' ]   '; + if ( ! empty( $tab['link'] ) ) { + $out = '' + . $tab['text'] . ''; } else { - $out = "\n" . ' ' - . '' - . "\n" . ' '; - if (strlen($link) > 0) { - $out .= '' - . $text . ''; - } else { - $out .= $text; - } - $out .= "\n" . ' ' - . '' - . "\n" . ' ' - . ' '; + $out = '' . $tab['text'] . ''; } return $out; } // end of the 'PMA_printTab()' function -*/ -// the new one: - function PMA_printTab($text, $link, $args = '', $attr = '', $class = '', $sep = '?', $active = false) { - global $PHP_SELF, $cfg; - global $db_details_links_count_tabs; - $addclass = ''; - if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || - $active || - (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link) - ) && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) { - $addclass = 'Active'; + + /** + * returns html-code for a tab navigation + * + * @param array $tabs one element per tab + * @param string $tag_id id used for the html-tag + * @return string html-code for tab-navigation + */ + function PMA_getTabs( $tabs, $tag_id = 'topmenu' ) + { + $tab_navigation = '' . "\n"; + $tab_navigation .= '
' . "\n"; + + foreach ( $tabs as $tab ) + { + $tab_navigation .= PMA_getTab( $tab ) . "\n"; } - if ($text == $GLOBALS['strEmpty'] && $text == $GLOBALS['strDrop']) $addclass = 'Drop'; - if (empty($class)){ - if (empty($addclass)) { $addclass = 'Normal'; } - } else { $addclass = $class; } - - $db_details_links_count_tabs++; - - if ($cfg['LightTabs']) { - $out = ''; - if (!empty($link)) { - $out .= '' - . '' . $text . ''; - } else { - $out .= '' . $text . ''; - } - $out = '[ ' . $out . ' ]   '; - } else { - $out = "\n" . ' ' - . '' - . "\n" . ' '; - if (!empty($link)) { - $out .= '' - . $text . ''; - } else { - $out .= $text; - } - $out .= "\n" . ' ' - . '' - . "\n" . ' ' - . ''; - } - - return $out; - } // end of the 'PMA_printTab()' function + + $tab_navigation .= '
' . "\n"; + $tab_navigation .= '' . "\n\n"; + + return $tab_navigation; + } /** diff --git a/querywindow.php b/querywindow.php index 3e2894dae..c77731012 100644 --- a/querywindow.php +++ b/querywindow.php @@ -76,34 +76,31 @@ var confirmMsg = '' . "\n" - . ' ' . "\n" - . ' ' - . ' ' - . ' ' - . ' '; - } - echo "\n"; - echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? ''.$strSQL.'' : '') . $strSQL, '#', '', ' onclick="javascript:query_tab_commit(\'sql\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE)); - echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? ''.$strImportFiles.'' : '') . $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)); + $tabs = array(); + $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['text'] = $strSQL; + $tabs['sql']['link'] = '#'; + $tabs['sql']['attr'] = 'onclick="javascript:query_tab_commit(\'sql\');return false;"'; + $tabs['sql']['active'] = (bool) (isset($querydisplay_tab) && $querydisplay_tab == 'sql'); + $tabs['import']['icon'] = 'b_import.png'; + $tabs['import']['text'] = $strImportFiles; + $tabs['import']['link'] = '#'; + $tabs['import']['attr'] = 'onclick="javascript:query_tab_commit(\'files\');return false;"'; + $tabs['import']['active'] = (bool) (isset($querydisplay_tab) && $querydisplay_tab == 'files'); + $tabs['history']['text'] = $strQuerySQLHistory; + $tabs['history']['link'] = '#'; + $tabs['history']['attr'] = 'onclick="javascript:query_tab_commit(\'history\');return false;"'; + $tabs['history']['active'] = (bool) (isset($querydisplay_tab) && $querydisplay_tab == 'history'); if ($cfg['QueryWindowDefTab'] == 'full') { - echo PMA_printTab($strAll, '#', '', ' onclick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE)); + $tabs['all']['text'] = $strAll; + $tabs['all']['link'] = '#'; + $tabs['all']['attr'] = 'onclick="javascript:query_tab_commit(\'full\');return false;"'; + $tabs['all']['active'] = (bool) (isset($querydisplay_tab) && $querydisplay_tab == 'full'); } - if (!$cfg['LightTabs']) { - echo ' ' - . '
' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ''; - } else { - echo '
'; - } + echo PMA_getTabs( $tabs ); + unset( $tabs ); } else { $querydisplay_tab = 'full'; } diff --git a/server_links.inc.php b/server_links.inc.php index b8d5d5a7b..16ee43e6c 100644 --- a/server_links.inc.php +++ b/server_links.inc.php @@ -33,44 +33,53 @@ if ($is_superuser) { /** * Displays tab links */ -if ($cfg['LightTabs']) { - echo ' '; -} else { - echo '' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . '
' - . ' ' - . ' ' - . ' '; -} -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDatabases.'' : '') . $strDatabases, 'server_databases.php', $url_query); +$tabs = array(); + +$tabs['databases']['icon'] = 's_db.png'; +$tabs['databases']['link'] = 'server_databases.php'; +$tabs['databases']['text'] = $strDatabases; + if ($cfg['ShowMysqlInfo']) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStatus.'' : '') . $strStatus, 'server_status.php', $url_query); + $tabs['status']['icon'] = 's_status.png'; + $tabs['status']['link'] = 'server_status.php'; + $tabs['status']['text'] = $strStatus; } if ($cfg['ShowMysqlVars']) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strServerTabVariables.'' : '') . $strServerTabVariables, 'server_variables.php', $url_query); + $tabs['vars']['icon'] = 's_vars.png'; + $tabs['vars']['link'] = 'server_variables.php'; + $tabs['vars']['text'] = $strServerTabVariables; } if (PMA_MYSQL_INT_VERSION >= 40100) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strCharsets.'' : '') . $strCharsets, 'server_collations.php', $url_query); + $tabs['charset']['icon'] = 's_asci.png'; + $tabs['charset']['link'] = 'server_collations.php'; + $tabs['charset']['text'] = $strCharsets; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '' . $strEngines . '' : '') . $strEngines, 'server_engines.php', $url_query); + +$tabs['engine']['icon'] = 'b_engine.png'; +$tabs['engine']['link'] = 'server_engines.php'; +$tabs['engine']['text'] = $strEngines; + if ($is_superuser) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strPrivileges.'' : '') . $strPrivileges, 'server_privileges.php', $url_query); + $tabs['rights']['icon'] = 's_rights.png'; + $tabs['rights']['link'] = 'server_privileges.php'; + $tabs['rights']['text'] = $strPrivileges; } if ($has_binlogs) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strBinaryLog.'' : '') . $strBinaryLog, 'server_binlog.php', $url_query); -} -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strServerTabProcesslist.'' : '') . $strServerTabProcesslist, 'server_processlist.php', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, 'server_export.php', $url_query); -if (!$cfg['LightTabs']) { - echo ' ' - . '
' . "\n" - . '
'; -} else { - echo '
'; + $tabs['binlog']['icon'] = 's_tbl.png'; + $tabs['binlog']['link'] = 'server_binlog.php'; + $tabs['binlog']['text'] = $strBinaryLog; } +$tabs['process']['icon'] = 's_process.png'; +$tabs['process']['link'] = 'server_processlist.php'; +$tabs['process']['text'] = $strServerTabProcesslist; + +$tabs['export']['icon'] = 'b_export.png'; +$tabs['export']['link'] = 'server_export.php'; +$tabs['export']['text'] = $strExport; + +echo PMA_getTabs( $tabs ); +unset( $tabs ); + /** * Displays a message diff --git a/tbl_properties_links.php b/tbl_properties_links.php index 0423fa5e7..d71b85ef6 100644 --- a/tbl_properties_links.php +++ b/tbl_properties_links.php @@ -9,101 +9,81 @@ require_once('./libraries/common.lib.php'); PMA_checkParameters(array('db', 'table')); -echo '' . "\n"; - -/** - * Count amount of navigation tabs - */ -$db_details_links_count_tabs = 0; - - /** * Prepares links */ require_once('./libraries/bookmark.lib.php'); -$book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label'); - -if ($table_info_num_rows > 0 || $tbl_is_view) { - $lnk2 = 'sql.php'; - $arg2 = $url_query - . '&sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) - . '&pos=0'; - $lnk4 = 'tbl_select.php'; - $arg4 = $url_query; - if ($tbl_is_view) { - $lnk8 = ''; - $arg8 = ''; - $att8 = ''; - $class8 = ''; - } else { - $ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000) - ? 'TRUNCATE TABLE ' - : 'DELETE FROM '; - $lnk8 = 'sql.php'; - $arg8 = $url_query . '&sql_query=' - . urlencode($ln8_stt . PMA_backquote($table)) - . '&zero_rows=' - . urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); - $att8 = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($table) . '\')"'; - $class8 = 'Drop'; - } -} else { - $lnk2 = ''; - $arg2 = ''; - $lnk4 = ''; - $arg4 = ''; - $lnk8 = ''; - $arg8 = ''; - $att8 = ''; - $class8 = 'Drop'; -} - -$arg9 = $url_query . '&reload=1&purge=1&sql_query=' . urlencode('DROP ' . ($tbl_is_view ? 'VIEW' : 'TABLE') . ' ' . PMA_backquote($table) ) . '&zero_rows=' . urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); -$att9 = 'onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"'; -$class9 = 'Drop'; - +$book_sql_query = PMA_queryBookmarks($db, $GLOBALS['cfg']['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label'); /** * Displays links */ +$tabs = array(); -if ($cfg['LightTabs']) { - echo ' '; -} else { - echo '' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . '
' - . ' ' - . ' ' - . ' '; -} +$tabs['browse']['icon'] = 'b_browse.png'; +$tabs['browse']['text'] = $strBrowse; + +$tabs['structure']['icon'] = 'b_props.png'; +$tabs['structure']['link'] = 'tbl_properties_structure.php'; +$tabs['structure']['text'] = $strStructure; + +$tabs['sql']['icon'] = 'b_sql.png'; +$tabs['sql']['link'] = 'tbl_properties.php'; +$tabs['sql']['text'] = $strSQL; + +$tabs['search']['icon'] = 'b_search.png'; +$tabs['search']['text'] = $strSearch; + +$tabs['insert']['icon'] = 'b_insrow.png'; +$tabs['insert']['link'] = 'tbl_change.php'; +$tabs['insert']['text'] = $strInsert; -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strBrowse.'' : '') . $strBrowse, $lnk2, $arg2) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStructure.'' : '') . $strStructure, 'tbl_properties_structure.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSQL.'' : '') . $strSQL, 'tbl_properties.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSearch.'' : '') . $strSearch, $lnk4, $arg4) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strInsert.'' : '') . $strInsert, 'tbl_change.php', $url_query); /** * Don't display "Export", "Operations" and "Empty" for views. */ if (!$tbl_is_view) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, 'tbl_properties_export.php', $url_query . '&single_table=true') - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strOperations.'' : '') . $strOperations, 'tbl_properties_operations.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strEmpty.'' : '') . $strEmpty, $lnk8, $arg8, $att8, $class8); + $tabs['export']['icon'] = 'b_tblexport.png'; + $tabs['export']['link'] = 'tbl_properties_export.php'; + $tabs['export']['args']['single_table'] = 'true'; + $tabs['export']['text'] = $strExport; + + $tabs['operation']['icon'] = 'b_tblops.png'; + $tabs['operation']['link'] = 'tbl_properties_operations.php'; + $tabs['operation']['text'] = $strOperations; + + if ($table_info_num_rows > 0) { + $ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000) + ? 'TRUNCATE TABLE ' + : 'DELETE FROM '; + $tabs['empty']['link'] = 'sql.php'; + $tabs['empty']['args']['sql_query'] = $ln8_stt . PMA_backquote($table); + $tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table)); + $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($table) . '\')"'; + $tabs['empty']['class'] = 'caution'; + } + $tabs['empty']['icon'] = 'b_empty.png'; + $tabs['empty']['text'] = $strEmpty; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDrop.'' : '') . $strDrop, 'sql.php', $arg9, $att9, $class9) - . "\n"; +$tabs['drop']['icon'] = 'b_deltbl.png'; +$tabs['drop']['link'] = 'sql.php'; +$tabs['drop']['text'] = $strDrop; +$tabs['drop']['args']['reload'] = 1; +$tabs['drop']['args']['purge'] = 1; +$tabs['drop']['args']['sql_query'] = 'DROP ' . ($tbl_is_view ? 'VIEW' : 'TABLE') . ' ' . PMA_backquote($table); +$tabs['drop']['args']['zero_rows'] = sprintf($strTableHasBeenDropped, htmlspecialchars($table)); +$tabs['drop']['attr'] = 'onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"'; +$tabs['drop']['class'] = 'caution'; -if (!$cfg['LightTabs']) { - echo ' ' - . '
' . "\n" - . '
'; -} else { - echo '
'; +if ($table_info_num_rows > 0 || $tbl_is_view) { + $tabs['browse']['link'] = 'sql.php'; + $tabs['browse']['args']['sql_query'] = isset($book_sql_query) && $book_sql_query != FALSE ? $book_sql_query : 'SELECT * FROM ' . PMA_backquote($table); + $tabs['browse']['args']['pos'] = 0; + $tabs['search']['link'] = 'tbl_select.php'; } +echo PMA_getTabs( $tabs ); +unset( $tabs ); + /** * Displays a message */ diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 62495ecb4..76eab7cf6 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -106,14 +106,6 @@ h3{ font-size: 12px; font-weight: bold; } -a.nav:link, a.nav:visited, a.nav:active{ - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #000000; -} -a.nav:hover{ - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #cc0000; -} a.h1:link, a.h1:active, a.h1:visited{ font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 18px; @@ -164,20 +156,6 @@ dfn:hover{ td.topline{ font-size: 1px; } -td.tab{ - border-top: 1px solid #999; - border-right: 1px solid #666; - border-left: 1px solid #999; - border-bottom: none; - border-radius: 2px; - -moz-border-radius: 2px; -} -table.tabs { - border-top: none; - border-right: none; - border-left: none; - border-bottom: 1px solid #666; -} fieldset { border: #666699 solid 1px; @@ -222,6 +200,80 @@ button.mult_submit { border: 1px dashed #000000; } + +/* topmenu */ +#topmenu { + font-weight: bold; +} + +/* default tab styles */ +.tab, .tabcaution, .tabactive { + margin-right: 0.1em; + margin-left: 0.1em; +} + +/* disbaled tabs */ +span.tab { + color: #666666; +} + +/* disabled drop/empty tabs */ +span.tabcaution { + color: #ff6666; +} + +/* enabled drop/empty tabs */ +a.tabcaution { + color: #FF0000; +} +a.tabcaution:hover { + color: #FFFFFF; + background-color: #FF0000; +} + + +/* active tab */ +a.tabactive { + border-bottom: 0.1em solid black; + color: black; +} + +#topmenu { + margin-top: 0.5em; + border-bottom: 0.1em solid black; + padding: 0.1em 0.3em 0.1em 0.3em; +} + +/* default tab styles */ +.tab, .tabcaution, .tabactive { + background-color: #E5E5E5; + border: 0.1em solid silver; + border-bottom: 0.1em solid black; + border-radius-topleft: 0.5em; + border-radius-topright: 0.5em; + -moz-border-radius-topleft: 0.5em; + -moz-border-radius-topright: 0.5em; + padding: 0.1em 0.2em 0.1em 0.2em; +} + +/* enabled hover/active tabs */ +a.tab:hover, a.tabcaution:hover, .tabactive { + margin-right: 0; + margin-left: 0; + padding: 0.3em 0.3em 0.1em 0.3em; +} +a.tab:hover, .tabactive { + background-color: #CCCCCC; +} + +/* disabled drop/empty tabs */ +span.tab, span.tabcaution { + cursor: url(themes/original/img/error.ico), default; +} + +/* end topmenu */ + + /* Warning showing div with right border and optional icon */ div.warning { @@ -410,71 +462,7 @@ hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; } -/* navigation */ -.nav{ - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #000000; - background-color: #666699; - - background-image: url(../themes/darkblue_orange/img/tbl_header.png); - background-repeat: repeat-x; - background-position: top; - - height: 22px; -} -.navSpacer{ - width: 1px; - height: 16px; - background-color: #ffffff; -} -.navNormal { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #000000; - background-color: #666699; - - background-image: url(../themes/darkblue_orange/img/tbl_header.png); - background-repeat: repeat-x; - background-position: top; - - height: 20px; - padding: 2px 5px 2px 5px; -} -.navDrop { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #000000; - background-color: #cc0000; - - background-image: url(../themes/darkblue_orange/img/tbl_error.png); - background-repeat: repeat-x; - background-position: top; - - height: 20px; - padding: 2px 5px 2px 5px; -} -.navActive { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #000000; - /*background-color: #FF9900; - background-image: url(../themes/darkblue_orange/img/tbl_th.png); - background-repeat: repeat-x; - background-position: top;*/ - background-color: #ffffff; - height: 16px; - padding: 2px 5px 2px 5px; -} -.navNormal a:link,.navNormal a:active,.navNormal a:hover,.navNormal a:visited,.navDrop a:link,.navDrop a:active,.navDrop a:visited,.navDrop a:hover { - color: #FFFFFF; -} -.navActive a:link,.navActive a:active,.navActive a:visited,.navActive a:hover { - color: #000000; -} img, input, select, button { vertical-align: middle; } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 86ef42261..b58027e01 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -29,9 +29,6 @@ h3 {font-family: ; font-size: ; font-size: ; text-decoration: none; color: #0000FF} a:visited {font-family: ; font-size: ; text-decoration: none; color: #0000FF} a:hover {font-family: ; font-size: ; text-decoration: underline; color: #FF0000} -a.nav:link {font-family: ; color: #000000} -a.nav:visited {font-family: ; color: #000000} -a.nav:hover {font-family: ; color: #FF0000} a.h1:link {font-family: ; font-size: ; font-weight: bold; color: #000000} a.h1:active {font-family: ; font-size: ; font-weight: bold; color: #000000} a.h1:visited {font-family: ; font-size: ; font-weight: bold; color: #000000} @@ -45,29 +42,10 @@ a.drop:visited {font-family: ; color: #ff0000} a.drop:hover {font-family: ; color: #ffffff; background-color:#ff0000; text-decoration: none} dfn {font-style: normal} dfn:hover {font-style: normal; cursor: help} -.nav {font-family: ; color: #000000} .warning {font-family: ; font-size: ; font-weight: bold; color: #FF0000} .tblcomment {font-family: ; font-size: ; font-weight: normal; color: #000099; } td.topline {font-size: 1px} -td.tab { - border-top: 1px solid #999; - border-right: 1px solid #666; - border-left: 1px solid #999; - border-bottom: none; - border-radius: 2px; - -moz-border-radius: 2px; -} -div.tabs { - clear: both; -} - -table.tabs { - border-top: none; - border-right: none; - border-left: none; - border-bottom: 1px solid #666; -} fieldset { border: #686868 solid 1px; @@ -128,61 +106,79 @@ button.mult_submit { hr{ color: #666666; background-color: #666666; border: 0; height: 1px; } -/* new styles for navigation */ -.nav { - font-family: ; - color: #000000; - border-top: none; - border-right: none; - border-left: none; - border-bottom: 1px solid #666; -} -.navSpacer { - width: 5px; - height: 16px; -} -.navNormal, .navDrop, .navActive { - font-family: ; - font-size: ; - font-weight: bold; - border-top: 1px solid #999; - border-right: 1px solid #666; - border-left: 1px solid #999; - border-bottom: none; - border-radius: 2px; - -moz-border-radius: 2px; - padding: 2px 5px 2px 5px; -} -.navNormal { - color: #000000; - background-color: #E5E5E5; -} -.navActive{ - font-family: ; - font-size: ; - font-weight: bold; - color: #000000; - background-color: #CCCCCC; -} -.navDrop{ - color: #000000; - background-color: #E5E5E5; -} -.navNormal a:link, .navNormal a:active, .navNormal a:visited, .navActive a:link, .navActive a:active, .navActive a:visited{ - color: #0000FF; +/* topmenu */ +#topmenu { + font-weight: bold; } -.navDrop a:link, .navDrop a:active, .navDrop a:visited{ +/* default tab styles */ +.tab, .tabcaution, .tabactive { + margin-right: 0.1em; + margin-left: 0.1em; +} + +/* disbaled tabs */ +span.tab { + color: #666666; +} + +/* disabled drop/empty tabs */ +span.tabcaution { + color: #ff6666; +} + +/* enabled drop/empty tabs */ +a.tabcaution { color: #FF0000; } -.navDrop a:hover{ +a.tabcaution:hover { color: #FFFFFF; background-color: #FF0000; } -.navNormal a:hover, .navActive a:hover{ - color: #FF0000; + + +/* active tab */ +a.tabactive { + border-bottom: 0.1em solid black; + color: black; } + +#topmenu { + margin-top: 0.5em; + border-bottom: 0.1em solid black; + padding: 0.1em 0.3em 0.1em 0.3em; +} + +/* default tab styles */ +.tab, .tabcaution, .tabactive { + background-color: #E5E5E5; + border: 0.1em solid silver; + border-bottom: 0.1em solid black; + border-radius-topleft: 0.5em; + border-radius-topright: 0.5em; + -moz-border-radius-topleft: 0.5em; + -moz-border-radius-topright: 0.5em; + padding: 0.1em 0.2em 0.1em 0.2em; +} + +/* enabled hover/active tabs */ +a.tab:hover, a.tabcaution:hover, .tabactive { + margin-right: 0; + margin-left: 0; + padding: 0.3em 0.3em 0.1em 0.3em; +} +a.tab:hover, .tabactive { + background-color: #CCCCCC; +} + +/* disabled drop/empty tabs */ +span.tab, span.tabcaution { + cursor: url(themes/original/img/error.ico), default; +} + +/* end topmenu */ + /* Warning showing div with right border and optional icon */ diff --git a/themes/original/img/error.ico b/themes/original/img/error.ico new file mode 100644 index 000000000..41d26d638 Binary files /dev/null and b/themes/original/img/error.ico differ