nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed css errors

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-02-10 10:57:23 +00:00
parent 7f919e6a86
commit 01fdd8e30b
2 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/auth/cookie.auth.lib.php3
View File

@@ -11,6 +11,8 @@
if (!defined('PMA_COOKIE_AUTH_INCLUDED')) { if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
define('PMA_COOKIE_AUTH_INCLUDED', 1); define('PMA_COOKIE_AUTH_INCLUDED', 1);
// Gets the default font sizes
PMA_setFontSizes();
// Defines the cookie path // Defines the cookie path
$cookiePath = substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/')); $cookiePath = substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/'));
@@ -87,8 +89,6 @@ if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
<style type="text/css"> <style type="text/css">
<!-- <!--
body {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000} body {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
form {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold} h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
.warning {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000} .warning {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
//--> //-->
@@ -108,7 +108,7 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
<!-- Language selection --> <!-- Language selection -->
<form method="post" action="index.php3"> <form method="post" action="index.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" /> <input type="hidden" name="server" value="<?php echo $server; ?>" />
Language: <b>Language:&nbsp;</b>
<select name="lang" dir="ltr" onchange="this.form.submit();"> <select name="lang" dir="ltr" onchange="this.form.submit();">
<?php <?php
echo "\n"; echo "\n";
@@ -144,13 +144,13 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
<form method="post" action="index.php3" name="login_form"<?php echo $autocomplete; ?>> <form method="post" action="index.php3" name="login_form"<?php echo $autocomplete; ?>>
<table cellpadding="5"> <table cellpadding="5">
<tr> <tr>
<td align="<?php echo $cell_align; ?>"><?php echo $GLOBALS['strLogUsername']; ?>&nbsp;</td> <td align="<?php echo $cell_align; ?>"><b><?php echo $GLOBALS['strLogUsername']; ?>&nbsp;</b></td>
<td align="<?php echo $cell_align; ?>"> <td align="<?php echo $cell_align; ?>">
<input type="text" name="pma_username" value="<?php echo (isset($default_user) ? $default_user : ''); ?>" size="24" onfocus="this.select()" /> <input type="text" name="pma_username" value="<?php echo (isset($default_user) ? $default_user : ''); ?>" size="24" onfocus="this.select()" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="<?php echo $cell_align; ?>"><?php echo $GLOBALS['strLogPassword']; ?>&nbsp;</td> <td align="<?php echo $cell_align; ?>"><b><?php echo $GLOBALS['strLogPassword']; ?>&nbsp;</b></td>
<td align="<?php echo $cell_align; ?>"> <td align="<?php echo $cell_align; ?>">
<input type="password" name="pma_password" value="" size="24" onfocus="this.select()" /> <input type="password" name="pma_password" value="" size="24" onfocus="this.select()" />
</td> </td>
@@ -160,7 +160,7 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td align="<?php echo $cell_align; ?>"><?php echo $GLOBALS['strServerChoice']; ?>&nbsp;:&nbsp;</td> <td align="<?php echo $cell_align; ?>"><b><?php echo $GLOBALS['strServerChoice']; ?>&nbsp;:&nbsp;</b></td>
<td align="<?php echo $cell_align; ?>"> <td align="<?php echo $cell_align; ?>">
<select name="server"> <select name="server">
<?php <?php

155
libraries/common.lib.php3
View File

@@ -20,6 +20,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
* *
* some functions need the constants of libraries/defines.lib.php3 * some functions need the constants of libraries/defines.lib.php3
* *
* the PMA_setFontSizes() function must be before the call to the
* libraries/auth/cookie.auth.lib.php3 library
*
* the include of libraries/defines.lib.php3 must be after the connection * the include of libraries/defines.lib.php3 must be after the connection
* to db to get the MySql version * to db to get the MySql version
* *
@@ -40,6 +43,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
* - definition of PMA_sqlAddslashes() * - definition of PMA_sqlAddslashes()
* - definition of PMA_mysqlDie() * - definition of PMA_mysqlDie()
* - definition of PMA_isInto() * - definition of PMA_isInto()
* - definition of PMA_setFontSizes()
* - loading of an authentication library * - loading of an authentication library
* - db connection * - db connection
* - authentication work * - authentication work
@@ -285,6 +289,82 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
} // end of the 'PMA_isInto()' function } // end of the 'PMA_isInto()' function
/**
* Determines the font sizes to use depending on the os and browser of the
* user.
*
* This function is based on an article from phpBuilder (see
* http://www.phpbuilder.net/columns/tim20000821.php3).
*
* @return boolean always true
*
* @global string the standard font size
* @global string the font size for titles
* @global string the small font size
* @global string the smallest font size
*
* @access public
*
* @version 1.1
*/
function PMA_setFontSizes()
{
global $font_size, $font_bigger, $font_smaller, $font_smallest;
// IE (<6)/Opera for win case: needs smaller fonts than anyone else
if (PMA_USR_OS == 'Win'
&& ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 6) || PMA_USR_BROWSER_AGENT == 'OPERA')) {
$font_size = 'x-small';
$font_bigger = 'large';
$font_smaller = '90%';
$font_smallest = '7pt';
}
// IE6 and other browsers for win case
else if (PMA_USR_OS == 'Win') {
$font_size = 'small';
$font_bigger = 'large';
$font_smaller = (PMA_USR_BROWSER_AGENT == 'IE')
? '90%'
: 'x-small';
$font_smallest = 'x-small';
}
// Some mac browsers need also smaller default fonts size (OmniWeb &
// Opera)...
else if (PMA_USR_OS == 'Mac'
&& (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA')) {
$font_size = 'x-small';
$font_bigger = 'large';
$font_smaller = '90%';
$font_smallest = '7pt';
}
// ... but most of them (except IE 5+ & NS 6+) need bigger fonts
else if (PMA_USR_OS == 'Mac'
&& ((PMA_USR_BROWSER_AGENT != 'IE' && PMA_USR_BROWSER_AGENT != 'MOZILLA')
|| PMA_USR_BROWSER_VER < 5)) {
$font_size = 'medium';
$font_bigger = 'x-large';
$font_smaller = 'small';
$font_smallest = 'x-small';
}
// OS/2 browser
else if (PMA_USR_OS == 'OS/2'
&& PMA_USR_BROWSER_AGENT == 'OPERA') {
$font_size = 'small';
$font_bigger = 'medium';
$font_smaller = 'x-small';
$font_smallest = 'x-small';
}
else {
$font_size = 'small';
$font_bigger = 'large';
$font_smaller = 'x-small';
$font_smallest = 'x-small';
}
return true;
} // end of the 'PMA_setFontSizes()' function
/** /**
* Use mysql_connect() or mysql_pconnect()? * Use mysql_connect() or mysql_pconnect()?
*/ */
@@ -624,81 +704,6 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
/* ----------------------- Set of misc functions ----------------------- */ /* ----------------------- Set of misc functions ----------------------- */
/**
* Determines the font sizes to use depending on the os and browser of the
* user.
*
* This function is based on an article from phpBuilder (see
* http://www.phpbuilder.net/columns/tim20000821.php3).
*
* @return boolean always true
*
* @global string the standard font size
* @global string the font size for titles
* @global string the small font size
* @global string the smallest font size
*
* @access public
*
* @version 1.1
*/
function PMA_setFontSizes()
{
global $font_size, $font_bigger, $font_smaller, $font_smallest;
// IE (<6)/Opera for win case: needs smaller fonts than anyone else
if (PMA_USR_OS == 'Win'
&& ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 6) || PMA_USR_BROWSER_AGENT == 'OPERA')) {
$font_size = 'x-small';
$font_bigger = 'large';
$font_smaller = '90%';
$font_smallest = '7pt';
}
// IE6 and other browsers for win case
else if (PMA_USR_OS == 'Win') {
$font_size = 'small';
$font_bigger = 'large';
$font_smaller = (PMA_USR_BROWSER_AGENT == 'IE')
? '90%'
: 'x-small';
$font_smallest = 'x-small';
}
// Some mac browsers need also smaller default fonts size (OmniWeb &
// Opera)...
else if (PMA_USR_OS == 'Mac'
&& (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA')) {
$font_size = 'x-small';
$font_bigger = 'large';
$font_smaller = '90%';
$font_smallest = '7pt';
}
// ... but most of them (except IE 5+ & NS 6+) need bigger fonts
else if (PMA_USR_OS == 'Mac'
&& ((PMA_USR_BROWSER_AGENT != 'IE' && PMA_USR_BROWSER_AGENT != 'MOZILLA')
|| PMA_USR_BROWSER_VER < 5)) {
$font_size = 'medium';
$font_bigger = 'x-large';
$font_smaller = 'small';
$font_smallest = 'x-small';
}
// OS/2 browser
else if (PMA_USR_OS == 'OS/2'
&& PMA_USR_BROWSER_AGENT == 'OPERA') {
$font_size = 'small';
$font_bigger = 'medium';
$font_smaller = 'x-small';
$font_smallest = 'x-small';
}
else {
$font_size = 'small';
$font_bigger = 'large';
$font_smaller = 'x-small';
$font_smallest = 'x-small';
}
return true;
} // end of the 'PMA_setFontSizes()' function
/** /**
* Adds backquotes on both sides of a database, table or field name. * Adds backquotes on both sides of a database, table or field name.