From afd0a2ac97b684f45210e2e11050b96e9c7dbc67 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 24 May 2009 11:52:32 +0000 Subject: [PATCH] patch #2794819 [navi] Filter for displayed table names --- ChangeLog | 2 ++ js/navigation.js | 35 +++++++++++++++++++++++++ lang/afrikaans-utf-8.inc.php | 2 ++ lang/albanian-utf-8.inc.php | 2 ++ lang/arabic-utf-8.inc.php | 2 ++ lang/azerbaijani-utf-8.inc.php | 2 ++ lang/bangla-utf-8.inc.php | 2 ++ lang/basque-utf-8.inc.php | 2 ++ lang/belarusian_cyrillic-utf-8.inc.php | 2 ++ lang/belarusian_latin-utf-8.inc.php | 2 ++ lang/bosnian-utf-8.inc.php | 2 ++ lang/brazilian_portuguese-utf-8.inc.php | 2 ++ lang/bulgarian-utf-8.inc.php | 2 ++ lang/catalan-utf-8.inc.php | 2 ++ lang/chinese_simplified-utf-8.inc.php | 2 ++ lang/chinese_traditional-utf-8.inc.php | 2 ++ lang/croatian-utf-8.inc.php | 2 ++ lang/czech-utf-8.inc.php | 2 ++ lang/danish-utf-8.inc.php | 2 ++ lang/dutch-utf-8.inc.php | 2 ++ lang/english-utf-8.inc.php | 2 ++ lang/estonian-utf-8.inc.php | 2 ++ lang/finnish-utf-8.inc.php | 2 ++ lang/french-utf-8.inc.php | 2 ++ lang/galician-utf-8.inc.php | 2 ++ lang/georgian-utf-8.inc.php | 2 ++ lang/german-utf-8.inc.php | 2 ++ lang/greek-utf-8.inc.php | 2 ++ lang/hebrew-utf-8.inc.php | 2 ++ lang/hindi-utf-8.inc.php | 2 ++ lang/hungarian-utf-8.inc.php | 2 ++ lang/indonesian-utf-8.inc.php | 2 ++ lang/italian-utf-8.inc.php | 2 ++ lang/japanese-utf-8.inc.php | 2 ++ lang/korean-utf-8.inc.php | 2 ++ lang/latvian-utf-8.inc.php | 2 ++ lang/lithuanian-utf-8.inc.php | 2 ++ lang/macedonian_cyrillic-utf-8.inc.php | 2 ++ lang/malay-utf-8.inc.php | 2 ++ lang/mongolian-utf-8.inc.php | 2 ++ lang/norwegian-utf-8.inc.php | 2 ++ lang/persian-utf-8.inc.php | 2 ++ lang/polish-utf-8.inc.php | 2 ++ lang/portuguese-utf-8.inc.php | 2 ++ lang/romanian-utf-8.inc.php | 2 ++ lang/russian-utf-8.inc.php | 2 ++ lang/serbian_cyrillic-utf-8.inc.php | 2 ++ lang/serbian_latin-utf-8.inc.php | 2 ++ lang/sinhala-utf-8.inc.php | 2 ++ lang/slovak-utf-8.inc.php | 2 ++ lang/slovenian-utf-8.inc.php | 2 ++ lang/spanish-utf-8.inc.php | 2 ++ lang/swedish-utf-8.inc.php | 2 ++ lang/tatarish-utf-8.inc.php | 2 ++ lang/thai-utf-8.inc.php | 2 ++ lang/turkish-utf-8.inc.php | 2 ++ lang/ukrainian-utf-8.inc.php | 2 ++ navigation.php | 5 ++++ 58 files changed, 152 insertions(+) diff --git a/ChangeLog b/ChangeLog index 360ce3054..8b0a43050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 3.3.0.0 (not yet released) ++ patch #2794819 [navi] Filter for displayed table names, + thanks to Michael Valushko - dylfin 3.2.0.0 (not yet released) - [core] better support for vendor customisation (based on what Debian needs) diff --git a/js/navigation.js b/js/navigation.js index 44ffc44bd..1e038ab4e 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -137,3 +137,38 @@ function PMA_setCookie(name, value, expires, path, domain, secure) { ( (domain) ? ";domain=" + domain : "") + ( (secure) ? ";secure" : ""); } + +/** + * hide all LI elements with second A tag which doesn`t contain requested value + * + * @param string value requested value + * + */ +function fast_filter(value){ + var oTarget = document.getElementById("subel0"); + if(!oTarget || !document.getElementById('fast_filter')) return false; + if(value!=document.getElementById('fast_filter').value) return false; + document.getElementById('fast_filter').disabled=true; + for(var iCh in oTarget.childNodes){ + var oCh = oTarget.childNodes.item(iCh); + if(!oCh) continue; + if(oCh.nodeName=="LI"){ + if(value=="") oCh.style.display=""; + else{ + var i=0; + for(var iA in oCh.childNodes){ + var oA = oCh.childNodes.item(iA); + if(!oA) continue; + if(oA.nodeName=="A"){ + if(i==0) i = 1; + else{ + if(oA.innerHTML.indexOf(value)==-1) oCh.style.display="none"; + else oCh.style.display=""; + } + } + } + } + } + } + document.getElementById('fast_filter').disabled=false; +} \ No newline at end of file diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 787fedc18..4a563e2e7 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1485,4 +1485,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 2f979f987..85a7429e0 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1484,4 +1484,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 652370e5a..f801572f3 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1486,4 +1486,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 780ec02be..57728d13e 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1481,4 +1481,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 2c5f18641..82c5321d4 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1460,4 +1460,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 61a3d7394..a70332f44 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1478,4 +1478,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 654d8616a..e4fcd0397 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1460,4 +1460,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index ffc2342dd..b5136b2cf 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1468,4 +1468,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 62eac267e..9da5cd0c7 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1484,4 +1484,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index bb7e7c522..5ce195fae 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1458,4 +1458,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index f742c2e54..854f1041a 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1481,4 +1481,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 079baf50b..ba26440c1 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1458,4 +1458,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 877086f60..add6fc46e 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1468,4 +1468,6 @@ $strYes = '是'; $strZeroRemovesTheLimit = '注意：若将这些选项设为 0(零) 即不限制。'; $strZip = 'zip 压缩'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 976f095d7..af1b57cab 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1465,4 +1465,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index d1a0fe17f..d072c2b9b 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1462,4 +1462,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 5d0c91bc1..1bd2f7dda 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1466,4 +1466,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 64fb57794..3683b69a7 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1460,4 +1460,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 36683af08..106145612 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1465,4 +1465,6 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Opmerking: Het instellen van deze waarden op 0 (nul) verwijdert de limiet.'; $strZip = '"Gezipt"'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index be502c694..634a2b862 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -513,6 +513,8 @@ $strMySQLSaid = 'MySQL said: '; $strMySQLShowProcess = 'Show processes'; $strName = 'Name'; +$strNavTableFilter = 'Filter'; +$strNavTableFilterReset = 'Reset filter'; $strNext = 'Next'; $strNoActivity = 'No activity within %s seconds; please log in again'; $strNoDatabases = 'No databases'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 78af823cb..1d565d9d3 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1466,4 +1466,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 189d39922..fe50690c5 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1461,4 +1461,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 4688a547d..d7ef9db9c 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1457,4 +1457,6 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index ddda7d6d1..9161fbf7a 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1459,4 +1459,6 @@ $strReplicationStatus = 'Estado da replicación'; $strReplicationStatusInfo = 'Este servidor de MySQL server funciona como %s en proceso de replicación. Para máis información acerca do estado de replicación do servidor visite a sección sobre replicación.'; $strReplicationStatus_master = 'Estado do mestre'; $strReplicationStatus_slave = 'Estado do escravo'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index f55608b65..a5100adc0 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1465,4 +1465,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index e946245a7..dc69ab654 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1479,4 +1479,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index cb17cb0ef..b1fef65b9 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1483,4 +1483,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index cefeb6612..4f6f9b529 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1478,4 +1478,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index f278c049b..3234cf0e8 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1486,4 +1486,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 3a13b0eed..f7f84eae0 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1463,4 +1463,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index d800dbb25..51c0fe1af 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1476,4 +1476,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 440e5a62b..3722bb9d8 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1465,4 +1465,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 711a378d0..bc503984b 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1466,4 +1466,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 38adc23de..ad5e9384c 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1481,4 +1481,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index f1dbfa9da..39d4a6bd3 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1483,4 +1483,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index afa9f1a13..70e1cd7ef 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1475,4 +1475,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index be272f207..12ae51582 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1461,4 +1461,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index d9c1d1ff3..050b34a58 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1498,4 +1498,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index b08588bed..c3049a3a6 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1481,4 +1481,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index b345576d5..b683b704c 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1458,4 +1458,6 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Merk: Ved å sette disse til 0 (null) fjernes begrensningen.'; $strZip = 'Komprimert (zip)'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index e6426dd13..2244dcfcd 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1512,4 +1512,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 219548b80..e11bf3337 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1454,4 +1454,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index c5b5dfbc8..b21d273c6 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1487,4 +1487,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 4f771b200..1dfc273f9 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1467,4 +1467,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index d4c43e445..e13a5bb1a 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -493,6 +493,8 @@ $strMysqlLibDiffersServerVersion = 'Версия клиентской библи $strMySQLSaid = 'Ответ MySQL: '; $strMySQLShowProcess = 'Список процессов'; +$strNavTableFilter = 'Фильтр'; +$strNavTableFilterReset = 'Сбросить фильтр'; $strName = 'Имя'; $strNext = 'Следующий'; $strNoActivity = 'Отсутствие активности более %s секунд, пожалуйста, авторизуйтесь заново'; diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 04b0b0d23..8baacd8dc 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1460,4 +1460,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 83571cc10..bb90ff80d 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1460,4 +1460,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index a4b002da5..287233019 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1463,4 +1463,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 905133a57..655377b81 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1461,4 +1461,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 04edd3d0c..9f324b0f7 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1480,4 +1480,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 66490ca4d..f52f1c9b6 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1458,4 +1458,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 098bc88f5..43ef82cda 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1458,4 +1458,6 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Anm: Genom att sätta dessa alternativ till 0 (noll) tas begränsningarna bort.'; $strZip = '"zippad"'; +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 3e04821f9..599439393 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1471,4 +1471,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index e50b463d9..ea8bc8520 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1482,4 +1482,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 4191f1c1c..9bef3b20e 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1464,4 +1464,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 01ec3fbd7..ee48b8295 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1480,4 +1480,6 @@ $strReplicationStatus = 'Replication status'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate +$strNavTableFilter = 'Filter'; //to translate +$strNavTableFilterReset = 'Reset filter'; //to translate ?> diff --git a/navigation.php b/navigation.php index de6ada7f7..2e4fa84b9 100644 --- a/navigation.php +++ b/navigation.php @@ -14,6 +14,8 @@ * @uses $GLOBALS['text_dir'] * @uses $GLOBALS['charset'] * @uses $GLOBALS['pmaThemeImage'] + * @uses $GLOBALS['strNavTableFilter'] + * @uses $GLOBALS['strNavTableFilterReset'] * @uses $GLOBALS['strNoDatabases'] * @uses $GLOBALS['strDatabase'] * @uses $GLOBALS['strGo'] @@ -296,6 +298,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { echo ' (' . $table_count . ') '; } echo '

'; + if ($table_count) { + echo ''; + } /** * This helps reducing the navi panel size; in the right panel,