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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Marc Delisle 2013-04-08 08:01:57 -04:00
commit bf5b2bd046
5 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Config.class.php
View File

@ -189,11 +189,11 @@ class PMA_Config
$this->set('PMA_USR_BROWSER_VER', $log_version[2]);
$this->set('PMA_USR_BROWSER_AGENT', 'OPERA');
} elseif (preg_match(
'@MSIE ([0-9].[0-9]{1,2})@',
'@(MS)?IE ([0-9]{1,2}.[0-9]{1,2})@',
$HTTP_USER_AGENT,
$log_version
)) {
$this->set('PMA_USR_BROWSER_VER', $log_version[1]);
$this->set('PMA_USR_BROWSER_VER', $log_version[2]);
$this->set('PMA_USR_BROWSER_AGENT', 'IE');
} elseif (preg_match(
'@OmniWeb/([0-9].[0-9]{1,2})@',
@ -242,6 +242,14 @@ class PMA_Config
'PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]
);
$this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
// Firefox
} elseif (! strstr($HTTP_USER_AGENT, 'compatible')
&& preg_match('@Firefox/([\w.]+)@', $HTTP_USER_AGENT, $log_version2)
) {
$this->set(
'PMA_USR_BROWSER_VER', $log_version2[1]
);
$this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
} elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
$this->set('PMA_USR_BROWSER_VER', '1.9');
$this->set('PMA_USR_BROWSER_AGENT', 'GECKO');

4
libraries/Header.class.php
View File

@ -484,7 +484,9 @@ class PMA_Header
$dir = $GLOBALS['text_dir'];
$retval = "<!DOCTYPE HTML>";
$retval .= "<html lang='$lang' dir='$dir'>";
$retval .= "<html lang='$lang' dir='$dir' class='";
$retval .= strtolower(PMA_USR_BROWSER_AGENT) . " ";
$retval .= strtolower(PMA_USR_BROWSER_AGENT) . intval(PMA_USR_BROWSER_VER) . "'>";
return $retval;
}

18
libraries/navigation/NavigationTree.class.php
View File

@ -1031,7 +1031,14 @@ class PMA_NavigationTree
$retval .= "<form class='ajax fast_filter'>";
$retval .= PMA_getHiddenFields($url_params);
$retval .= "<input class='searchClause' name='searchClause'";
$retval .= " value='" . __('filter databases by name') . "' />";
// allow html5 placeholder attribute
$placeholder_key = 'value';
if (PMA_USR_BROWSER_AGENT !== 'IE'
|| PMA_USR_BROWSER_VER > 9
) {
$placeholder_key = 'placeholder';
}
$retval .= " $placeholder_key='" . __('filter databases by name') . "' />";
$retval .= "<span title='" . __('Clear Fast Filter') . "'>X</span>";
$retval .= "</form>";
$retval .= "</li>";
@ -1057,7 +1064,14 @@ class PMA_NavigationTree
$retval .= "<form class='ajax fast_filter'>";
$retval .= PMA_getHiddenFields($url_params);
$retval .= "<input class='searchClause' name='searchClause2'";
$retval .= " value='" . __('filter items by name') . "' />";
// allow html5 placeholder attribute
$placeholder_key = 'value';
if (PMA_USR_BROWSER_AGENT !== 'IE'
|| PMA_USR_BROWSER_VER > 9
) {
$placeholder_key = 'placeholder';
}
$retval .= " $placeholder_key='" . __('filter items by name') . "' />";
$retval .= "<span title='" . __('Clear Fast Filter') . "'>X</span>";
$retval .= "</form>";
$retval .= "</li>";

10
themes/original/css/navigation.css.php
View File

@ -196,7 +196,7 @@ li.fast_filter {
border-<?php echo $left; ?>: 1px solid #666;
}
li.fast_filter input {
padding-<?php echo $right; ?>: .4em;
padding-<?php echo $right; ?>: 1.7em;
width: 100%;
}
li.fast_filter span {
@ -207,6 +207,14 @@ li.fast_filter span {
font-weight: bold;
color: #800;
}
/* IE10+ has its own reset X */
html.ie li.fast_filter span {
display: none;
}
html.ie.ie9 li.fast_filter span,
html.ie.ie8 li.fast_filter span {
display: auto;
}
li.fast_filter.db_fast_filter {
border: 0;
}

10
themes/pmahomme/css/navigation.css.php
View File

@ -192,7 +192,7 @@ li.fast_filter {
border-<?php echo $left; ?>: 1px solid #666;
}
li.fast_filter input {
padding-<?php echo $right; ?>: .4em;
padding-<?php echo $right; ?>: 1.7em;
width: 100%;
}
li.fast_filter span {
@ -203,6 +203,14 @@ li.fast_filter span {
font-weight: bold;
color: #800;
}
/* IE10+ has its own reset X */
html.ie li.fast_filter span {
display: none;
}
html.ie.ie9 li.fast_filter span,
html.ie.ie8 li.fast_filter span {
display: auto;
}
li.fast_filter.db_fast_filter {
border: 0;
}