From 45632daaacd58239fd27fbaf0b995df9fce58f98 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Mon, 31 Oct 2005 15:22:03 +0000 Subject: [PATCH] fixed some rtl language issues --- ChangeLog | 2 + css/phpmyadmin.css.php | 10 + libraries/mysql_charsets.lib.php | 2 +- main.php | 576 ++++++++++++++----------------- 4 files changed, 266 insertions(+), 324 deletions(-) diff --git a/ChangeLog b/ChangeLog index 883e24f09..7f9030a20 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ $Source$ * themes/*/css/theme_right.css.php: - use right image path - fixed icon alignment for rtl languages + * main.php, phpmyadmin.css.php, libraries/mysql_charsets.lib.php: + - fixed some rtl language issues 2005-10-31 Marc Delisle * server_privileges.php: do not display No under the Password column diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index d44a36892..03c1cc2fd 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -38,6 +38,16 @@ caption { font-size: ; } +#mainheader { + border: 0.1px solid transparent; + border-bottom: 0.1em solid gray; + margin-bottom: 1em; +} + +#pmalogoright { + float: ; +} + #tableuserrights td, #tablespecificuserrights td, #tabledatabases td { diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index ae7ed155b..0ee726a67 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -325,7 +325,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){ $spacer = ''; for ($i = 1; $i <= $indent; $i++) $spacer .= ' '; - $return_str = $spacer . '' . "\n"; if ($label) { $return_str .= $spacer . ' ' . "\n"; } diff --git a/main.php b/main.php index fbc01a169..874fff84b 100644 --- a/main.php +++ b/main.php @@ -22,21 +22,18 @@ if (isset($convcharset)) { */ require_once('./libraries/select_theme.lib.php'); // Defines the "item" image depending on text direction -$item_img = $GLOBALS['pmaThemeImage'] . 'item_ltr.png'; + +$item_img = $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png'; + // Defines for MainPageIconic $str_iconic_list = ''; -$str_iconic_colspan = ''; -$str_normal_list = '' - .'*'; -if ($cfg['MainPageIconic']) { - $str_iconic_list .= '%1$s' - .'%3$s' +$str_normal_list = '' + .'*'; +if ( $cfg['MainPageIconic'] ) { + $str_iconic_list = '%1$s' + .'%3$s' .'%4$s'; - $str_iconic_colspan .= ' colspan="2"'; -} else { - $str_iconic_list = ''; - $str_iconic_colspan = ' colspan="2"'; } // Handles some variables that may have been sent by the calling script @@ -48,30 +45,28 @@ if (isset($table)) { } $show_query = '1'; require_once('./header.inc.php'); -echo "\n"; /** * Displays the welcome message and the server informations */ - -// note: for proper display of RTL languages, I removed the -// align="left" in the next tag -?> - - - - ' . "\n"; - echo ' phpMyAdmin - Logo' . "\n"; - echo ' '; - } - ?> -
-

- -

+?> +
+ + phpMyAdmin + +

+phpMyAdmin ' . PMA_VERSION . ''); +?> +

0) { +if ( $server > 0 ) { // robbat2: Use the verbose name of the server instead of the hostname // if a value is set if (!empty($cfg['Server']['verbose'])) { @@ -92,12 +87,12 @@ if ($server > 0) { PMA_DBI_free_result($res); unset($res, $row); - $full_string = str_replace('%pma_s1%', PMA_MYSQL_STR_VERSION, $strMySQLServerProcess); + $full_string = str_replace('%pma_s1%', '' . PMA_MYSQL_STR_VERSION . '', $strMySQLServerProcess); $full_string = str_replace('%pma_s2%', $server_info, $full_string); $full_string = str_replace('%pma_s3%', htmlspecialchars($mysql_cur_user_and_host), $full_string); - echo '

' . $full_string . '

' . "\n"; -} // end if + echo '

' . $full_string . '

' . "\n"; +} // end if $server > 0 // Any message to display? @@ -125,23 +120,8 @@ if (($server > 0) && isset($mode) && ($mode == 'reload')) { unset($sql_query); unset($message); } -?> -
-
+?> + - - -
- +?> + + @@ -600,7 +532,6 @@ echo "\n";
-
0) { if ($is_superuser || $is_create_db_priv || $is_process_priv || $is_reload_priv || $cfg['ShowMysqlInfo'] || $cfg['ShowMysqlVars'] || $cfg['ShowChgPassword'] || $cfg['Server']['auth_type'] != 'config') { -?> - + ?> - - - - - - - + + + - + echo $str_iconic_list != '' ? sprintf($str_iconic_list,'','b_newdb.png',$strCreateNewDatabase,'') : $str_normal_list; + ?> + + - ','s_status.png',$strMySQLShowStatus,'') : $str_normal_list); -?> - - + ?> + + ','s_status.png',$strMySQLShowStatus,'') : $str_normal_list); + ?> + + - ','s_vars.png',$strMySQLShowVars,'') : $str_normal_list); -?> - - - - ','s_process.png',$strMySQLShowProcess,'') : $str_normal_list); -?> - - - = 40100) { - echo "\n"; - ?> - ','s_asci.png',$strCharsetsAndCollations,'') : $str_normal_list); -?> - - + ?> +','s_vars.png',$strMySQLShowVars,'') : $str_normal_list); + ?> + + - ','b_engine.png',$strStorageEngines,'') : $str_normal_list); -?> - - + ?> +','s_process.png',$strMySQLShowProcess,'') : $str_normal_list); + ?> + + + = 40100) { + ?> +','s_asci.png',$strCharsetsAndCollations,'') : $str_normal_list); + ?> + + + +','b_engine.png',$strStorageEngines,'') : $str_normal_list); + ?> + + - ','s_reload.png',$strReloadMySQL,'') : $str_normal_list); -?> - - + ?> +','s_reload.png',$strReloadMySQL,'') : $str_normal_list); + ?> + + - ','s_rights.png',$strPrivileges,'') : $str_normal_list); -?> - - + ?> +','s_rights.png',$strPrivileges,'') : $str_normal_list); + ?> + + 0) { - ?> - ','s_tbl.png',$strBinaryLog,'') : $str_normal_list); -?> - - + ?> +','s_tbl.png',$strBinaryLog,'') : $str_normal_list); + ?> + + - ','s_db.png',$strDatabases,'') : $str_normal_list); -?> - - - -','b_export.png',$strExport,'') : $str_normal_list); -?> - - - -','b_import.png',$strImport,'') : $str_normal_list); -?> - - + ?> +','s_db.png',$strDatabases,'') : $str_normal_list); + ?> + + + + ','b_export.png',$strExport,'') : $str_normal_list); + ?> + + + + ','b_import.png',$strImport,'') : $str_normal_list); + ?> + + - -','s_passwd.png',$strChangePassword,'') : $str_normal_list); -?> - - + ?> + + ','s_passwd.png',$strChangePassword,'') : $str_normal_list); + ?> + +' - . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' + ? '' + . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' : ''; - echo "\n"; - ?> - -','s_loggoff.png',$strLogout,'') : $str_normal_list); -?> - - + ?> + + ','s_loggoff.png',$strLogout,'') : $str_normal_list); + ?> + + + ?>
>  MySQL
- -
+ MySQL
+ +
- - - -
+ + +
-   -
- -   - -
- -   -
+ + +
- -   -
+ + +
+ +
+ +
- -   - -
+ + +
- -   -
+ +
- -   -
+ +
- - -
- - -
- - -
+ +
+ +
+ +
- - -
+ +
- - -   -
+ + +
- 0) -echo "\n"; - -?> +?> 		  - - - + - - ','s_lang.png','Language','') : $str_normal_list); -?> - ','s_lang.png','Language','') : $str_normal_list); + ?> + - - - - + - + ?> + + + + += 40100) { echo ' ' . "\n" @@ -485,10 +425,10 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] .' ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'','s_asci.png',$strMySQLCharset,'') : $str_normal_list) . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" @@ -501,14 +441,13 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] . ' ' . $strMySQLConnectionCollation . ': ' . "\n" . ' ' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, TRUE, 4, TRUE) - . ' ' . "\n" + . ' ' . "\n" // put the doc link in the form so that it appears on the same line . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n"; } -echo "\n"; // added by Michael Keck // ThemeManager if available @@ -519,79 +458,72 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) { $theme_preview_href = ''; -?> - + ?> -') : $str_normal_list) . "\n"; -?> - - -') : $str_normal_list) . "\n"; + ?> + + + - - ','b_docs.png',$strPmaDocumentation,'') : $str_normal_list); -?> - - +?> +','b_docs.png',$strPmaDocumentation,'') : $str_normal_list); +?> + + - + ?> ','php_sym.png',$strShowPHPInfo,'') : $str_normal_list); -?> + echo ($str_iconic_list != '' ? sprintf($str_iconic_list,'','php_sym.png',$strShowPHPInfo,'') : $str_normal_list); + ?> - - - ','b_home.png',$strHomepageOfficial,'') : $str_normal_list); -?> - - - +?> +'; -?> - - +echo ($str_iconic_list != '' ? sprintf($str_iconic_list,'','b_home.png',$strHomepageOfficial,'') : $str_normal_list); +?> + + + + +
>  phpMyAdmin
phpMyAdmin
-
- - - Language '; - }else{ echo '(*)'; } -?>:
+ + + + + Language '; + } else { echo '(*)'; } +?>: - + +
-
- - - : -
+ + + + : + - - -
' . "\n" . ' ' . $strMySQLCharset . ': ' - . ' ' + . ' ' . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" - . ' ' . "\n" + . ' ' . "\n" . '
-
- :' . "\n"; - ?> - - -
-
+ :' . "\n"; + ?> + + +
+
- -
+ +
- -
- [ChangeLog] -    [CVS] -    [Lists] -
+ +
+ + [ChangeLog] +    [CVS] +    [Lists] + +