diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 91338f1a69..8d0275ac06 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -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'); diff --git a/libraries/Header.class.php b/libraries/Header.class.php index c248bbe792..a465daa69c 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -484,7 +484,9 @@ class PMA_Header $dir = $GLOBALS['text_dir']; $retval = ""; - $retval .= ""; + $retval .= ""; return $retval; } diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 99be9eb382..bac5b677d4 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -1031,7 +1031,14 @@ class PMA_NavigationTree $retval .= "
"; $retval .= PMA_getHiddenFields($url_params); $retval .= ""; + // 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 .= "X"; $retval .= "
"; $retval .= ""; @@ -1057,7 +1064,14 @@ class PMA_NavigationTree $retval .= "
"; $retval .= PMA_getHiddenFields($url_params); $retval .= ""; + // 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 .= "X"; $retval .= "
"; $retval .= ""; diff --git a/themes/original/css/navigation.css.php b/themes/original/css/navigation.css.php index 902e60e488..54ea35f41c 100644 --- a/themes/original/css/navigation.css.php +++ b/themes/original/css/navigation.css.php @@ -196,7 +196,7 @@ li.fast_filter { border-: 1px solid #666; } li.fast_filter input { - padding-: .4em; + padding-: 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; } diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php index eae6fa74e7..905a4285f8 100644 --- a/themes/pmahomme/css/navigation.css.php +++ b/themes/pmahomme/css/navigation.css.php @@ -192,7 +192,7 @@ li.fast_filter { border-: 1px solid #666; } li.fast_filter input { - padding-: .4em; + padding-: 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; }