From 2473c40186addacc9cdc6ca8b4efe61bc7ebbeb6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 12 Feb 2007 00:35:16 +0000 Subject: [PATCH] LeftLogoLinkWindow; main.php links target --- ChangeLog | 48 +- Documentation.html | 6 +- README | 4 +- browse_foreigners.php | 2 +- phpmyadmin.css.php => css/phpmyadmin.css.php | 57 +- print.css => css/print.css | 0 js/querywindow.js | 49 +- lang/afrikaans-iso-8859-1.inc.php | 10 - lang/afrikaans-utf-8.inc.php | 10 - lang/albanian-iso-8859-1.inc.php | 10 - lang/albanian-utf-8.inc.php | 10 - lang/arabic-utf-8.inc.php | 10 - lang/arabic-windows-1256.inc.php | 10 - lang/azerbaijani-iso-8859-9.inc.php | 10 - lang/azerbaijani-utf-8.inc.php | 10 - lang/basque-iso-8859-1.inc.php | 10 - lang/basque-utf-8.inc.php | 10 - lang/belarusian_cyrillic-utf-8.inc.php | 10 - lang/belarusian_cyrillic-windows-1251.inc.php | 10 - lang/belarusian_latin-utf-8.inc.php | 10 - lang/bosnian-utf-8.inc.php | 10 - lang/bosnian-windows-1250.inc.php | 10 - lang/brazilian_portuguese-iso-8859-1.inc.php | 10 - lang/brazilian_portuguese-utf-8.inc.php | 10 - lang/bulgarian-koi8-r.inc.php | 10 - lang/bulgarian-utf-8.inc.php | 10 - lang/bulgarian-windows-1251.inc.php | 10 - lang/catalan-iso-8859-1.inc.php | 13 - lang/catalan-utf-8.inc.php | 13 - lang/chinese_simplified-gb2312.inc.php | 10 - lang/chinese_simplified-utf-8.inc.php | 10 - lang/chinese_traditional-big5.inc.php | 10 - lang/chinese_traditional-utf-8.inc.php | 10 - lang/croatian-iso-8859-2.inc.php | 10 - lang/croatian-utf-8.inc.php | 10 - lang/croatian-windows-1250.inc.php | 10 - lang/czech-iso-8859-2.inc.php | 10 - lang/czech-utf-8.inc.php | 10 - lang/czech-windows-1250.inc.php | 10 - lang/danish-iso-8859-1.inc.php | 10 - lang/danish-utf-8.inc.php | 10 - lang/dutch-iso-8859-1.inc.php | 10 - lang/dutch-iso-8859-15.inc.php | 10 - lang/dutch-utf-8.inc.php | 10 - lang/english-iso-8859-1.inc.php | 10 - lang/english-iso-8859-15.inc.php | 10 - lang/english-utf-8.inc.php | 10 - lang/estonian-iso-8859-1.inc.php | 10 - lang/estonian-utf-8.inc.php | 10 - lang/finnish-iso-8859-1.inc.php | 10 - lang/finnish-iso-8859-15.inc.php | 10 - lang/finnish-utf-8.inc.php | 10 - lang/french-iso-8859-1.inc.php | 10 - lang/french-iso-8859-15.inc.php | 10 - lang/french-utf-8.inc.php | 10 - lang/galician-iso-8859-1.inc.php | 10 - lang/galician-utf-8.inc.php | 10 - lang/georgian-utf-8.inc.php | 10 - lang/german-iso-8859-1.inc.php | 10 - lang/german-iso-8859-15.inc.php | 10 - lang/german-utf-8.inc.php | 10 - lang/greek-iso-8859-7.inc.php | 10 - lang/greek-utf-8.inc.php | 10 - lang/hebrew-iso-8859-8-i.inc.php | 10 - lang/hebrew-utf-8.inc.php | 10 - lang/hindi-utf-8.inc.php | 10 - lang/hungarian-iso-8859-2.inc.php | 10 - lang/hungarian-utf-8.inc.php | 10 - lang/indonesian-iso-8859-1.inc.php | 10 - lang/indonesian-utf-8.inc.php | 10 - lang/italian-iso-8859-1.inc.php | 10 - lang/italian-iso-8859-15.inc.php | 10 - lang/italian-utf-8.inc.php | 10 - lang/japanese-euc.inc.php | 10 - lang/japanese-sjis.inc.php | 10 - lang/japanese-utf-8.inc.php | 10 - lang/korean-euc-kr.inc.php | 10 - lang/korean-utf-8.inc.php | 10 - lang/latvian-utf-8.inc.php | 10 - lang/latvian-windows-1257.inc.php | 10 - lang/lithuanian-utf-8.inc.php | 10 - lang/lithuanian-windows-1257.inc.php | 10 - lang/malay-iso-8859-1.inc.php | 10 - lang/malay-utf-8.inc.php | 10 - lang/mongolian-utf-8.inc.php | 10 - lang/norwegian-iso-8859-1.inc.php | 10 - lang/norwegian-utf-8.inc.php | 10 - lang/persian-utf-8.inc.php | 10 - lang/persian-windows-1256.inc.php | 10 - lang/polish-iso-8859-2.inc.php | 10 - lang/polish-utf-8.inc.php | 10 - lang/polish-windows-1250.inc.php | 10 - lang/portuguese-iso-8859-1.inc.php | 10 - lang/portuguese-iso-8859-15.inc.php | 10 - lang/portuguese-utf-8.inc.php | 10 - lang/romanian-iso-8859-1.inc.php | 10 - lang/romanian-utf-8.inc.php | 10 - lang/russian-cp-866.inc.php | 10 - lang/russian-koi8-r.inc.php | 10 - lang/russian-utf-8.inc.php | 10 - lang/russian-windows-1251.inc.php | 10 - lang/serbian_cyrillic-utf-8.inc.php | 10 - lang/serbian_cyrillic-windows-1251.inc.php | 10 - lang/serbian_latin-utf-8.inc.php | 10 - lang/serbian_latin-windows-1250.inc.php | 10 - lang/slovak-iso-8859-2.inc.php | 10 - lang/slovak-utf-8.inc.php | 10 - lang/slovak-windows-1250.inc.php | 10 - lang/slovenian-iso-8859-2.inc.php | 10 - lang/slovenian-utf-8.inc.php | 10 - lang/slovenian-windows-1250.inc.php | 10 - lang/spanish-iso-8859-1.inc.php | 10 - lang/spanish-iso-8859-15.inc.php | 10 - lang/spanish-utf-8.inc.php | 10 - lang/swedish-iso-8859-1.inc.php | 10 - lang/swedish-utf-8.inc.php | 10 - lang/tatarish-iso-8859-9.inc.php | 10 - lang/tatarish-utf-8.inc.php | 10 - lang/thai-tis-620.inc.php | 10 - lang/thai-utf-8.inc.php | 10 - lang/turkish-iso-8859-9.inc.php | 10 - lang/turkish-utf-8.inc.php | 10 - lang/ukrainian-utf-8.inc.php | 10 - lang/ukrainian-windows-1251.inc.php | 10 - libraries/Config.class.php | 2 +- libraries/PMA_Sql.class.php | 2493 ---------------- libraries/Theme.class.php | 126 +- libraries/auth/http.auth.lib.php | 5 +- libraries/auth/signon.auth.lib.php | 11 +- libraries/common.lib.php | 342 +-- libraries/config.default.php | 2535 ++++------------- libraries/database_interface.lib.php | 17 +- libraries/display_tbl.lib.php | 29 +- libraries/header_meta_style.inc.php | 4 +- libraries/header_printview.inc.php | 2 +- libraries/select_lang.lib.php | 111 +- libraries/session.inc.php | 34 +- libraries/tbl_replace_fields.inc.php | 41 +- navigation.php | 2 +- pmd_general.php | 72 +- pmd_pdf.php | 8 +- pmd_save_pos.php | 12 +- tbl_change.php | 19 +- tbl_indexes.php | 10 +- tbl_replace.php | 6 +- test/core.lib.php | 2 +- test/escape_js_string.php | 2 +- test/theme.php | 4 +- .../darkblue_orange/css/theme_right.css.php | 60 +- themes/darkblue_orange/layout.inc.php | 4 +- themes/original/css/theme_left.css.php | 2 +- themes/original/css/theme_right.css.php | 60 +- themes/original/layout.inc.php | 2 +- translators.html | 16 +- view_create.php | 141 - 155 files changed, 890 insertions(+), 6626 deletions(-) rename phpmyadmin.css.php => css/phpmyadmin.css.php (83%) rename print.css => css/print.css (100%) delete mode 100644 libraries/PMA_Sql.class.php delete mode 100644 view_create.php diff --git a/ChangeLog b/ChangeLog index 2ed1a944f..5dbc44af6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,26 +5,18 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL$ -2007-02-10 Marc Delisle - * lang/spanish update, thanks to Daniel Hinostroza - * tbl_change.php, tbl_indexes.php, libraries/common.lib.php: - get rid of $propicon - -2007-02-09 Marc Delisle +2007-02-11 Marc Delisle * main.php: some links should open a new page * Documentation.html, libraries/navigation_header.inc.php, libraries/config.default.php: $cfg['LeftLogoLinkWindow'] to decide in which window the logo-linked page will appear -2007-02-09 Michal Čihař - * lang/czech: Fix syntax error (sorry for that). +2007-02-10 Marc Delisle + * lang/spanish update, thanks to Daniel Hinostroza -2007-02-08 Marc Delisle +2007-02-09 Marc Delisle * themes/darkblue_orange/img/logo_left.png, themes/original/img/logo_left.png: smaller PMA logo for navi - * libraries/navigation_header.inc.php, libraries/config.default.php: - navi logo now links to main page by default, with still the possibility - of having an external URL 2007-02-08 Sebastian Mendel * themes/*/css/theme_right.css.php: bug #1653769 browsing highlight disabling @@ -37,22 +29,13 @@ $HeadURL$ * libraries/common.lib.php: PMA_backquote() did not quote 0 * tbl_change.php: bug #1652810 - slashes are not escaped properly -2007-02-05 Michal Čihař - * lang/czech: Updated. - 2007-02-05 Marc Delisle * lang/japanese: Update, thanks to Ishigaki Kenichi - tcool. 2007-02-05 Sebastian Mendel * lang/german: updated -2007-02-04 Marc Delisle - * js/querywindow.js: query window icon did not work, - thanks to Jürgen Wind - 2007-02-03 Marc Delisle - * view_create.php, libraries/display_tbl.lib.php, lang/*: - support for CREATE VIEW from query results * pmd/scripts/move.js: display problems in Opera, thanks to Maxim Bulygin 2007-02-02 Marc Delisle @@ -70,15 +53,6 @@ $HeadURL$ 2007-01-31 Sebastian Mendel * libraries/session.inc.php: bug #1630871 - Detecting a missing write permission on sessions directory - * libraries/select_lang.lib.php: globalized variables to be usable inside - function, documentation - * libraries/auth/http.auth.lib.php, libraries/auth/signon.auth.lib.php - libraries/common.lib.php, libraries/database_interface.lib.php - libraries/select_lang.lib.php, libraries/session.inc.php: - added PMA_fatalError() and made use of it - -2007-01-30 Marc Delisle - * libraries/tbl_replace_fields.inc.php: undefined variable 2007-01-30 Sebastian Mendel * libraries/sqlparser.lib.php PMA_SQP_analyze(): @@ -88,11 +62,7 @@ $HeadURL$ * lang/catalan update, thanks to Xavier Navarro (xavin) * pmd_general.php: possibility of quotes in Designer messages, thanks to Ivan Kirillov - -2007-01-29 Sebastian Mendel - * tbl_replace.php, libraries/tbl_replace_fields.inc.php: print out error - messages if upload failed (bug #1615530) - * js/querywindow.js: fixed bug #1541147 - # in database names + ### 2.10.0-beta1 released from QA_2_10 2007-01-26 Michal Čihař * libraries/common.lib.php, libraries/js_escape.lib.php, @@ -161,7 +131,7 @@ $HeadURL$ session.save_handler to 'files' * pmd_general.php: patch #1627831, English language improvements, thanks to Isaac Bennetch - * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages + * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages 2007-01-04 Marc Delisle * pmd/scripts/move.js: avoid text selection when moving a table object @@ -189,7 +159,7 @@ $HeadURL$ so by default, row count is not done for views 2006-12-30 Marc Delisle - * libraries/Config.class.php: bug #1590083, + * libraries/Config.class.php: bug #1590083, $cfg['DefaultConnectionCollation'] ignored in config.inc.php 2006-12-30 Michal Čihař @@ -214,11 +184,11 @@ $HeadURL$ * libraries/export/sql.php: bug #1619647, export of query results should not contain procedure definitions * navigation.php, test/theme.php, browse_foreigners.php, - libraries/header_printview.inc.php: patch #1611684 part 2, client + libraries/header_printview.inc.php: patch #1611684 part 2, client caching of phpmyadmin.css.php, thanks to Christian Schmidt 2006-12-19 Sebastian Mendel - * tbl_change.php, tbl_replace.php, libarsies/tbl_replace_fields.inc.php: + * tbl_change.php, tbl_replace.php, include/tbl_replace_fields.inc.php: refactored: made register_globals independent; added documentation; removed unused code; fixed bug #1597686 last insert id message wrong; much more i don't remember ... diff --git a/Documentation.html b/Documentation.html index 793859a4d..47ea7fdf4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ - phpMyAdmin 2.11.0-dev - Documentation + phpMyAdmin 2.10.0-beta1 - Documentation @@ -33,7 +33,7 @@
  • Glossary
    • -

    phpMyAdmin 2.11.0-dev Documentation

    +

    phpMyAdmin 2.10.0-beta1 Documentation

    • phpMyAdmin homepage
      • @@ -1219,7 +1219,7 @@ ALTER TABLE `pma_column_comments`
      $cfg['LeftLogoLinkWindow'] string
      Whether to open the linked page in the main window (main) - or in a new one (new).
      + or in a new one (new).
      $cfg['LeftDisplayServers'] boolean
      Defines whether or not to display a server choice at the top of the left frame. diff --git a/README b/README index c3bf3b8b2..7e313dd7a 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.0-dev - ------------------ + Version 2.10.0-beta1 + -------------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller diff --git a/browse_foreigners.php b/browse_foreigners.php index 22c3ab057..aae0a740e 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -93,7 +93,7 @@ if (isset($disp_row) && is_array($disp_row)) { phpMyAdmin + href="./css/phpmyadmin.css.php?&js_frame=right&nocache=getMtime(); ?>" /> '; +strLang["strErrorRelationAdded"] = "' . $strErrorRelationAdded . '"; +strLang["strErrorRelationExists"] = "' . $strErrorRelationExists . '"; +strLang["strErrorSaveTable"] = "' . $strErrorSaveTable . '"; +'; ?> @@ -61,27 +61,27 @@ echo $script_tabs . $script_contr . $script_display_field;
        -
        v vvkeykey >
      - +
      - +
      @@ -91,9 +91,9 @@ echo $script_tabs . $script_contr . $script_display_field;
      - vv + vv
      @@ -102,7 +102,7 @@ echo $script_tabs . $script_contr . $script_display_field;
      @@ -110,12 +110,12 @@ echo $script_tabs . $script_contr . $script_display_field; -
      ')" title="" id="check_vis_" style="margin:0px;" type="checkbox" value="" > ');">
      - + @@ -126,7 +126,7 @@ echo $script_tabs . $script_contr . $script_display_field; ]" type="hidden" id="t_v[]"> -; +
      ; top: ; visibility: ; "> @@ -149,16 +149,16 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) onMouseOver="this.className = 'tab_zag_2'" onMouseOut="this.className = 'tab_zag'" >".strtolower($GLOBALS['PMD_OUT']["OWNER"][$i]).".".$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?> - ;"> " - onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;" + onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;" onMouseDown="Click_field(')"> @@ -202,7 +202,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) ?>
      -
      ; background-color:#CCFF99; padding:3px; border:#009933 solid 1px; white-space:nowrap; font-weight:bold">Load...
      " >
      - */images/FieldKey_small.png" alt="*">.png" alt="*"> + ?>.png" alt="*">
      @@ -244,7 +244,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ ) diff --git a/pmd_pdf.php b/pmd_pdf.php index 841a7c442..7fe4c1ffb 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -13,7 +13,7 @@ if (isset($scale)) { if (empty($pdf_page_number)) { die(""); } - + $pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']); $pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']); @@ -23,14 +23,14 @@ if (isset($scale)) { PMA_query_as_cu($sql,TRUE,PMA_DBI_QUERY_STORE); } - + if (isset($imp)) { PMA_query_as_cu( - 'UPDATE ' . $pma_table . ',' . $pmd_table . + 'UPDATE ' . $pma_table . ',' . $pmd_table . ' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * '. $scale . ', ' . $pmd_table . '.`y`= ' . $pma_table . '.`y` * '.$scale.' WHERE - ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name` + ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name` AND ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND diff --git a/pmd_save_pos.php b/pmd_save_pos.php index b6f7ec81d..e46992cbb 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -4,29 +4,29 @@ include_once 'pmd_common.php'; require_once './libraries/relation.lib.php'; - -$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav(); + +$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav(); $seen_pmd_table = false; while ($tab_name = @PMA_DBI_fetch_row($alltab_rs)) { if (stristr($tab_name[0],$GLOBALS['cfgRelation']['designer_coords'])) { $seen_pmd_table = true; - break; + break; } } if ( ! $seen_pmd_table) { - PMD_err_sav(); + PMD_err_sav(); } foreach ($t_x as $key => $value) { $KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp) list($DB,$TAB) = explode(".", $KEY); - PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].' + PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].' WHERE `db_name` = \'' . PMA_sqlAddslashes($DB) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($TAB) . '\'', 1, PMA_DBI_QUERY_STORE); - PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].' + PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].' (db_name, table_name, x, y, v, h) VALUES (' . '\'' . PMA_sqlAddslashes($DB) . '\', ' diff --git a/tbl_change.php b/tbl_change.php index a9bef7386..62d4d479b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -203,8 +203,11 @@ if (isset($primary_key_array)) { } echo "\n"; -if ($cfg['PropertiesIconic'] === true || $cfg['PropertiesIconic'] === 'both') { - if ($cfg['PropertiesIconic'] === 'both') { +if ($cfg['PropertiesIconic'] == true) { + // We need to copy the value or else the == 'both' check will always return true + $propicon = (string)$cfg['PropertiesIconic']; + + if ($propicon == 'both') { $iconic_spacer = '
      '; } else { $iconic_spacer = ''; @@ -212,7 +215,7 @@ if ($cfg['PropertiesIconic'] === true || $cfg['PropertiesIconic'] === 'both') { $titles['Browse'] = $iconic_spacer . '' . $strBrowseForeignValues . ''; - if ($cfg['PropertiesIconic'] === 'both') { + if ($propicon == 'both') { $titles['Browse'] .= ' ' . $strBrowseForeignValues . '
      '; } } else { @@ -524,7 +527,7 @@ foreach ($loop_array as $vrowcount => $vrow) { // ON UPDATE DEFAULT TIMESTAMP attribute. if (PMA_MYSQL_INT_VERSION < 40102 - || (PMA_MYSQL_INT_VERSION >= 40102 + || (PMA_MYSQL_INT_VERSION >= 40102 && !($row_table_def['True_Type'] == 'timestamp' && !empty($row_table_def['Default']) && !isset($analyzed_sql[0]['create_table_fields'][$field]['on_update_current_timestamp'])))) { @@ -626,7 +629,7 @@ foreach ($loop_array as $vrowcount => $vrow) { value="foreign" /> - tabindex="" id="field__3" @@ -957,11 +960,7 @@ foreach ($loop_array as $vrowcount => $vrow) { ?> '; @@ -424,11 +428,11 @@ elseif (!defined('PMA_IDX_INCLUDED') . 'b_drop.png" width="16" height="16" title="' . $strDrop . '" alt="' . $strDrop . '" />'; } - if ($cfg['PropertiesIconic'] === false || $cfg['PropertiesIconic'] === 'both') { + if ($cfg['PropertiesIconic'] === false || $propicon == 'both') { $edit_link_text .= $strEdit; $drop_link_text .= $strDrop; } - if ($cfg['PropertiesIconic'] === 'both') { + if ($propicon == 'both') { $edit_link_text = '' . $edit_link_text . ''; $drop_link_text = '' . $drop_link_text . ''; } diff --git a/tbl_replace.php b/tbl_replace.php index 318f76c58..9c2f97b70 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -274,12 +274,12 @@ if ($is_insert && count($value_sets) > 0) { unset($query_fields, $value_sets); - $message .= $GLOBALS['strInsertedRows'] . ' '; + $message = $GLOBALS['strInsertedRows'] . ' '; } elseif (! empty($query)) { - $message .= $GLOBALS['strAffectedRows'] . ' '; + $message = $GLOBALS['strAffectedRows'] . ' '; } else { // No change -> move back to the calling script - $message .= $GLOBALS['strNoModification']; + $message = $GLOBALS['strNoModification']; $js_to_run = 'functions.js'; $active_page = $goto_include; require_once './libraries/header.inc.php'; diff --git a/test/core.lib.php b/test/core.lib.php index 6ebfe164c..1e7adb444 100644 --- a/test/core.lib.php +++ b/test/core.lib.php @@ -1,5 +1,5 @@ " /> + href="../css/phpmyadmin.css.php?&js_frame=right&nocache=getMtime(); ?>" /> + href="../css/print.css?" /> diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index ce9abb4a4..c04bd35fa 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -369,7 +369,7 @@ div.notice { border: 0.1em solid #FFD700; width: 90%; - background-image: url(getImgPath(); ?>s_notice.png); + background-image: url(../getImgPath(); ?>s_notice.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -400,7 +400,7 @@ div.warning { border: 0.1em solid #CC0000; width: 90%; - background-image: url(getImgPath(); ?>s_warn.png); + background-image: url(../getImgPath(); ?>s_warn.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -431,7 +431,7 @@ div.error { border: 0.1em solid #ff0000; width: 90%; - background-image: url(getImgPath(); ?>s_error.png); + background-image: url(../getImgPath(); ?>s_error.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -462,7 +462,7 @@ fieldset.confirmation legend { border-right: 0.1em solid #FF0000; font-weight: bold; - background-image: url(getImgPath(); ?>s_really.png); + background-image: url(../getImgPath(); ?>s_really.png); background-repeat: no-repeat; background-position: 5px 50%; @@ -653,7 +653,7 @@ a.tab:hover, span.tab, a.warning, span.tabcaution { - cursor: url(getImgPath(); ?>error.ico), default; + cursor: url(../getImgPath(); ?>error.ico), default; } /* end topmenu */ @@ -947,7 +947,7 @@ div#queryboxcontainer div#bookmarkoptions { /* main page */ #maincontainer { - background-image: url(getImgPath(); ?>logo_right.png); + background-image: url(../getImgPath(); ?>logo_right.png); background-position: bottom; background-repeat: no-repeat; border-bottom: 1px solid silver; @@ -960,7 +960,7 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer ul { - list-style-image: url(getImgPath(); ?>item_.png); + list-style-image: url(../getImgPath(); ?>item_.png); vertical-align: middle; } @@ -973,96 +973,96 @@ div#queryboxcontainer div#bookmarkoptions { /* iconic view for ul items */ li#li_create_database { - list-style-image: url(getImgPath(); ?>b_newdb.png); + list-style-image: url(../getImgPath(); ?>b_newdb.png); } li#li_select_lang { - list-style-image: url(getImgPath(); ?>s_lang.png); + list-style-image: url(../getImgPath(); ?>s_lang.png); } li#li_select_mysql_collation, li#li_select_mysql_charset { - list-style-image: url(getImgPath(); ?>s_asci.png); + list-style-image: url(../getImgPath(); ?>s_asci.png); } li#li_select_theme{ - list-style-image: url(getImgPath(); ?>s_theme.png); + list-style-image: url(../getImgPath(); ?>s_theme.png); } li#li_server_info{ - list-style-image: url(getImgPath(); ?>s_host.png); + list-style-image: url(../getImgPath(); ?>s_host.png); } li#li_user_info{ - /* list-style-image: url(getImgPath(); ?>s_rights.png); */ + /* list-style-image: url(../getImgPath(); ?>s_rights.png); */ } li#li_mysql_status{ - list-style-image: url(getImgPath(); ?>s_status.png); + list-style-image: url(../getImgPath(); ?>s_status.png); } li#li_mysql_variables{ - list-style-image: url(getImgPath(); ?>s_vars.png); + list-style-image: url(../getImgPath(); ?>s_vars.png); } li#li_mysql_processes{ - list-style-image: url(getImgPath(); ?>s_process.png); + list-style-image: url(../getImgPath(); ?>s_process.png); } li#li_mysql_collations{ - list-style-image: url(getImgPath(); ?>s_asci.png); + list-style-image: url(../getImgPath(); ?>s_asci.png); } li#li_mysql_engines{ - list-style-image: url(getImgPath(); ?>b_engine.png); + list-style-image: url(../getImgPath(); ?>b_engine.png); } li#li_mysql_binlogs { - list-style-image: url(getImgPath(); ?>s_tbl.png); + list-style-image: url(../getImgPath(); ?>s_tbl.png); } li#li_mysql_databases { - list-style-image: url(getImgPath(); ?>s_db.png); + list-style-image: url(../getImgPath(); ?>s_db.png); } li#li_export { - list-style-image: url(getImgPath(); ?>b_export.png); + list-style-image: url(../getImgPath(); ?>b_export.png); } li#li_import { - list-style-image: url(getImgPath(); ?>b_import.png); + list-style-image: url(../getImgPath(); ?>b_import.png); } li#li_change_password { - list-style-image: url(getImgPath(); ?>s_passwd.png); + list-style-image: url(../getImgPath(); ?>s_passwd.png); } li#li_log_out { - list-style-image: url(getImgPath(); ?>s_loggoff.png); + list-style-image: url(../getImgPath(); ?>s_loggoff.png); } li#li_pma_docs { - list-style-image: url(getImgPath(); ?>b_docs.png); + list-style-image: url(../getImgPath(); ?>b_docs.png); } li#li_phpinfo { - list-style-image: url(getImgPath(); ?>php_sym.png); + list-style-image: url(../getImgPath(); ?>php_sym.png); } li#li_pma_homepage { - list-style-image: url(getImgPath(); ?>b_home.png); + list-style-image: url(../getImgPath(); ?>b_home.png); } li#li_mysql_privilegs{ - list-style-image: url(getImgPath(); ?>s_rights.png); + list-style-image: url(../getImgPath(); ?>s_rights.png); } li#li_switch_dbstats { - list-style-image: url(getImgPath(); ?>b_dbstatistics.png); + list-style-image: url(../getImgPath(); ?>b_dbstatistics.png); } li#li_flush_privileges { - list-style-image: url(getImgPath(); ?>s_reload.png); + list-style-image: url(../getImgPath(); ?>s_reload.png); } /* END iconic view for ul items */ diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 21a7f4135..10cfe0d66 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -30,7 +30,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#ffffff'; -//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; +//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; @@ -64,7 +64,7 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace'; // border $GLOBALS['cfg']['Border'] = 0; // table header and footer color -$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top'; +$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top'; // table header and footer background $GLOBALS['cfg']['ThColor'] = '#000000'; // table data row background diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 599d1254b..f45d86ebb 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -102,7 +102,7 @@ div#leftframelinks a:hover { /* serverlist */ #body_leftFrame #list_server { - list-style-image: url(/original/img/s_host.png); + list-style-image: url(..//original/img/s_host.png); list-style-position: inside; list-style-type: none; margin: 0; diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index d40b30a50..f7520d714 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -344,7 +344,7 @@ div.notice { margin: 0.5em 0 0.5em 0; border: 0.1em solid #FFD700; - background-image: url(getImgPath(); ?>s_notice.png); + background-image: url(../getImgPath(); ?>s_notice.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -374,7 +374,7 @@ div.warning { margin: 0.5em 0 0.5em 0; border: 0.1em solid #CC0000; - background-image: url(getImgPath(); ?>s_warn.png); + background-image: url(../getImgPath(); ?>s_warn.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -404,7 +404,7 @@ div.error { margin: 0.5em 0 0.5em 0; border: 0.1em solid #ff0000; - background-image: url(getImgPath(); ?>s_error.png); + background-image: url(../getImgPath(); ?>s_error.png); background-repeat: no-repeat; background-position: 10px 50%; @@ -435,7 +435,7 @@ fieldset.confirmation legend { border-right: 0.1em solid #FF0000; font-weight: bold; - background-image: url(getImgPath(); ?>s_really.png); + background-image: url(../getImgPath(); ?>s_really.png); background-repeat: no-repeat; background-position: 5px 50%; @@ -625,7 +625,7 @@ a.tab:hover, span.tab, a.warning, span.tabcaution { - cursor: url(getImgPath(); ?>error.ico), default; + cursor: url(../getImgPath(); ?>error.ico), default; } /* end topmenu */ @@ -893,7 +893,7 @@ div#queryboxcontainer div#bookmarkoptions { /* main page */ #maincontainer { - background-image: url(getImgPath(); ?>logo_right.png); + background-image: url(../getImgPath(); ?>logo_right.png); background-position: bottom; background-repeat: no-repeat; border-bottom: 1px solid silver; @@ -906,7 +906,7 @@ div#queryboxcontainer div#bookmarkoptions { } #maincontainer ul { - list-style-image: url(getImgPath(); ?>item_.png); + list-style-image: url(../getImgPath(); ?>item_.png); vertical-align: middle; } @@ -919,96 +919,96 @@ div#queryboxcontainer div#bookmarkoptions { /* iconic view for ul items */ li#li_create_database { - list-style-image: url(getImgPath(); ?>b_newdb.png); + list-style-image: url(../getImgPath(); ?>b_newdb.png); } li#li_select_lang { - list-style-image: url(getImgPath(); ?>s_lang.png); + list-style-image: url(../getImgPath(); ?>s_lang.png); } li#li_select_mysql_collation, li#li_select_mysql_charset { - list-style-image: url(getImgPath(); ?>s_asci.png); + list-style-image: url(../getImgPath(); ?>s_asci.png); } li#li_select_theme{ - list-style-image: url(getImgPath(); ?>s_theme.png); + list-style-image: url(../getImgPath(); ?>s_theme.png); } li#li_server_info{ - list-style-image: url(getImgPath(); ?>s_host.png); + list-style-image: url(../getImgPath(); ?>s_host.png); } li#li_user_info{ - /* list-style-image: url(getImgPath(); ?>s_rights.png); */ + /* list-style-image: url(../getImgPath(); ?>s_rights.png); */ } li#li_mysql_status{ - list-style-image: url(getImgPath(); ?>s_status.png); + list-style-image: url(../getImgPath(); ?>s_status.png); } li#li_mysql_variables{ - list-style-image: url(getImgPath(); ?>s_vars.png); + list-style-image: url(../getImgPath(); ?>s_vars.png); } li#li_mysql_processes{ - list-style-image: url(getImgPath(); ?>s_process.png); + list-style-image: url(../getImgPath(); ?>s_process.png); } li#li_mysql_collations{ - list-style-image: url(getImgPath(); ?>s_asci.png); + list-style-image: url(../getImgPath(); ?>s_asci.png); } li#li_mysql_engines{ - list-style-image: url(getImgPath(); ?>b_engine.png); + list-style-image: url(../getImgPath(); ?>b_engine.png); } li#li_mysql_binlogs { - list-style-image: url(getImgPath(); ?>s_tbl.png); + list-style-image: url(../getImgPath(); ?>s_tbl.png); } li#li_mysql_databases { - list-style-image: url(getImgPath(); ?>s_db.png); + list-style-image: url(../getImgPath(); ?>s_db.png); } li#li_export { - list-style-image: url(getImgPath(); ?>b_export.png); + list-style-image: url(../getImgPath(); ?>b_export.png); } li#li_import { - list-style-image: url(getImgPath(); ?>b_import.png); + list-style-image: url(../getImgPath(); ?>b_import.png); } li#li_change_password { - list-style-image: url(getImgPath(); ?>s_passwd.png); + list-style-image: url(../getImgPath(); ?>s_passwd.png); } li#li_log_out { - list-style-image: url(getImgPath(); ?>s_loggoff.png); + list-style-image: url(../getImgPath(); ?>s_loggoff.png); } li#li_pma_docs { - list-style-image: url(getImgPath(); ?>b_docs.png); + list-style-image: url(../getImgPath(); ?>b_docs.png); } li#li_phpinfo { - list-style-image: url(getImgPath(); ?>php_sym.png); + list-style-image: url(../getImgPath(); ?>php_sym.png); } li#li_pma_homepage { - list-style-image: url(getImgPath(); ?>b_home.png); + list-style-image: url(../getImgPath(); ?>b_home.png); } li#li_mysql_privilegs{ - list-style-image: url(getImgPath(); ?>s_rights.png); + list-style-image: url(../getImgPath(); ?>s_rights.png); } li#li_switch_dbstats { - list-style-image: url(getImgPath(); ?>b_dbstatistics.png); + list-style-image: url(../getImgPath(); ?>b_dbstatistics.png); } li#li_flush_privileges { - list-style-image: url(getImgPath(); ?>s_reload.png); + list-style-image: url(../getImgPath(); ?>s_reload.png); } /* END iconic view for ul items */ diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index ab855df20..549f3392b 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -29,7 +29,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; -//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; +//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; diff --git a/translators.html b/translators.html index 4e3c42cdb..b98ccf381 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ - phpMyAdmin 2.11.0-dev - Official translators + phpMyAdmin 2.10.0-beta1 - Official translators @@ -31,7 +31,7 @@
    • Glossary
      • -

      phpMyAdmin 2.11.0-dev official translators list

      +

      phpMyAdmin 2.10.0-beta1 official translators list

      Here is the list of the "official translators" of phpMyAdmin.

      @@ -57,7 +57,7 @@ @@ -206,7 +206,7 @@ @@ -234,7 +234,7 @@ @@ -269,7 +269,7 @@ @@ -290,7 +290,7 @@ @@ -311,7 +311,7 @@ diff --git a/view_create.php b/view_create.php deleted file mode 100644 index cb890ce9e..000000000 --- a/view_create.php +++ /dev/null @@ -1,141 +0,0 @@ - - -
      -
      - - -
      - CREATE VIEW - -
      - +
      Afrikaans - volunteer needed + Andreas Pauley (pauley@buitegroep.org.za)
      Georgian - volunteer needed + --volunteer needed--
      Hindi - volunteer needed + Girish Nair (girish_nair@users.sourceforge.net)
      Korean - volunteer needed + WooSuhan (kjh@unews.co.kr)
      Malay - volunteer needed + Mohammad Shafiq bin Mohd Mustapa (sicksand@users.sourceforge.net)
      Persian - volunteer needed + Parham Ghaffarian (parham@bornisgroup.com)
      - - - - - - - - - - - - - - - - - - - - - -
      -
      -
      -
      -
      -
      WITH - - - - - - -
      - -
      - -
      - - -