Git March 2010

git@phpmyadmin.net

4 participants
212 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, created. RELEASE_3_3_1

by Michal Čihař

The branch, TESTING has been created at 123c3c3656565babbb8cb4442d1e2feb43e6c503 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-257-g58ebfd4

by Marc Delisle

The branch, master has been updated via 58ebfd4591d905958d0fe2f7694bceedecf78f6b (commit) from 684e53236d42f7b1db518601691739b41aac0634 (commit) - Log ----------------------------------------------------------------- commit 58ebfd4591d905958d0fe2f7694bceedecf78f6b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 23 17:08:47 2010 -0400 jquery in subdirectory of js; trying jquery-ui toggle effect ----------------------------------------------------------------------- Summary of changes: db_structure.php | 3 +- js/{jquery.js => jquery/jquery-1.4.2-min.js} | 0 js/jquery/jquery-ui-1.8.custom.min.js | 42 ++++++++++++++++++++++++++ libraries/common.lib.php | 4 ++- sql.php | 3 +- tbl_select.php | 3 +- tbl_structure.php | 3 +- 7 files changed, 53 insertions(+), 5 deletions(-) rename js/{jquery.js => jquery/jquery-1.4.2-min.js} (100%) create mode 100644 js/jquery/jquery-ui-1.8.custom.min.js diff --git a/db_structure.php b/db_structure.php index a4d99cb..f5b5639 100644 --- a/db_structure.php +++ b/db_structure.php @@ -12,7 +12,8 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'jquery.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** * Prepares the tables list if the user where not redirected to this script diff --git a/js/jquery.js b/js/jquery/jquery-1.4.2-min.js similarity index 100% rename from js/jquery.js rename to js/jquery/jquery-1.4.2-min.js diff --git a/js/jquery/jquery-ui-1.8.custom.min.js b/js/jquery/jquery-ui-1.8.custom.min.js new file mode 100644 index 0000000..71d28f5 --- /dev/null +++ b/js/jquery/jquery-ui-1.8.custom.min.js @@ -0,0 +1,42 @@ +/* + * jQuery UI Effects 1.8 + * + * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Effects/ + */ jQuery.effects||(function(g){g.effects={};g.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(l,k){g.fx.step[k]=function(m){if(!m.colorInit){m.start=j(m.elem,k);m.end=i(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt((m.pos*(m.end[0]-m.start[0]))+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt((m.pos*(m.end[1]-m.start[1]))+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt((m.pos*(m.end[2]-m.start[2]))+m.start[2],10),255),0)+")"}});function i(l){var k;if(l&&l.constructor==Array&&l.length==3){return l}if(k=/rgb$\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*$/.exec(l)){return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)]}if(k=/rgb$\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*$/.exec(l)){return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55]}if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(l)){return[parseInt(k[1],16),parseInt(k[2],16),parseInt(k[3],16)]}if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(l)){return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)]}if(k=/rgba$0, 0, 0, 0$/.exec(l)){return a.transparent}return a[g.trim(l).toLowerCase()]}function j(m,k){var l;do{l=g.curCSS(m,k);if(l!=""&&l!="transparent"||g.nodeName(m,"body")){break}k="backgroundColor"}while(m=m.parentNode);return i(l)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211] ghtpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};var e=["add","remove","toggle"],c={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};function f(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,o={},l,m;if(n&&n.length&&n[0]&&n[n[0]]){var k=n.length;while(k--){l=n[k];if(typeof n[l]=="string"){m=l.replace(/\-(\w)/g,function(p,q){return q.toUpperCase()});o[m]=n[l]}}}else{for(l in n){if(typeof n[l]==="string"){o[l]=n[l]}}}return o}function b(l){var k,m;for(k in l){m=l[k];if(m==null||g.isFunction(m)||k in c||(/scrollbar/).test(k)||(!(/color/i).test(k)&&isNaN(parseFloat(m)))){delete l[k]}}return l}function h(k,m){var n={_:0},l;for(l in m){if(k[l]!=m[l]){n[l]=m[l]}}return n}g.effects.animateClass=function(k,l,n,m){if(g.isFunction(n)){m=n;n=null}return this.each(function(){var r=g(this),o=r.attr("style")||" ",s=b(f.call(this)),q,p=r.attr("className");g.each(e,function(t,u){if(k[u]){r[u+"Class"](k[u])}});q=b(f.call(this));r.attr("className",p);r.animate(h(s,q),l,n,function(){g.each(e,function(t,u){if(k[u]){r[u+"Class"](k[u])}});if(typeof r.attr("style")=="object"){r.attr("style").cssText="";r.attr("style").cssText=o}else{r.attr("style",o)}if(m){m.apply(this,arguments)}})})};g.fn.extend({_addClass:g.fn.addClass,addClass:function(l,k,n,m){return k?g.effects.animateClass.apply(this,[{add:l},k,n,m]):this._addClass(l)},_removeClass:g.fn.removeClass,removeClass:function(l,k,n,m){return k?g.effects.animateClass.apply(this,[{remove:l},k,n,m]):this._removeClass(l)},_toggleClass:g.fn.toggleClass,toggleClass:function(m,l,k,o,n){if(typeof l=="boolean"||l===undefined){if(!k){return this._toggleClass(m,l)}else{return g.effects.animateClass.apply(this,[(l?{add:m}:{remove: ,k,o,n])}}else{return g.effects.animateClass.apply(this,[{toggle:m},l,k,o])}},switchClass:function(k,m,l,o,n){return g.effects.animateClass.apply(this,[{add:m,remove:k},l,o,n])}});g.extend(g.effects,{version:"1.8",save:function(l,m){for(var k=0;k<m.length;k++){if(m[k]!==null){l.data("ec.storage."+m[k],l[0].style[m[k]])}}},restore:function(l,m){for(var k=0;k<m.length;k++){if(m[k]!==null){l.css(m[k],l.data("ec.storage."+m[k]))}}},setMode:function(k,l){if(l=="toggle"){l=k.is(":hidden")?"show":"hide"}return l},getBaseline:function(l,m){var n,k;switch(l[0]){case"top":n=0;break;case"middle":n=0.5;break;case"bottom":n=1;break;default:n=l[0]/m.height}switch(l[1]){case"left":k=0;break;case"center":k=0.5;break;case"right":k=1;break;default:k=l[1]/m.width}return{x:k,y:n}},createWrapper:function(k){if(k.parent().is(".ui-effects-wrapper")){return k.parent()}var l={width:k.outerWidth(true),height:k.outerHeight(true),"float":k.css("float")},m=g("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});k.wrap(m);m=k.parent();if(k.css("position")=="static"){m.css({position:"relative"});k.css({position:"relative"})}else{g.extend(l,{position:k.css("position"),zIndex:k.css("z-index")});g.each(["top","left","bottom","right"],function(n,o){l[o]=k.css(o);if(isNaN(parseInt(l[o],10))){l[o]="auto"}});k.css({position:"relative",top:0,left:0})}return m.css(l).show()},removeWrapper:function(k){if(k.parent().is(".ui-effects-wrapper")){return k.parent().replaceWith(k)}return k},setTransition:function(l,n,k,m){m=m||{};g.each(n,function(p,o){unit=l.cssUnit(o);if(unit[0]>0){m[o]=unit[0]*k+unit[1]}});return m}});function d(l,k,m,n){if(typeof l=="object"){n=k;m=null;k=l;l=k.effect}if(g.isFunction(k)){n=k;m=null;k={}}if(g.isFunction(m)){n=m;m=null}if(typeof k=="number"||g.fx.speeds[k]){n=m;m=k;k={}}k=k||{};m=m||k.duration;m=g.fx.off?0:typeof m=="number"?m:g.fx.speeds[m]||g.fx.speeds._default;n=n||k.complete;return[l,k,m,n]}g.fn.extend({effect:function(n,m,p,q){var l=d.apply(this guments),o={options:l[1],duration:l[2],callback:l[3]},k=g.effects[n];return k&&!g.fx.off?k.call(this,o):this},_show:g.fn.show,show:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]){return this._show.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="show";return this.effect.apply(this,k)}},_hide:g.fn.hide,hide:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]){return this._hide.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:g.fn.toggle,toggle:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]||typeof l=="boolean"||g.isFunction(l)){return this.__toggle.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(k){var l=this.css(k),m=[];g.each(["em","px","%","pt"],function(n,o){if(l.indexOf(o)>0){m=[parseFloat(l),o]}});return m}});g.easing.jswing=g.easing.swing;g.extend(g.easing,{def:"easeOutQuad",swing:function(l,m,k,o,n){return g.easing[g.easing.def](l,m,k,o,n)},easeInQuad:function(l,m,k,o,n){return o*(m/=n)*m+k},easeOutQuad:function(l,m,k,o,n){return -o*(m/=n)*(m-2)+k},easeInOutQuad:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m+k}return -o/2*((--m)*(m-2)-1)+k},easeInCubic:function(l,m,k,o,n){return o*(m/=n)*m*m+k},easeOutCubic:function(l,m,k,o,n){return o*((m=m/n-1)*m*m+1)+k},easeInOutCubic:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m+k}return o/2*((m-=2)*m*m+2)+k},easeInQuart:function(l,m,k,o,n){return o*(m/=n)*m*m*m+k},easeOutQuart:function(l,m,k,o,n){return -o*((m=m/n-1)*m*m*m-1)+k},easeInOutQuart:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m*m+k}return -o/2*((m-=2)*m*m*m-2)+k},easeInQuint:function(l,m,k,o,n){return o*(m/=n)*m*m*m*m+k},easeOutQuint:function(l,m,k,o,n){return o*((m=m/n-1)*m*m*m*m+1)+k},easeInOutQuint:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m*m*m+k}return o/2*((m-=2)*m*m*m*m+2)+k},easeInSine:function(l,m,k,o,n){return -o*Math.cos(m/n*(Math.PI/2))+o+k},easeOutSine:function(l,m,k,o,n){return o*Math.si /n*(Math.PI/2))+k},easeInOutSine:function(l,m,k,o,n){return -o/2*(Math.cos(Math.PI*m/n)-1)+k},easeInExpo:function(l,m,k,o,n){return(m==0)?k:o*Math.pow(2,10*(m/n-1))+k},easeOutExpo:function(l,m,k,o,n){return(m==n)?k+o:o*(-Math.pow(2,-10*m/n)+1)+k},easeInOutExpo:function(l,m,k,o,n){if(m==0){return k}if(m==n){return k+o}if((m/=n/2)<1){return o/2*Math.pow(2,10*(m-1))+k}return o/2*(-Math.pow(2,-10*--m)+2)+k},easeInCirc:function(l,m,k,o,n){return -o*(Math.sqrt(1-(m/=n)*m)-1)+k},easeOutCirc:function(l,m,k,o,n){return o*Math.sqrt(1-(m=m/n-1)*m)+k},easeInOutCirc:function(l,m,k,o,n){if((m/=n/2)<1){return -o/2*(Math.sqrt(1-m*m)-1)+k}return o/2*(Math.sqrt(1-(m-=2)*m)+1)+k},easeInElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r)==1){return k+u}if(!q){q=r*0.3}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}return -(m*Math.pow(2,10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q))+k},easeOutElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r)==1){return k+u}if(!q){q=r*0.3}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}return m*Math.pow(2,-10*n)*Math.sin((n*r-o)*(2*Math.PI)/q)+u+k},easeInOutElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r/2)==2){return k+u}if(!q){q=r*(0.3*1.5)}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}if(n<1){return -0.5*(m*Math.pow(2,10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q))+k}return m*Math.pow(2,-10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q)*0.5+u+k},easeInBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}return p*(m/=o)*m*((n+1)*m-n)+k},easeOutBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}return p*((m=m/o-1)*m*((n+1)*m+n)+1)+k},easeInOutBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}if((m/=o/2)<1){return p/2*(m*m*(((n*=(1.525))+1)*m-n))+k}return p/2*((m-=2)*m*(((n*=(1.525))+1)*m+n)+2)+k},easeInBounce:function(l,m,k,o,n){return o-g.easing.easeOutBounce(l,n-m,0,o,n)+k},easeOutBounce:function(l,m,k,o,n){if((m/=n)<(1/2.7 {return o*(7.5625*m*m)+k}else{if(m<(2/2.75)){return o*(7.5625*(m-=(1.5/2.75))*m+0.75)+k}else{if(m<(2.5/2.75)){return o*(7.5625*(m-=(2.25/2.75))*m+0.9375)+k}else{return o*(7.5625*(m-=(2.625/2.75))*m+0.984375)+k}}}},easeInOutBounce:function(l,m,k,o,n){if(m<n/2){return g.easing.easeInBounce(l,m*2,0,o,n)*0.5+k}return g.easing.easeOutBounce(l,m*2-n,0,o,n)*0.5+o*0.5+k}})})(jQuery);;/* + * jQuery UI Effects Clip 1.8 + * + * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Effects/Clip + * + * Depends: + * jquery.effects.core.js + */ (function(a){a.effects.clip=function(b){return this.queue(function(){var f=a(this),j=["position","top","left","height","width"];var i=a.effects.setMode(f,b.options.mode||"hide");var k=b.options.direction||"vertical";a.effects.save(f,j);f.show();var c=a.effects.createWrapper(f).css({overflow:"hidden"});var e=f[0].tagName=="IMG"?c:f;var g={size:(k=="vertical")?"height":"width",position:(k=="vertical")?"top":"left"};var d=(k=="vertical")?e.height():e.width();if(i=="show"){e.css(g.size,0);e.css(g.position,d/2)}var h={};h[g.size]=i=="show"?d:0;h[g.position]=i=="show"?0:d/2;e.animate(h,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){f.hide()}a.effects.restore(f,j);a.effects.removeWrapper(f);if(b.callback){b.callback.apply(f[0],arguments)}f.dequeue()}})})}})(jQuery);;/* + * jQuery UI Effects Drop 1.8 + * + * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Effects/Drop + * + * Depends: + * jquery.effects.core.js + */ (function(a){a.effects.drop=function(b){return this.queue(function(){var e=a(this),d=["position","top","left","opacity"];var i=a.effects.setMode(e,b.options.mode||"hide");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e);var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true})/2:e.outerWidth({margin:true})/2);if(i=="show"){e.css("opacity",0).css(f,c=="pos"?-j:j)}var g={opacity:i=="show"?1:0};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/* + * jQuery UI Effects Slide 1.8 + * + * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Effects/Slide + * + * Depends: + * jquery.effects.core.js + */ (function(a){a.effects.slide=function(b){return this.queue(function(){var e=a(this),d=["position","top","left"];var i=a.effects.setMode(e,b.options.mode||"show");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e).css({overflow:"hidden"});var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true}):e.outerWidth({margin:true}));if(i=="show"){e.css(f,c=="pos"?-j:j)}var g={};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);; \ No newline at end of file diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f402034..d00b615 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2467,7 +2467,9 @@ function PMA_generate_slider_effect($id, $message) $('<a href="#" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>') .insertBefore('#<?php echo $id; ?>') .click(function() { - $('#<?php echo $id; ?>').slideToggle('normal', function() { + // the callback should be the 4th parameter but + // it only works as the second parameter + $('#<?php echo $id; ?>').toggle('drop', function() { PMA_set_status_label_<?php echo $id; ?>(); }); }); diff --git a/sql.php b/sql.php index 5ff9605..4da90d1 100644 --- a/sql.php +++ b/sql.php @@ -15,7 +15,8 @@ require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; -$GLOBALS['js_include'][] = 'jquery.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** * Defines the url to return to in case of error in a sql statement diff --git a/tbl_select.php b/tbl_select.php index 0f98b1a..874502e 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -19,7 +19,8 @@ require_once './libraries/relation.lib.php'; // foreign keys require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'jquery.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { $titles['Browse'] = diff --git a/tbl_structure.php b/tbl_structure.php index b1bff16..01c12a5 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -14,7 +14,8 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/relation.lib.php'; -$GLOBALS['js_include'][] = 'jquery.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** * handle multiple field commands if required hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-804-g237c009

by Michal Čihař

The branch, gettext has been updated via 237c009be876bb2e7563f76cdae30a6ffa610ef8 (commit) from 2b0cc1d9fc7a344ac2a009549a3eb5e1baed8d0b (commit) - Log ----------------------------------------------------------------- commit 237c009be876bb2e7563f76cdae30a6ffa610ef8 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Mar 23 15:31:55 2010 +0100 Update php-gettext to 1.0.10. We're now using upstream version with no changes. ----------------------------------------------------------------------- Summary of changes: libraries/php-gettext/gettext.inc | 292 ++++++++++++++++++++++++++---------- libraries/php-gettext/gettext.php | 45 +++++-- 2 files changed, 245 insertions(+), 92 deletions(-) mode change 100755 => 100644 libraries/php-gettext/gettext.php mode change 100755 => 100644 libraries/php-gettext/streams.php diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc index 3edd42e..399a0f2 100644 --- a/libraries/php-gettext/gettext.inc +++ b/libraries/php-gettext/gettext.inc @@ -62,6 +62,56 @@ class domain { // Utility functions /** + * Return a list of locales to try for any POSIX-style locale specification. + */ +function get_list_of_locales($locale) { + /* Figure out all possible locale names and start with the most + * specific ones. I.e. for sr_CS.UTF-8@latin, look through all of + * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr. + */ + $locale_names = array(); + $lang = NULL; + $country = NULL; + $charset = NULL; + $modifier = NULL; + if ($locale) { + if (preg_match("/^(?P<lang>[a-z]{2,3})" // language code + ."(?:_(?P<country>[A-Z]{2}))?" // country code + ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?" // charset + ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier + $locale, $matches)) { + + if (isset($matches["lang"])) $lang = $matches["lang"]; + if (isset($matches["country"])) $country = $matches["country"]; + if (isset($matches["charset"])) $charset = $matches["charset"]; + if (isset($matches["modifier"])) $modifier = $matches["modifier"]; + + if ($modifier) { + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset@$modifier"); + array_push($locale_names, "${lang}_$country@$modifier"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset@$modifier"); + array_push($locale_names, "$lang@$modifier"); + } + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset"); + array_push($locale_names, "${lang}_$country"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset"); + array_push($locale_names, $lang); + } + + // If the locale name doesn't match POSIX style, just include it as-is. + if (!in_array($locale, $locale_names)) + array_push($locale_names, $locale); + } + return $locale_names; +} + +/** * Utility function to get a StreamReader for the given text domain. */ function _get_reader($domain=null, $category=5, $enable_cache=true) { @@ -73,46 +123,8 @@ function _get_reader($domain=null, $category=5, $enable_cache=true) { $bound_path = isset($text_domains[$domain]->path) ? $text_domains[$domain]->path : './'; $subpath = $LC_CATEGORIES[$category] ."/$domain.mo"; - /* Figure out all possible locale names and start with the most - specific ones. I.e. for sr_CS.UTF-8@latin, look through all of - sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr. - */ - $locale_names = array(); - if (preg_match("/([a-z]{2,3})" // language code - ."(_([A-Z]{2}))?" // country code - ."(\.([-A-Za-z0-9_]))?" // charset - ."(@([-A-Za-z0-9_]+))?/", // @ modifier - $locale, $matches)) { - if (isset($matches[1])) { - $lang = $matches[1]; - } else { - $lang = NULL; - } - if (isset($matches[3])) { - $country = $matches[3]; - } else { - $country = NULL; - } - if (isset($matches[5])) { - $charset = $matches[5]; - } else { - $charset = NULL; - } - if (isset($matches[7])) { - $modifier = $matches[7]; - } else { - $modifier = NULL; - } - if ($modifier) { - $locale_names = array("${lang}_$country.$charset@$modifier", - "${lang}_$country@$modifier", - "$lang@$modifier"); - } - array_push($locale_names, - "${lang}_$country.$charset", "${lang}_$country", "$lang"); - } - array_push($locale_names, $locale); + $locale_names = get_list_of_locales($locale); $input = null; foreach ($locale_names as $locale) { $full_path = $bound_path . $locale . "/" . $subpath; @@ -143,8 +155,10 @@ function locale_emulation() { /** * Checks if the current locale is supported on this system. */ -function _check_locale() { +function _check_locale_and_function($function=false) { global $EMULATEGETTEXT; + if ($function and !function_exists($function)) + return false; return !$EMULATEGETTEXT; } @@ -172,11 +186,19 @@ function _encode($text) { } - - // Custom implementation of the standard gettext related functions /** + * Returns passed in $locale, or environment variable $LANG if $locale == ''. + */ +function _get_default_locale($locale) { + if ($locale == '') // emulate variable support + return getenv('LANG'); + else + return $locale; +} + +/** * Sets a requested locale, if needed emulates it. */ function _setlocale($category, $locale) { @@ -189,18 +211,21 @@ function _setlocale($category, $locale) { // even if we tried to read locale without setting it first return _setlocale($category, $CURRENTLOCALE); } else { - $ret = 0; - if (function_exists('setlocale')) // I don't know if this ever happens ;) - $ret = setlocale($category, $locale); - if (($ret and $locale == '') or ($ret == $locale)) { - $EMULATEGETTEXT = 0; + if (function_exists('setlocale')) { + $ret = setlocale($category, $locale); + if (($locale == '' and !$ret) or // failed setting it by env + ($locale != '' and $ret != $locale)) { // failed setting it + // Failed setting it according to environment. + $CURRENTLOCALE = _get_default_locale($locale); + $EMULATEGETTEXT = 1; + } else { $CURRENTLOCALE = $ret; + $EMULATEGETTEXT = 0; + } } else { - if ($locale == '') // emulate variable support - $CURRENTLOCALE = getenv('LANG'); - else - $CURRENTLOCALE = $locale; - $EMULATEGETTEXT = 1; + // No function setlocale(), emulate it all. + $CURRENTLOCALE = _get_default_locale($locale); + $EMULATEGETTEXT = 1; } // Allow locale to be changed on the go for one translation domain. global $text_domains, $default_domain; @@ -250,32 +275,21 @@ function _textdomain($domain) { */ function _gettext($msgid) { $l10n = _get_reader(); - //return $l10n->translate($msgid); return _encode($l10n->translate($msgid)); } + /** * Alias for gettext. */ function __($msgid) { return _gettext($msgid); } -/** - * Gettext with context. - */ -function _pgettext($msgctx, $msgid) { - $ret = _gettext($msgctx . "\004" . $msgid); - if (strpos($ret, "\004") !== FALSE) { - return $msgid; - } else { - return $ret; - } -} + /** * Plural version of gettext. */ function _ngettext($single, $plural, $number) { $l10n = _get_reader(); - //return $l10n->ngettext($single, $plural, $number); return _encode($l10n->ngettext($single, $plural, $number)); } @@ -284,15 +298,14 @@ function _ngettext($single, $plural, $number) { */ function _dgettext($domain, $msgid) { $l10n = _get_reader($domain); - //return $l10n->translate($msgid); return _encode($l10n->translate($msgid)); } + /** * Plural version of dgettext. */ function _dngettext($domain, $single, $plural, $number) { $l10n = _get_reader($domain); - //return $l10n->ngettext($single, $plural, $number); return _encode($l10n->ngettext($single, $plural, $number)); } @@ -301,7 +314,6 @@ function _dngettext($domain, $single, $plural, $number) { */ function _dcgettext($domain, $msgid, $category) { $l10n = _get_reader($domain, $category); - //return $l10n->translate($msgid); return _encode($l10n->translate($msgid)); } /** @@ -309,61 +321,159 @@ function _dcgettext($domain, $msgid, $category) { */ function _dcngettext($domain, $single, $plural, $number, $category) { $l10n = _get_reader($domain, $category); - //return $l10n->ngettext($single, $plural, $number); return _encode($l10n->ngettext($single, $plural, $number)); } +/** + * Context version of gettext. + */ +function _pgettext($context, $msgid) { + $l10n = _get_reader(); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Override the current domain in a context gettext call. + */ +function _dpgettext($domain, $context, $msgid) { + $l10n = _get_reader($domain); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Overrides the domain and category for a single context-based lookup. + */ +function _dcpgettext($domain, $context, $msgid, $category) { + $l10n = _get_reader($domain, $category); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Context version of ngettext. + */ +function _npgettext($context, $singular, $plural) { + $l10n = _get_reader(); + return _encode($l10n->npgettext($context, $singular, $plural)); +} + +/** + * Override the current domain in a context ngettext call. + */ +function _dnpgettext($domain, $context, $singular, $plural) { + $l10n = _get_reader($domain); + return _encode($l10n->npgettext($context, $singular, $plural)); +} + +/** + * Overrides the domain and category for a plural context-based lookup. + */ +function _dcnpgettext($domain, $context, $singular, $plural, $category) { + $l10n = _get_reader($domain, $category); + return _encode($l10n->npgettext($context, $singular, $plural)); +} + -// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system. -// Use the standard impl if the current locale is supported, use the custom impl otherwise. +// Wrappers to use if the standard gettext functions are available, +// but the current locale is not supported by the system. +// Use the standard impl if the current locale is supported, use the +// custom impl otherwise. function T_setlocale($category, $locale) { return _setlocale($category, $locale); } function T_bindtextdomain($domain, $path) { - if (_check_locale()) return bindtextdomain($domain, $path); + if (_check_locale_and_function()) return bindtextdomain($domain, $path); else return _bindtextdomain($domain, $path); } function T_bind_textdomain_codeset($domain, $codeset) { // bind_textdomain_codeset is available only in PHP 4.2.0+ - if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset); + if (_check_locale_and_function('bind_textdomain_codeset')) + return bind_textdomain_codeset($domain, $codeset); else return _bind_textdomain_codeset($domain, $codeset); } function T_textdomain($domain) { - if (_check_locale()) return textdomain($domain); + if (_check_locale_and_function()) return textdomain($domain); else return _textdomain($domain); } function T_gettext($msgid) { - if (_check_locale()) return gettext($msgid); + if (_check_locale_and_function()) return gettext($msgid); else return _gettext($msgid); } function T_($msgid) { - if (_check_locale()) return _($msgid); + if (_check_locale_and_function()) return _($msgid); return __($msgid); } function T_ngettext($single, $plural, $number) { - if (_check_locale()) return ngettext($single, $plural, $number); + if (_check_locale_and_function()) + return ngettext($single, $plural, $number); else return _ngettext($single, $plural, $number); } function T_dgettext($domain, $msgid) { - if (_check_locale()) return dgettext($domain, $msgid); + if (_check_locale_and_function()) return dgettext($domain, $msgid); else return _dgettext($domain, $msgid); } function T_dngettext($domain, $single, $plural, $number) { - if (_check_locale()) return dngettext($domain, $single, $plural, $number); + if (_check_locale_and_function()) + return dngettext($domain, $single, $plural, $number); else return _dngettext($domain, $single, $plural, $number); } function T_dcgettext($domain, $msgid, $category) { - if (_check_locale()) return dcgettext($domain, $msgid, $category); + if (_check_locale_and_function()) + return dcgettext($domain, $msgid, $category); else return _dcgettext($domain, $msgid, $category); } function T_dcngettext($domain, $single, $plural, $number, $category) { - if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category); + if (_check_locale_and_function()) + return dcngettext($domain, $single, $plural, $number, $category); else return _dcngettext($domain, $single, $plural, $number, $category); } +function T_pgettext($context, $msgid) { + if (_check_locale_and_function('pgettext')) + return pgettext($context, $msgid); + else + return _pgettext($context, $msgid); +} + +function T_dpgettext($domain, $context, $msgid) { + if (_check_locale_and_function('dpgettext')) + return dpgettext($domain, $context, $msgid); + else + return _dpgettext($domain, $context, $msgid); +} + +function T_dcpgettext($domain, $context, $msgid, $category) { + if (_check_locale_and_function('dcpgettext')) + return dcpgettext($domain, $context, $msgid, $category); + else + return _dcpgettext($domain, $context, $msgid, $category); +} + +function T_npgettext($context, $singular, $plural) { + if (_check_locale_and_function('npgettext')) + return npgettext($context, $single, $plural, $number); + else + return _npgettext($context, $single, $plural, $number); +} + +function T_dnpgettext($domain, $context, $singular, $plural) { + if (_check_locale_and_function('dnpgettext')) + return dnpgettext($domain, $context, $single, $plural, $number); + else + return _dnpgettext($domain, $context, $single, $plural, $number); +} + +function T_dcnpgettext($domain, $context, $singular, $plural, $category) { + if (_check_locale_and_function('dcnpgettext')) + return dcnpgettext($domain, $context, $single, + $plural, $number, $category); + else + return _dcnpgettext($domain, $context, $single, + $plural, $number, $category); +} + // Wrappers used as a drop in replacement for the standard gettext functions @@ -399,6 +509,26 @@ if (!function_exists('gettext')) { function dcngettext($domain, $single, $plural, $number, $category) { return _dcngettext($domain, $single, $plural, $number, $category); } + function pgettext($context, $msgid) { + return _pgettext($context, $msgid); + } + function npgettext($context, $single, $plural, $number) { + return _npgettext($context, $single, $plural, $number); + } + function dpgettext($domain, $context, $msgid) { + return _dpgettext($domain, $context, $msgid); + } + function dnpgettext($domain, $context, $single, $plural, $number) { + return _dnpgettext($domain, $context, $single, $plural, $number); + } + function dcpgettext($domain, $context, $msgid, $category) { + return _dcpgettext($domain, $context, $msgid, $category); + } + function dcnpgettext($domain, $context, $single, $plural, + $number, $category) { + return _dcnpgettext($domain, $context, $single, $plural, + $number, $category); + } } ?> diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100755 new mode 100644 index 8865d78..a121f9c --- a/libraries/php-gettext/gettext.php +++ b/libraries/php-gettext/gettext.php @@ -134,7 +134,7 @@ class gettext_reader { * Loads the translation tables from the MO file into the cache * If caching is enabled, also loads all strings into a cache * to speed up translation lookups - * + * * @access private */ function load_tables() { @@ -144,10 +144,14 @@ class gettext_reader { return; /* get original and translations tables */ - $this->STREAM->seekto($this->originals); - $this->table_originals = $this->readintarray($this->total * 2); - $this->STREAM->seekto($this->translations); - $this->table_translations = $this->readintarray($this->total * 2); + if (!is_array($this->table_originals)) { + $this->STREAM->seekto($this->originals); + $this->table_originals = $this->readintarray($this->total * 2); + } + if (!is_array($this->table_translations)) { + $this->STREAM->seekto($this->translations); + $this->table_translations = $this->readintarray($this->total * 2); + } if ($this->enable_cache) { $this->cache_translations = array (); @@ -301,6 +305,20 @@ class gettext_reader { } /** + * Parse full PO header and extract only plural forms line. + * + * @access private + * @return string verbatim plural form header field + */ + function extract_plural_forms_header_from_po_header($header) { + if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) + $expr = $regs[2]; + else + $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; + return $expr; + } + + /** * Get possible plural forms from MO header * * @access private @@ -318,11 +336,7 @@ class gettext_reader { } else { $header = $this->get_translation_string(0); } - if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) - $expr = $regs[1]; - else - $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; - + $expr = $this->extract_plural_forms_header_from_po_header($header); $this->pluralheader = $this->sanitize_plural_expression($expr); } return $this->pluralheader; @@ -370,7 +384,7 @@ class gettext_reader { $select = $this->select_string($number); // this should contains all strings separated by NULLs - $key = $single.chr(0).$plural; + $key = $single . chr(0) . $plural; if ($this->enable_cache) { @@ -393,6 +407,15 @@ class gettext_reader { } } + function pgettext($context, $msgid) { + $key = $context . chr(4) . $msgid; + return $this->translate($key); + } + + function npgettext($context, $singular, $plural, $number) { + $singular = $context . chr(4) . $singular; + return $this->ngettext($singular, $plural, $number); + } } ?> diff --git a/libraries/php-gettext/streams.php b/libraries/php-gettext/streams.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-256-g684e532

by Marc Delisle

The branch, master has been updated via 684e53236d42f7b1db518601691739b41aac0634 (commit) via e8d86a5869d45a5e019bf9460d5fb0c9b398216f (commit) from 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) - Log ----------------------------------------------------------------- commit 684e53236d42f7b1db518601691739b41aac0634 Merge: 6035f20e8de66ff46820acf5d5cb51282aecb107 e8d86a5869d45a5e019bf9460d5fb0c9b398216f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 23 12:20:28 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 5f99a8b..9ff5f76 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -51,7 +51,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', + '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-70-ge8d86a5

by Marc Delisle

The branch, QA_3_3 has been updated via e8d86a5869d45a5e019bf9460d5fb0c9b398216f (commit) from 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 5f99a8b..9ff5f76 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -51,7 +51,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', + '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-254-g6035f20

by Michal Čihař

The branch, master has been updated via 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) from ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 081abd2..e7880a9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4348,7 +4348,7 @@ chmod o+rwx tmp </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>git diff > xxx.diff</tt> + <tt>git diff > xxx.diff</tt> </li> <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-803-g2b0cc1d

by Michal Čihař

The branch, gettext has been updated via 2b0cc1d9fc7a344ac2a009549a3eb5e1baed8d0b (commit) via 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) via ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) via 16886bc3fb49d357fb583d7e28c51de99103280a (commit) via 975d4650de7606de6218d5cc4fd97cc7cc825071 (commit) via 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) via e859e311496ae25e1c6de6412084bc336f0798b9 (commit) via cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit) from 853fee7ec595c360a1c1d8960bd69a9b926763d4 (commit) - Log ----------------------------------------------------------------- commit 2b0cc1d9fc7a344ac2a009549a3eb5e1baed8d0b Merge: 853fee7ec595c360a1c1d8960bd69a9b926763d4 6035f20e8de66ff46820acf5d5cb51282aecb107 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Mar 22 23:48:16 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 13 ++++++++----- db_structure.php | 5 +++-- tbl_row_action.php | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ec21d..69a860d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy + rfe #2958013 [import] After import, also list uploaded filename, thanks to Pavel Konnikov and Herman van Rink ++ patch #2974341 [structure] Clicking on table name in db Structure should + Browse the table if possible, thanks to bhdouglass - dougboybhd 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/Documentation.html b/Documentation.html index 4c5157d..e7880a9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4342,20 +4342,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. diff --git a/db_structure.php b/db_structure.php index 2111edd..a4d99cb 100644 --- a/db_structure.php +++ b/db_structure.php @@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] > 0) { $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $titles['Browse'] . '</a>'; $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>'; + $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>'; } else { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; + $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>'; } if (! $db_is_information_schema) { @@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) { <input type="checkbox" name="selected_tbl[]" value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>" id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td> - <th><label for="checkbox_tbl_<?php echo $i; ?>" - title="<?php echo $alias; ?>" style="<?php echo $ignored ? ' ignored' : ''; ?>"><?php echo $truename; ?></label> + <th><?php echo $browse_table_label; ?> <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?> </th> <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16" alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16" alt="REPLICATED" />' : ''; ?></td><?php } ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d5..efcc74d 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete'; hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-69-g6810e56

by Michal Čihař

The branch, QA_3_3 has been updated via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) from 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index eaf3a2e..486af10 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4332,7 +4332,7 @@ chmod o+rwx tmp </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>git diff > xxx.diff</tt> + <tt>git diff > xxx.diff</tt> </li> <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-252-gceb7427

by Marc Delisle

The branch, master has been updated via ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) from 16886bc3fb49d357fb583d7e28c51de99103280a (commit) - Log ----------------------------------------------------------------- commit ceb7427eba44a565de39599807d6a78ae7245fb8 Merge: 16886bc3fb49d357fb583d7e28c51de99103280a 82905fa361f54701226cc580e3dc2561e4427ca4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Mar 22 18:06:30 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4c5157d..081abd2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4342,20 +4342,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. hooks/post-receive -- phpMyAdmin

14 years, 4 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-68-g82905fa

by Marc Delisle

The branch, QA_3_3 has been updated via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) from 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6656c0e..eaf3a2e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4326,20 +4326,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. hooks/post-receive -- phpMyAdmin

14 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2010