The branch, master has been updated
via 92008fc9b1677fada4c41bc89dc5a29e6f584684 (commit)
via 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa (commit)
from d33594fcb96520b9d9bf0be672d3b48ab72d9146 (commit)
- Log -----------------------------------------------------------------
commit 92008fc9b1677fada4c41bc89dc5a29e6f584684
Author: Marc Delisle <[email protected]>
Date: Wed Dec 15 13:26:33 2010 -0500
Avoid recreating a jQuery object
Remove tab characters
commit 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa
Author: dylfin <[email protected]>
Date: Wed Dec 15 13:16:28 2010 -0500
Fix clear button
Script was adapted to use jquery
Fix input box for all browsers
-----------------------------------------------------------------------
Summary of changes:
js/navigation.js | 36 ++++++------------------
navigation.php | 2 +-
themes/darkblue_orange/css/theme_right.css.php | 10 ++++--
themes/original/css/theme_left.css.php | 10 ++++--
4 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/js/navigation.js b/js/navigation.js
index 280117f..ed6dcb1 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -141,36 +141,18 @@ function PMA_setCookie(name, value, expires, path,
domain, secure) {
/**
* hide all LI elements with second A tag which doesn`t contain requested value
*
- * @param string value 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;
+ $("#subel0 a[class!='tableicon']").each(function(idx,elem){
+ $elem = $(elem);
+ if (value && $elem.html().indexOf(value) == -1) {
+ $elem.parent().hide();
+ } else {
+ $elem.parent().show();
+ }
+ });
}
/**
diff --git a/navigation.php b/navigation.php
index d312a0c..fdb6502 100644
--- a/navigation.php
+++ b/navigation.php
@@ -289,8 +289,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] &&
strlen($GLOBALS['db'])) {
if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) {
?>
<span id="NavFilter">
- <input type="text" name="fast_filter" id="fast_filter" title="<?php
echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" />
<span id="clear_fast_filter" title="<?php echo __('Clear');
?>">X</span>
+ <input type="text" name="fast_filter" id="fast_filter"
title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by
name'); ?>" />
</span>
<?php
}
diff --git a/themes/darkblue_orange/css/theme_right.css.php
b/themes/darkblue_orange/css/theme_right.css.php
index e36f770..438e04d 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1402,14 +1402,16 @@ table#serverconnection_trg_local {
color: black;
cursor: pointer;
padding: 0;
- margin: 0;
+ margin: 3px 5px 0 -23px;
position: relative;
- right: 3ex;
+ float: right;
}
#fast_filter {
- width: 85%;
- padding: 0.1em;
+ width: 100%;
+ padding:2px 0px;
+ margin:0;
+ border:0;
}
/**
* Validation error message styles
diff --git a/themes/original/css/theme_left.css.php
b/themes/original/css/theme_left.css.php
index 0fcaf21..9bb3c39 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -247,12 +247,14 @@ div#left_tableList ul ul {
color: black;
cursor: pointer;
padding: 0;
- margin: 0;
+ margin: 3px 5px 0 -23px;
position: relative;
- right: 3ex;
+ float: right;
}
#fast_filter {
- width: 85%;
- padding: 0.1em;
+ width: 100%;
+ padding:2px 0px;
+ margin:0;
+ border:0;
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
