31 Mar
2010
31 Mar
'10
9:43 a.m.
The branch, master has been updated
via 43afb034ee33c20d12b0ada65b11e2dc43b51a02 (commit)
via 58c33c410e2699484d6183b3fb0318d108cebd8d (commit)
from 251403e61741b961bc73a4edbe11b2e055dd19ef (commit)
- Log -----------------------------------------------------------------
commit 43afb034ee33c20d12b0ada65b11e2dc43b51a02
Merge: 251403e61741b961bc73a4edbe11b2e055dd19ef 58c33c410e2699484d6183b3fb0318d108cebd8d
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Mar 31 14:43:10 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
navigation.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/navigation.php b/navigation.php
index cb031ed..8fcc7ab 100644
--- a/navigation.php
+++ b/navigation.php
@@ -314,7 +314,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] &&
strlen($GLOBALS['db'])) {
}
echo '</a></p>';
if ($table_count) {
- echo '<span id=\'NavFilter\'
style="display:none;"><span
onclick="document.getElementById(\'fast_filter\').value=\'\';
fast_filter(\'\');document.getElementById(\'fast_filter\').focus();"
style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0
-20px;position:relative;float:right;" title="' . $strReset .
'">X</span><input type="text" name="fast_filter"
id="fast_filter" title="' . $strNavTableFilter . '"
onkeyup="setTimeout(function(word){ return function(){
fast_filter(word);}}(this.value),1000);" style="width:100%;padding:0 -20px 0 0;
padding:2px;" onfocus="this.select();" /></span><script
type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>';
+ echo '<span id=\'NavFilter\'
style="display:none;"><span
onclick="document.getElementById(\'fast_filter\').value=\'\';
fast_filter(\'\');document.getElementById(\'fast_filter\').focus();"
style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0
-20px;position:relative;float:right;" title="' . $strReset .
'">X</span><input type="text" name="fast_filter"
id="fast_filter" title="' . $strNavTableFilter . '"
onkeyup="setTimeout(function(word){ return function(){
fast_filter(word);}}(this.value),1000);" style="width:90%;padding:0 -20px 0 0;
padding:2px;" onfocus="this.select();" /></span><script
type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>';
}
/**
hooks/post-receive
--
phpMyAdmin