diff options
78 files changed, 1024 insertions, 1576 deletions
@@ -12,3 +12,6 @@ nbproject pip-log.txt *.zip tmp/* +load +run +forum/skins/default/media/js/flot diff --git a/forum/models/__init__.py b/forum/models/__init__.py index d144982d..2349c9e3 100755 --- a/forum/models/__init__.py +++ b/forum/models/__init__.py @@ -127,6 +127,8 @@ def toggle_favorite_question(self, question, timestamp=None, cancel=False): fave.delete() result = False except FavoriteQuestion.DoesNotExist: + if timestamp is None: + timestamp = datetime.datetime.now() fave = FavoriteQuestion( question = question, user = self, @@ -221,7 +223,6 @@ def flag_post(self, post, timestamp=None, cancel=False): ) auth.onFlaggedItem(flag, post, user, timestamp=timestamp) -User.add_to_class('toggle_favorite_question', toggle_favorite_question) User.add_to_class('upvote', upvote) User.add_to_class('downvote', downvote) User.add_to_class('accept_answer', accept_answer) @@ -230,6 +231,7 @@ User.add_to_class('get_profile_url', get_profile_url) User.add_to_class('get_profile_link', get_profile_link) User.add_to_class('get_messages', get_messages) User.add_to_class('delete_messages', delete_messages) +User.add_to_class('toggle_favorite_question', toggle_favorite_question) def calculate_gravatar_hash(instance, **kwargs): """Calculates a User's gravatar hash from their email address.""" diff --git a/forum/skins/default/media/js/com.cnprog.admin.js b/forum/skins/default/media/js/com.cnprog.admin.js index 39dff48c..39dff48c 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.admin.js +++ b/forum/skins/default/media/js/com.cnprog.admin.js diff --git a/forum/skins/default/media/js/com.cnprog.editor.js b/forum/skins/default/media/js/com.cnprog.editor.js index 18cc5166..18cc5166 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.editor.js +++ b/forum/skins/default/media/js/com.cnprog.editor.js diff --git a/forum/skins/default/media/js/com.cnprog.i18n.js b/forum/skins/default/media/js/com.cnprog.i18n.js index da9bf396..da9bf396 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.i18n.js +++ b/forum/skins/default/media/js/com.cnprog.i18n.js diff --git a/forum/skins/default/media/js/com.cnprog.post.js b/forum/skins/default/media/js/com.cnprog.post.js index 4325e665..4325e665 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.post.js +++ b/forum/skins/default/media/js/com.cnprog.post.js diff --git a/forum/skins/default/media/js/com.cnprog.tag_selector.js b/forum/skins/default/media/js/com.cnprog.tag_selector.js index e3279e65..e3279e65 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.tag_selector.js +++ b/forum/skins/default/media/js/com.cnprog.tag_selector.js diff --git a/forum/skins/default/media/js/com.cnprog.utils.js b/forum/skins/default/media/js/com.cnprog.utils.js index 3b816ed7..3b816ed7 100755..100644 --- a/forum/skins/default/media/js/com.cnprog.utils.js +++ b/forum/skins/default/media/js/com.cnprog.utils.js diff --git a/forum/skins/default/media/js/excanvas.min.js b/forum/skins/default/media/js/excanvas.min.js new file mode 100644 index 00000000..12c74f7b --- /dev/null +++ b/forum/skins/default/media/js/excanvas.min.js @@ -0,0 +1 @@ +if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z<j.length;Z++){this.initElement(j[Z])}},initElement:function(i){if(!i.getContext){i.getContext=T;r(i.ownerDocument);i.innerHTML="";i.attachEvent("onpropertychange",S);i.attachEvent("onresize",w);var Z=i.attributes;if(Z.width&&Z.width.specified){i.style.width=Z.width.nodeValue+"px"}else{i.width=i.clientWidth}if(Z.height&&Z.height.specified){i.style.height=Z.height.nodeValue+"px"}else{i.height=i.clientHeight}}return i}};function S(i){var Z=i.srcElement;switch(i.propertyName){case"width":Z.getContext().clearRect();Z.style.width=Z.attributes.width.nodeValue+"px";Z.firstChild.style.width=Z.clientWidth+"px";break;case"height":Z.getContext().clearRect();Z.style.height=Z.attributes.height.nodeValue+"px";Z.firstChild.style.height=Z.clientHeight+"px";break}}function w(i){var Z=i.srcElement;if(Z.firstChild){Z.firstChild.style.width=Z.clientWidth+"px";Z.firstChild.style.height=Z.clientHeight+"px"}}E.init();var I=[];for(var AC=0;AC<16;AC++){for(var AB=0;AB<16;AB++){I[AC*16+AB]=AC.toString(16)+AB.toString(16)}}function V(){return[[1,0,0],[0,1,0],[0,0,1]]}function d(m,j){var i=V();for(var Z=0;Z<3;Z++){for(var AF=0;AF<3;AF++){var p=0;for(var AE=0;AE<3;AE++){p+=m[Z][AE]*j[AE][AF]}i[Z][AF]=p}}return i}function Q(i,Z){Z.fillStyle=i.fillStyle;Z.lineCap=i.lineCap;Z.lineJoin=i.lineJoin;Z.lineWidth=i.lineWidth;Z.miterLimit=i.miterLimit;Z.shadowBlur=i.shadowBlur;Z.shadowColor=i.shadowColor;Z.shadowOffsetX=i.shadowOffsetX;Z.shadowOffsetY=i.shadowOffsetY;Z.strokeStyle=i.strokeStyle;Z.globalAlpha=i.globalAlpha;Z.font=i.font;Z.textAlign=i.textAlign;Z.textBaseline=i.textBaseline;Z.arcScaleX_=i.arcScaleX_;Z.arcScaleY_=i.arcScaleY_;Z.lineScale_=i.lineScale_}var B={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"};function g(i){var m=i.indexOf("(",3);var Z=i.indexOf(")",m+1);var j=i.substring(m+1,Z).split(",");if(j.length==4&&i.substr(3,1)=="a"){alpha=Number(j[3])}else{j[3]=1}return j}function C(Z){return parseFloat(Z)/100}function N(i,j,Z){return Math.min(Z,Math.max(j,i))}function c(AF){var j,i,Z;h=parseFloat(AF[0])/360%360;if(h<0){h++}s=N(C(AF[1]),0,1);l=N(C(AF[2]),0,1);if(s==0){j=i=Z=l}else{var m=l<0.5?l*(1+s):l+s-l*s;var AE=2*l-m;j=A(AE,m,h+1/3);i=A(AE,m,h);Z=A(AE,m,h-1/3)}return"#"+I[Math.floor(j*255)]+I[Math.floor(i*255)]+I[Math.floor(Z*255)]}function A(i,Z,j){if(j<0){j++}if(j>1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" <g_vml_:group",' coordsize="',D*Z,",",D*AE,'"',' coordorigin="0,0"',' style="width:',Z,"px;height:",AE,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var p=[];p.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",K(AW.x/D),",","Dy=",K(AW.y/D),"");var AS=AW;var AR=this.getCoords_(AH+AJ,AF);var AP=this.getCoords_(AH,AF+AV);var AL=this.getCoords_(AH+AJ,AF+AV);AS.x=z.max(AS.x,AR.x,AP.x,AL.x);AS.y=z.max(AS.y,AR.y,AP.y,AL.y);AU.push("padding:0 ",K(AS.x/D),"px ",K(AS.y/D),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",p.join(""),", sizingmethod='clip');")}else{AU.push("top:",K(AW.y/D),"px;left:",K(AW.x/D),"px;")}AU.push(' ">','<g_vml_:image src="',AO.src,'"',' style="width:',D*AJ,"px;"," height:",D*AV,'px"',' cropleft="',AM/AG,'"',' croptop="',AK/AT,'"',' cropright="',(AG-AM-AQ)/AG,'"',' cropbottom="',(AT-AK-AX)/AT,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AH<this.currentPath_.length;AH+=AE){var AK=[];var AF=false;AK.push("<g_vml_:shape",' filled="',!!AM,'"',' style="position:absolute;width:',m,"px;height:",AN,'px;"',' coordorigin="0,0"',' coordsize="',D*m,",",D*AN,'"',' stroked="',!AM,'"',' path="');var AO=false;for(var AI=AH;AI<Math.min(AH+AE,this.currentPath_.length);AI++){if(AI%AE==0&&AI>0){AK.push(" m ",K(this.currentPath_[AI-1].x),",",K(this.currentPath_[AI-1].y))}var Z=this.currentPath_[AI];var AJ;switch(Z.type){case"moveTo":AJ=Z;AK.push(" m ",K(Z.x),",",K(Z.y));break;case"lineTo":AK.push(" l ",K(Z.x),",",K(Z.y));break;case"close":AK.push(" x ");Z=null;break;case"bezierCurveTo":AK.push(" c ",K(Z.cp1x),",",K(Z.cp1y),",",K(Z.cp2x),",",K(Z.cp2y),",",K(Z.x),",",K(Z.y));break;case"at":case"wa":AK.push(" ",Z.type," ",K(Z.x-this.arcScaleX_*Z.radius),",",K(Z.y-this.arcScaleY_*Z.radius)," ",K(Z.x+this.arcScaleX_*Z.radius),",",K(Z.y+this.arcScaleY_*Z.radius)," ",K(Z.xStart),",",K(Z.yStart)," ",K(Z.xEnd),",",K(Z.yEnd));break}if(Z){if(AG.x==null||Z.x<AG.x){AG.x=Z.x}if(AL.x==null||Z.x>AL.x){AL.x=Z.x}if(AG.y==null||Z.y<AG.y){AG.y=Z.y}if(AL.y==null||Z.y>AL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("<g_vml_:stroke",' opacity="',p,'"',' joinstyle="',j.lineJoin,'"',' miterlimit="',j.miterLimit,'"',' endcap="',t(j.lineCap),'"',' weight="',Z,'px"',' color="',m,'" />')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae<AN;Ae++){var AM=AS[Ae];Ab.push(AM.offset*AK+AU+" "+AM.color)}AG.push('<g_vml_:fill type="',AH.type_,'"',' method="none" focus="100%"',' color="',AR,'"',' color2="',AQ,'"',' colors="',Ab.join(","),'"',' opacity="',AV,'"',' g_o_:opacity2="',AW,'"',' angle="',AL,'"',' focusposition="',Ac.x,",",Ac.y,'" />')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("<g_vml_:fill",' position="',AF/Z*AY*AY,",",AZ/m*AX*AX,'"',' type="tile"',' src="',AH.src_,'" />')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('<g_vml_:fill color="',AT,'" opacity="',Ad,'" />')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('<g_vml_:line from="',-i,' 0" to="',AP,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!AG,'" stroked="',!!AG,'" style="position:absolute;width:1px;height:1px;">');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('<g_vml_:skew on="t" matrix="',AL,'" ',' offset="',AJ,'" origin="',i,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',AD(AK),'" style="v-text-align:',p,";font:",AD(j),'" /></g_vml_:line>');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()};
\ No newline at end of file diff --git a/forum/skins/default/media/js/jquery-1.2.6.js b/forum/skins/default/media/js/jquery-1.2.6.js index 88e661ee..88e661ee 100755..100644 --- a/forum/skins/default/media/js/jquery-1.2.6.js +++ b/forum/skins/default/media/js/jquery-1.2.6.js diff --git a/forum/skins/default/media/js/jquery-1.2.6.min.js b/forum/skins/default/media/js/jquery-1.2.6.min.js index 82b98e1d..82b98e1d 100755..100644 --- a/forum/skins/default/media/js/jquery-1.2.6.min.js +++ b/forum/skins/default/media/js/jquery-1.2.6.min.js diff --git a/forum/skins/default/media/js/jquery.ajaxfileupload.js b/forum/skins/default/media/js/jquery.ajaxfileupload.js index 75292776..75292776 100755..100644 --- a/forum/skins/default/media/js/jquery.ajaxfileupload.js +++ b/forum/skins/default/media/js/jquery.ajaxfileupload.js diff --git a/forum/skins/default/media/js/jquery.flot.js b/forum/skins/default/media/js/jquery.flot.js index 83b61929..6534a468 100755..100644 --- a/forum/skins/default/media/js/jquery.flot.js +++ b/forum/skins/default/media/js/jquery.flot.js @@ -1,15 +1,39 @@ -/* Javascript plotting library for jQuery, v. 0.5. +/* Javascript plotting library for jQuery, v. 0.6. * * Released under the MIT license by IOLA, December 2007. * */ +// first an inline dependency, jquery.colorhelpers.js, we inline it here +// for convenience + +/* Plugin for jQuery for working with colors. + * + * Version 1.0. + * + * Inspiration from jQuery color animation plugin by John Resig. + * + * Released under the MIT license by Ole Laursen, October 2009. + * + * Examples: + * + * $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString() + * var c = $.color.extract($("#mydiv"), 'background-color'); + * console.log(c.r, c.g, c.b, c.a); + * $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)" + * + * Note that .scale() and .add() work in-place instead of returning + * new objects. + */ +(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};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],lightpink:[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]}})(); + +// the actual Flot code (function($) { - function Plot(target_, data_, options_) { + function Plot(placeholder, data_, options_, plugins) { // data is on the form: // [ series1, series2 ... ] // where series is either just the data as [ [x1, y1], [x2, y2], ... ] - // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label" } + // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... } var series = [], options = { @@ -28,6 +52,8 @@ }, xaxis: { mode: null, // null or "time" + transform: null, // null or f: number -> number to transform axis + inverseTransform: null, // if transform is set, this should be the inverse function min: null, // min. value to show, null means set automatically max: null, // max. value to show, null means set automatically autoscaleMargin: null, // margin in % to add if auto-setting min/max @@ -41,7 +67,8 @@ tickSize: null, // number or [number, "unit"] minTickSize: null, // number or [number, "unit"] monthNames: null, // list of names of months - timeformat: null // format string to use + timeformat: null, // format string to use + twelveHourClock: false // 12 or 24 time in time mode }, yaxis: { autoscaleMargin: 0.02 @@ -51,36 +78,40 @@ }, y2axis: { autoscaleMargin: 0.02 - }, - points: { - show: false, - radius: 3, - lineWidth: 2, // in pixels - fill: true, - fillColor: "#ffffff" - }, - lines: { - // we don't put in show: false so we can see - // whether lines were actively disabled - lineWidth: 2, // in pixels - fill: false, - fillColor: null, - steps: false }, - bars: { - show: false, - lineWidth: 2, // in pixels - barWidth: 1, // in units of the x axis - fill: true, - fillColor: null, - align: "left", // or "center" - horizontal: false // when horizontal, left is now top + series: { + points: { + show: false, + radius: 3, + lineWidth: 2, // in pixels + fill: true, + fillColor: "#ffffff" + }, + lines: { + // we don't put in show: false so we can see + // whether lines were actively disabled + lineWidth: 2, // in pixels + fill: false, + fillColor: null, + steps: false + }, + bars: { + show: false, + lineWidth: 2, // in pixels + barWidth: 1, // in units of the x axis + fill: true, + fillColor: null, + align: "left", // or "center" + horizontal: false // when horizontal, left is now top + }, + shadowSize: 3 }, - threshold: null, // or { below: number, color: color spec} grid: { + show: true, + aboveData: false, color: "#545454", // primary color used for outline and labels backgroundColor: null, // null for transparent, else color - tickColor: "#dddddd", // color used for the ticks + tickColor: "rgba(0,0,0,0.15)", // color used for the ticks labelMargin: 5, // in pixels borderWidth: 2, // in pixels borderColor: null, // set if different from the grid color @@ -93,53 +124,112 @@ autoHighlight: true, // highlight in case mouse is near mouseActiveRadius: 10 // how far the mouse can be away to activate an item }, - selection: { - mode: null, // one of null, "x", "y" or "xy" - color: "#e8cfac" - }, - crosshair: { - mode: null, // one of null, "x", "y" or "xy", - color: "#aa0000" - }, - shadowSize: 3 + hooks: {} }, canvas = null, // the canvas for the plot itself overlay = null, // canvas for interactive stuff on top of plot eventHolder = null, // jQuery object that events should be bound to ctx = null, octx = null, - target = $(target_), axes = { xaxis: {}, yaxis: {}, x2axis: {}, y2axis: {} }, plotOffset = { left: 0, right: 0, top: 0, bottom: 0}, canvasWidth = 0, canvasHeight = 0, plotWidth = 0, plotHeight = 0, - // dedicated to storing data for buggy standard compliance cases - workarounds = {}; + hooks = { + processOptions: [], + processRawData: [], + processDatapoints: [], + draw: [], + bindEvents: [], + drawOverlay: [] + }, + plot = this; + + // public functions + plot.setData = setData; + plot.setupGrid = setupGrid; + plot.draw = draw; + plot.getPlaceholder = function() { return placeholder; }; + plot.getCanvas = function() { return canvas; }; + plot.getPlotOffset = function() { return plotOffset; }; + plot.width = function () { return plotWidth; }; + plot.height = function () { return plotHeight; }; + plot.offset = function () { + var o = eventHolder.offset(); + o.left += plotOffset.left; + o.top += plotOffset.top; + return o; + }; + plot.getData = function() { return series; }; + plot.getAxes = function() { return axes; }; + plot.getOptions = function() { return options; }; + plot.highlight = highlight; + plot.unhighlight = unhighlight; + plot.triggerRedrawOverlay = triggerRedrawOverlay; + plot.pointOffset = function(point) { + return { left: parseInt(axisSpecToRealAxis(point, "xaxis").p2c(+point.x) + plotOffset.left), + top: parseInt(axisSpecToRealAxis(point, "yaxis").p2c(+point.y) + plotOffset.top) }; + }; - this.setData = setData; - this.setupGrid = setupGrid; - this.draw = draw; - this.clearSelection = clearSelection; - this.setSelection = setSelection; - this.getCanvas = function() { return canvas; }; - this.getPlotOffset = function() { return plotOffset; }; - this.getData = function() { return series; }; - this.getAxes = function() { return axes; }; - this.setCrosshair = setCrosshair; - this.clearCrosshair = function () { setCrosshair(null); }; - this.highlight = highlight; - this.unhighlight = unhighlight; + + // public attributes + plot.hooks = hooks; // initialize + initPlugins(plot); parseOptions(options_); - setData(data_); constructCanvas(); + setData(data_); setupGrid(); draw(); + bindEvents(); + + function executeHooks(hook, args) { + args = [plot].concat(args); + for (var i = 0; i < hook.length; ++i) + hook[i].apply(this, args); + } + + function initPlugins() { + for (var i = 0; i < plugins.length; ++i) { + var p = plugins[i]; + p.init(plot); + if (p.options) + $.extend(true, options, p.options); + } + } + + function parseOptions(opts) { + $.extend(true, options, opts); + if (options.grid.borderColor == null) + options.grid.borderColor = options.grid.color; + // backwards compatibility, to be removed in future + if (options.xaxis.noTicks && options.xaxis.ticks == null) + options.xaxis.ticks = options.xaxis.noTicks; + if (options.yaxis.noTicks && options.yaxis.ticks == null) + options.yaxis.ticks = options.yaxis.noTicks; + if (options.grid.coloredAreas) + options.grid.markings = options.grid.coloredAreas; + if (options.grid.coloredAreasColor) + options.grid.markingsColor = options.grid.coloredAreasColor; + if (options.lines) + $.extend(true, options.series.lines, options.lines); + if (options.points) + $.extend(true, options.series.points, options.points); + if (options.bars) + $.extend(true, options.series.bars, options.bars); + if (options.shadowSize) + options.series.shadowSize = options.shadowSize; + + for (var n in hooks) + if (options.hooks[n] && options.hooks[n].length) + hooks[n] = hooks[n].concat(options.hooks[n]); + + executeHooks(hooks.processOptions, [options]); + } function setData(d) { series = parseData(d); - fillInSeriesOptions(); processData(); } @@ -147,36 +237,33 @@ function parseData(d) { var res = []; for (var i = 0; i < d.length; ++i) { - var s; + var s = $.extend(true, {}, options.series); + if (d[i].data) { - s = {}; - for (var v in d[i]) - s[v] = d[i][v]; - } - else { - s = { data: d[i] }; + s.data = d[i].data; // move the data instead of deep-copy + delete d[i].data; + + $.extend(true, s, d[i]); + + d[i].data = s.data; } + else + s.data = d[i]; res.push(s); } return res; } - function parseOptions(o) { - $.extend(true, options, o); - if (options.grid.borderColor == null) - options.grid.borderColor = options.grid.color - // backwards compatibility, to be removed in future - if (options.xaxis.noTicks && options.xaxis.ticks == null) - options.xaxis.ticks = options.xaxis.noTicks; - if (options.yaxis.noTicks && options.yaxis.ticks == null) - options.yaxis.ticks = options.yaxis.noTicks; - if (options.grid.coloredAreas) - options.grid.markings = options.grid.coloredAreas; - if (options.grid.coloredAreasColor) - options.grid.markingsColor = options.grid.coloredAreasColor; + function axisSpecToRealAxis(obj, attr) { + var a = obj[attr]; + if (!a || a == 1) + return axes[attr]; + if (typeof a == "number") + return axes[attr.charAt(0) + a + attr.slice(1)]; + return a; // assume it's OK } - + function fillInSeriesOptions() { var i; @@ -191,7 +278,7 @@ if (typeof sc == "number") assignedColors.push(sc); else - usedColors.push(parseColor(series[i].color)); + usedColors.push($.color.parse(series[i].color)); } } @@ -207,14 +294,13 @@ while (colors.length < neededColors) { var c; if (options.colors.length == i) // check degenerate case - c = new Color(100, 100, 100); + c = $.color.make(100, 100, 100); else - c = parseColor(options.colors[i]); + c = $.color.parse(options.colors[i]); // vary color if needed var sign = variation % 2 == 1 ? -1 : 1; - var factor = 1 + sign * Math.ceil(variation / 2) * 0.2; - c.scale(factor, factor, factor); + c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2) // FIXME: if we're getting to close to something else, // we should probably skip this one @@ -231,7 +317,7 @@ var colori = 0, s; for (i = 0; i < series.length; ++i) { s = series[i]; - + // assign colors if (s.color == null) { s.color = colors[colori].toString(); @@ -240,121 +326,190 @@ else if (typeof s.color == "number") s.color = colors[s.color].toString(); - // copy the rest - s.lines = $.extend(true, {}, options.lines, s.lines); - s.points = $.extend(true, {}, options.points, s.points); - s.bars = $.extend(true, {}, options.bars, s.bars); - // turn on lines automatically in case nothing is set - if (s.lines.show == null && !s.bars.show && !s.points.show) - s.lines.show = true; - if (s.shadowSize == null) - s.shadowSize = options.shadowSize; - - if (!s.xaxis) - s.xaxis = axes.xaxis; - - if (s.xaxis == 1) - s.xaxis = axes.xaxis; - else if (s.xaxis == 2) - s.xaxis = axes.x2axis; - - if (!s.yaxis) - s.yaxis = axes.yaxis; - - if (s.yaxis == 1) - s.yaxis = axes.yaxis; - else if (s.yaxis == 2) - s.yaxis = axes.y2axis; + if (s.lines.show == null) { + var v, show = true; + for (v in s) + if (s[v].show) { + show = false; + break; + } + if (show) + s.lines.show = true; + } - if (!s.threshold) - s.threshold = options.threshold; - s.subseries = null; + // setup axes + s.xaxis = axisSpecToRealAxis(s, "xaxis"); + s.yaxis = axisSpecToRealAxis(s, "yaxis"); } } function processData() { var topSentry = Number.POSITIVE_INFINITY, bottomSentry = Number.NEGATIVE_INFINITY, - axis, i, j, k, m, s; + i, j, k, m, length, + s, points, ps, x, y, axis, val, f, p; for (axis in axes) { axes[axis].datamin = topSentry; axes[axis].datamax = bottomSentry; - axes[axis].min = options[axis].min; - axes[axis].max = options[axis].max; axes[axis].used = false; } - + + function updateAxis(axis, min, max) { + if (min < axis.datamin) + axis.datamin = min; + if (max > axis.datamax) + axis.datamax = max; + } + for (i = 0; i < series.length; ++i) { s = series[i]; - s.datapoints = { points: [], incr: 2 }; + s.datapoints = { points: [] }; - var data = s.data, - points = s.datapoints.points, - axisx = s.xaxis, axisy = s.yaxis, - xmin = topSentry, xmax = bottomSentry, - ymin = topSentry, ymax = bottomSentry, - x, y, p, incr, format = []; + executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]); + } + + // first pass: clean and copy data + for (i = 0; i < series.length; ++i) { + s = series[i]; - // determine the increment - if (s.bars.show) { - s.datapoints.incr = 3; - format.push({ d: 0 }); + var data = s.data, format = s.datapoints.format; + + if (!format) { + format = []; + // find out how to copy + format.push({ x: true, number: true, required: true }); + format.push({ y: true, number: true, required: true }); + + if (s.bars.show) + format.push({ y: true, number: true, required: false, defaultValue: 0 }); + + s.datapoints.format = format; } - /* - // examine data to find out how to copy - for (j = 0; j < data.length; ++j) { - }*/ - + if (s.datapoints.pointsize != null) + continue; // already filled in + + if (s.datapoints.pointsize == null) + s.datapoints.pointsize = format.length; - axisx.used = axisy.used = true; - incr = s.datapoints.incr; + ps = s.datapoints.pointsize; + points = s.datapoints.points; + + insertSteps = s.lines.show && s.lines.steps; + s.xaxis.used = s.yaxis.used = true; - for (j = k = 0; j < data.length; ++j, k += incr) { + for (j = k = 0; j < data.length; ++j, k += ps) { p = data[j]; - x = null; - y = null; - if (data[j] != null) { - x = p[0]; - y = p[1]; + var nullify = p == null; + if (!nullify) { + for (m = 0; m < ps; ++m) { + val = p[m]; + f = format[m]; + + if (f) { + if (f.number && val != null) { + val = +val; // convert to number + if (isNaN(val)) + val = null; + } + + if (val == null) { + if (f.required) + nullify = true; + + if (f.defaultValue != null) + val = f.defaultValue; + } + } + + points[k + m] = val; + } } - // convert to number - if (x != null && !isNaN(x = +x)) { - if (x < xmin) - xmin = x; - if (x > xmax) - xmax = x + if (nullify) { + for (m = 0; m < ps; ++m) { + val = points[k + m]; + if (val != null) { + f = format[m]; + // extract min/max info + if (f.x) + updateAxis(s.xaxis, val, val); + if (f.y) + updateAxis(s.yaxis, val, val); + } + points[k + m] = null; + } } - else - x = null; - - if (y != null && !isNaN(y = +y)) { - if (y < ymin) - ymin = y; - if (y > ymax) - ymax = y; + else { + // a little bit of line specific stuff that + // perhaps shouldn't be here, but lacking + // better means... + if (insertSteps && k > 0 + && points[k - ps] != null + && points[k - ps] != points[k] + && points[k - ps + 1] != points[k + 1]) { + // copy the point to make room for a middle point + for (m = 0; m < ps; ++m) + points[k + ps + m] = points[k + m]; + + // middle point has same y + points[k + 1] = points[k - ps + 1]; + + // we've added a point, better reflect that + k += ps; + } } - else - y = null; + } + } - if (x == null || y == null) - x = y = null; // make sure everything is cleared + // give the hooks a chance to run + for (i = 0; i < series.length; ++i) { + s = series[i]; + + executeHooks(hooks.processDatapoints, [ s, s.datapoints]); + } - for (m = 2; m < incr; ++m) - points[k + m] = p[m] == null ? format[m-2].d : p[m]; + // second pass: find datamax/datamin for auto-scaling + for (i = 0; i < series.length; ++i) { + s = series[i]; + points = s.datapoints.points, + ps = s.datapoints.pointsize; - points[k + 1] = y; - points[k] = x; - } + var xmin = topSentry, ymin = topSentry, + xmax = bottomSentry, ymax = bottomSentry; + + for (j = 0; j < points.length; j += ps) { + if (points[j] == null) + continue; + for (m = 0; m < ps; ++m) { + val = points[j + m]; + f = format[m]; + if (!f) + continue; + + if (f.x) { + if (val < xmin) + xmin = val; + if (val > xmax) + xmax = val; + } + if (f.y) { + if (val < ymin) + ymin = val; + if (val > ymax) + ymax = val; + } + } + } + if (s.bars.show) { // make sure we got room for the bar on the dancing floor var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2; - if(s.bars.horizontal) { + if (s.bars.horizontal) { ymin += delta; ymax += delta + s.bars.barWidth; } @@ -364,101 +519,15 @@ } } - axisx.datamin = Math.min(axisx.datamin, xmin); - axisx.datamax = Math.max(axisx.datamax, xmax); - axisy.datamin = Math.min(axisy.datamin, ymin); - axisy.datamax = Math.max(axisy.datamax, ymax); - - - // step charts - if (s.lines.show && s.lines.steps) { - p = []; - // copy, inserting extra points to make steps - for (j = k = 0; j < points.length; j += incr, k += incr) { - x = points[j]; - y = points[j + 1]; - if (j > 0 - && points[j - incr] != null - && x != null - && points[j - incr + 1] != y) { - p[k] = x; - p[k + 1] = points[j - incr + 1]; - k += incr; - } - - p[k] = x; - p[k + 1] = y; - } - s.datapoints.linespoints = p; - } - - // possibly split data points because of threshold - if (s.threshold) { - var orig = $.extend({}, s), thresholded = $.extend({}, s); - orig.datapoints = { points: [], incr: incr }; - thresholded.datapoints = { points: [], incr: incr }; - - thresholded.color = s.threshold.color; - - var below = s.threshold.below, - origpoints = orig.datapoints.points, - threspoints = thresholded.datapoints.points; - - // ordinary points - for (j = 0; j < points.length; j += incr) { - x = points[j]; - y = points[j + 1]; - - if (y < below) - p = threspoints; - else - p = origpoints; - - p.push(x); - p.push(y); - } - - // possibly split lines - if (s.lines.show) { - var lp = s.datapoints.linespoints || points; - - origpoints = []; - threspoints = []; - p = origpoints; - - for (j = 0; j < lp.length; j += incr) { - x = lp[j]; - y = lp[j + 1]; - - var prevp = p; - if (y != null) { - if (y < below) - p = threspoints; - else - p = origpoints; - } - - if (p != prevp && x != null && j > 0 && lp[j - incr] != null) { - // find intersection and add it to both - k = (x - lp[j - incr]) / (y - lp[j - incr + 1]) * (below - y) + x; - prevp.push(k); - prevp.push(below); - p.push(null); // start new segment - p.push(null); - p.push(k); - p.push(below); - } - - p.push(x); - p.push(y); - } - - orig.datapoints.linespoints = origpoints - thresholded.datapoints.linespoints = threspoints; - } + updateAxis(s.xaxis, xmin, xmax); + updateAxis(s.yaxis, ymin, ymax); + } - s.subseries = [orig, thresholded]; - } + for (axis in axes) { + if (axes[axis].datamin == topSentry) + axes[axis].datamin = null; + if (axes[axis].datamax == bottomSentry) + axes[axis].datamax = null; } } @@ -472,83 +541,198 @@ return c; } - canvasWidth = target.width(); - canvasHeight = target.height(); - target.html(""); // clear target - if (target.css("position") == 'static') - target.css("position", "relative"); // for positioning labels and overlay + canvasWidth = placeholder.width(); + canvasHeight = placeholder.height(); + placeholder.html(""); // clear placeholder + if (placeholder.css("position") == 'static') + placeholder.css("position", "relative"); // for positioning labels and overlay if (canvasWidth <= 0 || canvasHeight <= 0) throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight; + if ($.browser.msie) // excanvas hack + window.G_vmlCanvasManager.init_(document); // make sure everything is setup + // the canvas - canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(target).get(0); + canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(placeholder).get(0); ctx = canvas.getContext("2d"); // overlay canvas for interactive features - overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(target).get(0); + overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(placeholder).get(0); octx = overlay.getContext("2d"); + octx.stroke(); + } + function bindEvents() { // we include the canvas in the event holder too, because IE 7 // sometimes has trouble with the stacking order eventHolder = $([overlay, canvas]); // bind events - if (options.selection.mode != null || options.crosshair.mode != null - || options.grid.hoverable) { - // FIXME: temp. work-around until jQuery bug 4398 is fixed - eventHolder.each(function () { - this.onmousemove = onMouseMove; - }); - - if (options.selection.mode != null) - eventHolder.mousedown(onMouseDown); - } + if (options.grid.hoverable) + eventHolder.mousemove(onMouseMove); - if (options.crosshair.mode != null) - eventHolder.mouseout(onMouseOut); - if (options.grid.clickable) eventHolder.click(onClick); + + executeHooks(hooks.bindEvents, [eventHolder]); } function setupGrid() { - function setupAxis(axis, options) { - setRange(axis, options); - prepareTickGeneration(axis, options); - setTicks(axis, options); + function setTransformationHelpers(axis, o) { + function identity(x) { return x; } + + var s, m, t = o.transform || identity, + it = o.inverseTransform; + // add transformation helpers if (axis == axes.xaxis || axis == axes.x2axis) { + // precompute how much the axis is scaling a point + // in canvas space + s = axis.scale = plotWidth / (t(axis.max) - t(axis.min)); + m = t(axis.min); + // data point to canvas coordinate - axis.p2c = function (p) { return (p - axis.min) * axis.scale; }; - // canvas coordinate to data point - axis.c2p = function (c) { return axis.min + c / axis.scale; }; + if (t == identity) // slight optimization + axis.p2c = function (p) { return (p - m) * s; }; + else + axis.p2c = function (p) { return (t(p) - m) * s; }; + // canvas coordinate to data point + if (!it) + axis.c2p = function (c) { return m + c / s; }; + else + axis.c2p = function (c) { return it(m + c / s); }; } else { - axis.p2c = function (p) { return (axis.max - p) * axis.scale; }; - axis.c2p = function (p) { return axis.max - p / axis.scale; }; + s = axis.scale = plotHeight / (t(axis.max) - t(axis.min)); + m = t(axis.max); + + if (t == identity) + axis.p2c = function (p) { return (m - p) * s; }; + else + axis.p2c = function (p) { return (m - t(p)) * s; }; + if (!it) + axis.c2p = function (c) { return m - c / s; }; + else + axis.c2p = function (c) { return it(m - c / s); }; + } + } + + function measureLabels(axis, axisOptions) { + var i, labels = [], l; + + axis.labelWidth = axisOptions.labelWidth; + axis.labelHeight = axisOptions.labelHeight; + + if (axis == axes.xaxis || axis == axes.x2axis) { + // to avoid measuring the widths of the labels, we + // construct fixed-size boxes and put the labels inside + // them, we don't need the exact figures and the + // fixed-size box content is easy to center + if (axis.labelWidth == null) + axis.labelWidth = canvasWidth / (axis.ticks.length > 0 ? axis.ticks.length : 1); + + // measure x label heights + if (axis.labelHeight == null) { + labels = []; + for (i = 0; i < axis.ticks.length; ++i) { + l = axis.ticks[i].label; + if (l) + labels.push('<div class="tickLabel" style="float:left;width:' + axis.labelWidth + 'px">' + l + '</div>'); + } + + if (labels.length > 0) { + var dummyDiv = $('<div style="position:absolute;top:-10000px;width:10000px;font-size:smaller">' + + labels.join("") + '<div style="clear:left"></div></div>').appendTo(placeholder); + axis.labelHeight = dummyDiv.height(); + dummyDiv.remove(); + } + } + } + else if (axis.labelWidth == null || axis.labelHeight == null) { + // calculate y label dimensions + for (i = 0; i < axis.ticks.length; ++i) { + l = axis.ticks[i].label; + if (l) + labels.push('<div class="tickLabel">' + l + '</div>'); + } + + if (labels.length > 0) { + var dummyDiv = $('<div style="position:absolute;top:-10000px;font-size:smaller">' + + labels.join("") + '</div>').appendTo(placeholder); + if (axis.labelWidth == null) + axis.labelWidth = dummyDiv.width(); + if (axis.labelHeight == null) + axis.labelHeight = dummyDiv.find("div").height(); + dummyDiv.remove(); + } + } + + if (axis.labelWidth == null) + axis.labelWidth = 0; + if (axis.labelHeight == null) + axis.labelHeight = 0; } + + function setGridSpacing() { + // get the most space needed around the grid for things + // that may stick out + var maxOutset = options.grid.borderWidth; + for (i = 0; i < series.length; ++i) + maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2)); + + plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = maxOutset; + + var margin = options.grid.labelMargin + options.grid.borderWidth; + + if (axes.xaxis.labelHeight > 0) + plotOffset.bottom = Math.max(maxOutset, axes.xaxis.labelHeight + margin); + if (axes.yaxis.labelWidth > 0) + plotOffset.left = Math.max(maxOutset, axes.yaxis.labelWidth + margin); + if (axes.x2axis.labelHeight > 0) + plotOffset.top = Math.max(maxOutset, axes.x2axis.labelHeight + margin); + if (axes.y2axis.labelWidth > 0) + plotOffset.right = Math.max(maxOutset, axes.y2axis.labelWidth + margin); + + plotWidth = canvasWidth - plotOffset.left - plotOffset.right; + plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top; + } + + var axis; + for (axis in axes) + setRange(axes[axis], options[axis]); + + if (options.grid.show) { + for (axis in axes) { + prepareTickGeneration(axes[axis], options[axis]); + setTicks(axes[axis], options[axis]); + measureLabels(axes[axis], options[axis]); + } - for (var axis in axes) - setupAxis(axes[axis], options[axis]); + setGridSpacing(); + } + else { + plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0; + plotWidth = canvasWidth; + plotHeight = canvasHeight; + } + + for (axis in axes) + setTransformationHelpers(axes[axis], options[axis]); - setSpacing(); - insertLabels(); + if (options.grid.show) + insertLabels(); + insertLegend(); } function setRange(axis, axisOptions) { - var min = axisOptions.min != null ? +axisOptions.min : axis.datamin, - max = axisOptions.max != null ? +axisOptions.max : axis.datamax; - - // degenerate case - if (min == Number.POSITIVE_INFINITY) - min = 0; - if (max == Number.NEGATIVE_INFINITY) - max = 1; - - if (max - min == 0.0) { + var min = +(axisOptions.min != null ? axisOptions.min : axis.datamin), + max = +(axisOptions.max != null ? axisOptions.max : axis.datamax), + delta = max - min; + + if (delta == 0.0) { // degenerate case var widen = max == 0 ? 1 : 0.01; @@ -564,15 +748,15 @@ var margin = axisOptions.autoscaleMargin; if (margin != null) { if (axisOptions.min == null) { - min -= (max - min) * margin; + min -= delta * margin; // make sure we don't go below zero if all values // are positive - if (min < 0 && axis.datamin >= 0) + if (min < 0 && axis.datamin != null && axis.datamin >= 0) min = 0; } if (axisOptions.max == null) { - max += (max - min) * margin; - if (max > 0 && axis.datamax <= 0) + max += delta * margin; + if (max > 0 && axis.datamax != null && axis.datamax <= 0) max = 0; } } @@ -587,12 +771,14 @@ if (typeof axisOptions.ticks == "number" && axisOptions.ticks > 0) noTicks = axisOptions.ticks; else if (axis == axes.xaxis || axis == axes.x2axis) - noTicks = canvasWidth / 100; + // heuristic based on the model a*sqrt(x) fitted to + // some reasonable data points + noTicks = 0.3 * Math.sqrt(canvasWidth); else - noTicks = canvasHeight / 60; + noTicks = 0.3 * Math.sqrt(canvasHeight); - var delta = (axis.max - axis.min) / noTicks; - var size, generator, unit, formatter, i, magn, norm; + var delta = (axis.max - axis.min) / noTicks, + size, generator, unit, formatter, i, magn, norm; if (axisOptions.mode == "time") { // pretty handling of time @@ -732,14 +918,15 @@ var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]]; var span = axis.max - axis.min; + var suffix = (axisOptions.twelveHourClock) ? " %p" : ""; if (t < timeUnitSize.minute) - fmt = "%h:%M:%S"; + fmt = "%h:%M:%S" + suffix; else if (t < timeUnitSize.day) { if (span < 2 * timeUnitSize.day) - fmt = "%h:%M"; + fmt = "%h:%M" + suffix; else - fmt = "%b %d %h:%M"; + fmt = "%b %d %h:%M" + suffix; } else if (t < timeUnitSize.month) fmt = "%b %d"; @@ -761,7 +948,7 @@ var dec = -Math.floor(Math.log(delta) / Math.LN10); if (maxDec != null && dec > maxDec) dec = maxDec; - + magn = Math.pow(10, -dec); norm = delta / magn; // norm is between 1.0 and 10.0 @@ -787,9 +974,9 @@ if (axisOptions.tickSize != null) size = axisOptions.tickSize; - + axis.tickDecimals = Math.max(0, (maxDec != null) ? maxDec : dec); - + generator = function (axis) { var ticks = []; @@ -816,10 +1003,6 @@ axis.tickFormatter = function (v, axis) { return "" + axisOptions.tickFormatter(v, axis); }; else axis.tickFormatter = formatter; - if (axisOptions.labelWidth != null) - axis.labelWidth = axisOptions.labelWidth; - if (axisOptions.labelHeight != null) - axis.labelHeight = axisOptions.labelHeight; } function setTicks(axis, axisOptions) { @@ -864,111 +1047,25 @@ if (axisOptions.min == null) axis.min = Math.min(axis.min, axis.ticks[0].v); if (axisOptions.max == null && axis.ticks.length > 1) - axis.max = Math.min(axis.max, axis.ticks[axis.ticks.length - 1].v); + axis.max = Math.max(axis.max, axis.ticks[axis.ticks.length - 1].v); } } - - function setSpacing() { - function measureXLabels(axis) { - // to avoid measuring the widths of the labels, we - // construct fixed-size boxes and put the labels inside - // them, we don't need the exact figures and the - // fixed-size box content is easy to center - if (axis.labelWidth == null) - axis.labelWidth = canvasWidth / 6; + + function draw() { + ctx.clearRect(0, 0, canvasWidth, canvasHeight); - // measure x label heights - if (axis.labelHeight == null) { - labels = []; - for (i = 0; i < axis.ticks.length; ++i) { - l = axis.ticks[i].label; - if (l) - labels.push('<div class="tickLabel" style="float:left;width:' + axis.labelWidth + 'px">' + l + '</div>'); - } - - axis.labelHeight = 0; - if (labels.length > 0) { - var dummyDiv = $('<div style="position:absolute;top:-10000px;width:10000px;font-size:smaller">' - + labels.join("") + '<div style="clear:left"></div></div>').appendTo(target); - axis.labelHeight = dummyDiv.height(); - dummyDiv.remove(); - } - } - } - - function measureYLabels(axis) { - if (axis.labelWidth == null || axis.labelHeight == null) { - var i, labels = [], l; - // calculate y label dimensions - for (i = 0; i < axis.ticks.length; ++i) { - l = axis.ticks[i].label; - if (l) - labels.push('<div class="tickLabel">' + l + '</div>'); - } - - if (labels.length > 0) { - var dummyDiv = $('<div style="position:absolute;top:-10000px;font-size:smaller">' - + labels.join("") + '</div>').appendTo(target); - if (axis.labelWidth == null) - axis.labelWidth = dummyDiv.width(); - if (axis.labelHeight == null) - axis.labelHeight = dummyDiv.find("div").height(); - dummyDiv.remove(); - } - - if (axis.labelWidth == null) - axis.labelWidth = 0; - if (axis.labelHeight == null) - axis.labelHeight = 0; - } - } + var grid = options.grid; - measureXLabels(axes.xaxis); - measureYLabels(axes.yaxis); - measureXLabels(axes.x2axis); - measureYLabels(axes.y2axis); - - // get the most space needed around the grid for things - // that may stick out - var maxOutset = options.grid.borderWidth; - for (i = 0; i < series.length; ++i) - maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2)); - - plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = maxOutset; + if (grid.show && !grid.aboveData) + drawGrid(); - var margin = options.grid.labelMargin + options.grid.borderWidth; - - if (axes.xaxis.labelHeight > 0) - plotOffset.bottom = Math.max(maxOutset, axes.xaxis.labelHeight + margin); - if (axes.yaxis.labelWidth > 0) - plotOffset.left = Math.max(maxOutset, axes.yaxis.labelWidth + margin); + for (var i = 0; i < series.length; ++i) + drawSeries(series[i]); - if (axes.x2axis.labelHeight > 0) - plotOffset.top = Math.max(maxOutset, axes.x2axis.labelHeight + margin); + executeHooks(hooks.draw, [ctx]); - if (axes.y2axis.labelWidth > 0) - plotOffset.right = Math.max(maxOutset, axes.y2axis.labelWidth + margin); - - plotWidth = canvasWidth - plotOffset.left - plotOffset.right; - plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top; - - // precompute how much the axis is scaling a point in canvas space - axes.xaxis.scale = plotWidth / (axes.xaxis.max - axes.xaxis.min); - axes.yaxis.scale = plotHeight / (axes.yaxis.max - axes.yaxis.min); - axes.x2axis.scale = plotWidth / (axes.x2axis.max - axes.x2axis.min); - axes.y2axis.scale = plotHeight / (axes.y2axis.max - axes.y2axis.min); - } - - function draw() { - drawGrid(); - for (var i = 0; i < series.length; ++i) { - var s = series[i]; - if (s.subseries) - for (var j = 0; j < s.subseries.length; ++j) - drawSeries(s.subseries[j]); - else - drawSeries(s); - } + if (grid.show && grid.aboveData) + drawGrid(); } function extractRange(ranges, coord) { @@ -1004,7 +1101,6 @@ var i; ctx.save(); - ctx.clearRect(0, 0, canvasWidth, canvasHeight); ctx.translate(plotOffset.left, plotOffset.top); // draw background, if any @@ -1056,8 +1152,8 @@ if (xrange.from == xrange.to || yrange.from == yrange.to) { // draw line - ctx.strokeStyle = m.color || options.grid.markingsColor; ctx.beginPath(); + ctx.strokeStyle = m.color || options.grid.markingsColor; ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth; //ctx.moveTo(Math.floor(xrange.from), yrange.from); //ctx.lineTo(Math.floor(xrange.to), yrange.to); @@ -1131,9 +1227,9 @@ ctx.restore(); } - + function insertLabels() { - target.find(".tickLabels").remove(); + placeholder.find(".tickLabels").remove(); var html = ['<div class="tickLabels" style="font-size:smaller;color:' + options.grid.color + '">']; @@ -1167,7 +1263,7 @@ html.push('</div>'); - target.append(html.join("")); + placeholder.append(html.join("")); } function drawSeries(series) { @@ -1181,13 +1277,13 @@ function drawSeriesLines(series) { function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { - var points = datapoints.linespoints || datapoints.points, - incr = datapoints.incr, + var points = datapoints.points, + ps = datapoints.pointsize, prevx = null, prevy = null; ctx.beginPath(); - for (var i = incr; i < points.length; i += incr) { - var x1 = points[i - incr], y1 = points[i - incr + 1], + for (var i = ps; i < points.length; i += ps) { + var x1 = points[i - ps], y1 = points[i - ps + 1], x2 = points[i], y2 = points[i + 1]; if (x1 == null || x2 == null) @@ -1261,13 +1357,13 @@ } function plotLineArea(datapoints, axisx, axisy) { - var points = datapoints.linespoints || datapoints.points, - incr = datapoints.incr, + var points = datapoints.points, + ps = datapoints.pointsize, bottom = Math.min(Math.max(0, axisy.min), axisy.max), top, lastX = 0, areaOpen = false; - for (var i = incr; i < points.length; i += incr) { - var x1 = points[i - incr], y1 = points[i - incr + 1], + for (var i = ps; i < points.length; i += ps) { + var x1 = points[i - ps], y1 = points[i - ps + 1], x2 = points[i], y2 = points[i + 1]; if (areaOpen && x1 != null && x2 == null) { @@ -1407,10 +1503,11 @@ // draw shadow as a thick and thin line with transparency ctx.lineWidth = sw; ctx.strokeStyle = "rgba(0,0,0,0.1)"; - var xoffset = 1; - plotLine(series.datapoints, xoffset, Math.sqrt((lw/2 + sw/2)*(lw/2 + sw/2) - xoffset*xoffset), series.xaxis, series.yaxis); + // position shadow at angle from the mid of line + var angle = Math.PI/18; + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis); ctx.lineWidth = sw/2; - plotLine(series.datapoints, xoffset, Math.sqrt((lw/2 + sw/4)*(lw/2 + sw/4) - xoffset*xoffset), series.xaxis, series.yaxis); + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis); } ctx.lineWidth = lw; @@ -1428,15 +1525,15 @@ function drawSeriesPoints(series) { function plotPoints(datapoints, radius, fillStyle, offset, circumference, axisx, axisy) { - var points = datapoints.points, incr = datapoints.incr; + var points = datapoints.points, ps = datapoints.pointsize; - for (var i = 0; i < points.length; i += incr) { + for (var i = 0; i < points.length; i += ps) { var x = points[i], y = points[i + 1]; if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) continue; ctx.beginPath(); - ctx.arc(axisx.p2c(x), axisy.p2c(y) + offset, radius, 0, circumference, true); + ctx.arc(axisx.p2c(x), axisy.p2c(y) + offset, radius, 0, circumference, false); if (fillStyle) { ctx.fillStyle = fillStyle; ctx.fill(); @@ -1456,11 +1553,11 @@ var w = sw / 2; ctx.lineWidth = w; ctx.strokeStyle = "rgba(0,0,0,0.1)"; - plotPoints(series.datapoints, radius, null, w + w/2, 2 * Math.PI, + plotPoints(series.datapoints, radius, null, w + w/2, Math.PI, series.xaxis, series.yaxis); ctx.strokeStyle = "rgba(0,0,0,0.2)"; - plotPoints(series.datapoints, radius, null, w/2, 2 * Math.PI, + plotPoints(series.datapoints, radius, null, w/2, Math.PI, series.xaxis, series.yaxis); } @@ -1581,9 +1678,9 @@ function drawSeriesBars(series) { function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) { - var points = datapoints.points, incr = datapoints.incr; + var points = datapoints.points, ps = datapoints.pointsize; - for (var i = 0; i < points.length; i += incr) { + for (var i = 0; i < points.length; i += ps) { if (points[i] == null) continue; drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal); @@ -1610,14 +1707,14 @@ if (filloptions.fillColor) return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); - var c = parseColor(seriesColor); + var c = $.color.parse(seriesColor); c.a = typeof fill == "number" ? fill : 0.4; c.normalize(); return c.toString(); } function insertLegend() { - target.find(".legend").remove(); + placeholder.find(".legend").remove(); if (!options.legend.show) return; @@ -1667,19 +1764,20 @@ pos += 'right:' + (m[0] + plotOffset.right) + 'px;'; else if (p.charAt(1) == "w") pos += 'left:' + (m[0] + plotOffset.left) + 'px;'; - var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(target); + var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder); if (options.legend.backgroundOpacity != 0.0) { // put in the transparent background // separately to avoid blended labels and // label boxes var c = options.legend.backgroundColor; if (c == null) { - var tmp; - if (options.grid.backgroundColor && typeof options.grid.backgroundColor == "string") - tmp = options.grid.backgroundColor; + c = options.grid.backgroundColor; + if (c && typeof c == "string") + c = $.color.parse(c); else - tmp = extractColor(legend); - c = parseColor(tmp).adjust(null, null, null, 1).toString(); + c = $.color.extract(legend, 'background-color'); + c.a = 1; + c = c.toString(); } var div = legend.children(); $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity); @@ -1690,23 +1788,16 @@ // interactive features - var lastMousePos = { pageX: null, pageY: null }, - selection = { - first: { x: -1, y: -1}, second: { x: -1, y: -1}, - show: false, active: false }, - crosshair = { pos: { x: -1, y: -1 } }, - highlights = [], - clickIsMouseUp = false, - redrawTimeout = null, - hoverTimeout = null; + var highlights = [], + redrawTimeout = null; - // Returns the data item the mouse is over, or null if none is found + // returns the data item the mouse is over, or null if none is found function findNearbyItem(mouseX, mouseY, seriesFilter) { var maxDistance = options.grid.mouseActiveRadius, - lowestDistance = maxDistance * maxDistance + 1, + smallestDistance = maxDistance * maxDistance + 1, item = null, foundPoint = false, i, j; - for (var i = 0; i < series.length; ++i) { + for (i = 0; i < series.length; ++i) { if (!seriesFilter(series[i])) continue; @@ -1714,14 +1805,14 @@ axisx = s.xaxis, axisy = s.yaxis, points = s.datapoints.points, - incr = s.datapoints.incr, + ps = s.datapoints.pointsize, mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster my = axisy.c2p(mouseY), maxx = maxDistance / axisx.scale, maxy = maxDistance / axisy.scale; if (s.lines.show || s.points.show) { - for (j = 0; j < points.length; j += incr) { + for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1]; if (x == null) continue; @@ -1736,10 +1827,13 @@ // data units, because the scales of the axes may be different var dx = Math.abs(axisx.p2c(x) - mouseX), dy = Math.abs(axisy.p2c(y) - mouseY), - dist = dx * dx + dy * dy; // no idea in taking sqrt - if (dist < lowestDistance) { - lowestDistance = dist; - item = [i, j / incr]; + dist = dx * dx + dy * dy; // we save the sqrt + + // use <= to ensure last point takes precedence + // (last generally means on top of) + if (dist <= smallestDistance) { + smallestDistance = dist; + item = [i, j / ps]; } } } @@ -1748,7 +1842,7 @@ var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2, barRight = barLeft + s.bars.barWidth; - for (j = 0; j < points.length; j += incr) { + for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1], b = points[j + 2]; if (x == null) continue; @@ -1759,7 +1853,7 @@ my >= y + barLeft && my <= y + barRight) : (mx >= x + barLeft && mx <= x + barRight && my >= Math.min(b, y) && my <= Math.max(b, y))) - item = [i, j / incr]; + item = [i, j / ps]; } } } @@ -1767,102 +1861,28 @@ if (item) { i = item[0]; j = item[1]; + ps = series[i].datapoints.pointsize; - return { datapoint: series[i].data[j], + return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), dataIndex: j, series: series[i], - seriesIndex: i } + seriesIndex: i }; } return null; } - function onMouseMove(ev) { - // FIXME: temp. work-around until jQuery bug 4398 is fixed - var e = ev || window.event; - if (e.pageX == null && e.clientX != null) { - var de = document.documentElement, b = document.body; - lastMousePos.pageX = e.clientX + (de && de.scrollLeft || b.scrollLeft || 0) - (de.clientLeft || 0); - lastMousePos.pageY = e.clientY + (de && de.scrollTop || b.scrollTop || 0) - (de.clientTop || 0); - } - else { - lastMousePos.pageX = e.pageX; - lastMousePos.pageY = e.pageY; - } - + function onMouseMove(e) { if (options.grid.hoverable) - triggerClickHoverEvent("plothover", lastMousePos, + triggerClickHoverEvent("plothover", e, function (s) { return s["hoverable"] != false; }); - - if (options.crosshair.mode != null) { - if (!selection.active) { - setPositionFromEvent(crosshair.pos, lastMousePos); - triggerRedrawOverlay(); - } - else - crosshair.pos.x = -1; // hide the crosshair while selecting - } - - if (selection.active) { - target.trigger("plotselecting", [ selectionIsSane() ? getSelectionForEvent() : null ]); - - updateSelection(lastMousePos); - } - } - - function onMouseDown(e) { - if (e.which != 1) // only accept left-click - return; - - // cancel out any text selections - document.body.focus(); - - // prevent text selection and drag in old-school browsers - if (document.onselectstart !== undefined && workarounds.onselectstart == null) { - workarounds.onselectstart = document.onselectstart; - document.onselectstart = function () { return false; }; - } - if (document.ondrag !== undefined && workarounds.ondrag == null) { - workarounds.ondrag = document.ondrag; - document.ondrag = function () { return false; }; - } - - setSelectionPos(selection.first, e); - - lastMousePos.pageX = null; - selection.active = true; - $(document).one("mouseup", onSelectionMouseUp); - } - - function onMouseOut(ev) { - if (options.crosshair.mode != null && crosshair.pos.x != -1) { - crosshair.pos.x = -1; - triggerRedrawOverlay(); - } } function onClick(e) { - if (clickIsMouseUp) { - clickIsMouseUp = false; - return; - } - triggerClickHoverEvent("plotclick", e, function (s) { return s["clickable"] != false; }); } - /* - function userPositionInCanvasSpace(pos) { - return { x: parseInt(pos.x != null ? axes.xaxis.p2c(pos.x) : axes.x2axis.p2c(pos.x2)), - y: parseInt(pos.y != null ? axes.yaxis.p2c(pos.y) : axes.y2axis.p2c(pos.y2)) }; - } - - function positionInDivSpace(pos) { - var cpos = userPositionInCanvasSpace(pos); - return { x: cpos.x + plotOffset.left, - y: cpos.y + plotOffset.top }; - }*/ - // trigger click or hover event (they send the same parameters // so we share their code) function triggerClickHoverEvent(eventname, event, seriesFilter) { @@ -1901,18 +1921,18 @@ highlight(item.series, item.datapoint, eventname); } - target.trigger(eventname, [ pos, item ]); + placeholder.trigger(eventname, [ pos, item ]); } function triggerRedrawOverlay() { if (!redrawTimeout) - redrawTimeout = setTimeout(redrawOverlay, 30); + redrawTimeout = setTimeout(drawOverlay, 30); } - function redrawOverlay() { + function drawOverlay() { redrawTimeout = null; - // redraw highlights + // draw highlights octx.save(); octx.clearRect(0, 0, canvasWidth, canvasHeight); octx.translate(plotOffset.left, plotOffset.top); @@ -1926,43 +1946,9 @@ else drawPointHighlight(hi.series, hi.point); } - - // redraw selection - if (selection.show && selectionIsSane()) { - octx.strokeStyle = parseColor(options.selection.color).scale(null, null, null, 0.8).toString(); - octx.lineWidth = 1; - ctx.lineJoin = "round"; - octx.fillStyle = parseColor(options.selection.color).scale(null, null, null, 0.4).toString(); - - var x = Math.min(selection.first.x, selection.second.x), - y = Math.min(selection.first.y, selection.second.y), - w = Math.abs(selection.second.x - selection.first.x), - h = Math.abs(selection.second.y - selection.first.y); - - octx.fillRect(x, y, w, h); - octx.strokeRect(x, y, w, h); - } - - // redraw crosshair - var pos = crosshair.pos, mode = options.crosshair.mode; - if (mode != null && pos.x != -1) { - octx.strokeStyle = parseColor(options.crosshair.color).scale(null, null, null, 0.8).toString(); - octx.lineWidth = 1; - ctx.lineJoin = "round"; - - octx.beginPath(); - if (mode.indexOf("x") != -1) { - octx.moveTo(pos.x, 0); - octx.lineTo(pos.x, plotHeight); - } - if (mode.indexOf("y") != -1) { - octx.moveTo(0, pos.y); - octx.lineTo(plotWidth, pos.y); - } - octx.stroke(); - - } octx.restore(); + + executeHooks(hooks.drawOverlay, [octx]); } function highlight(s, point, auto) { @@ -1983,6 +1969,11 @@ } function unhighlight(s, point) { + if (s == null && point == null) { + highlights = []; + triggerRedrawOverlay(); + } + if (typeof s == "number") s = series[s]; @@ -2016,167 +2007,22 @@ var pointRadius = series.points.radius + series.points.lineWidth / 2; octx.lineWidth = pointRadius; - octx.strokeStyle = parseColor(series.color).scale(1, 1, 1, 0.5).toString(); + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); var radius = 1.5 * pointRadius; octx.beginPath(); - octx.arc(axisx.p2c(x), axisy.p2c(y), radius, 0, 2 * Math.PI, true); + octx.arc(axisx.p2c(x), axisy.p2c(y), radius, 0, 2 * Math.PI, false); octx.stroke(); } function drawBarHighlight(series, point) { octx.lineWidth = series.bars.lineWidth; - octx.strokeStyle = parseColor(series.color).scale(1, 1, 1, 0.5).toString(); - var fillStyle = parseColor(series.color).scale(1, 1, 1, 0.5).toString(); + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var fillStyle = $.color.parse(series.color).scale('a', 0.5).toString(); var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2; drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth, 0, function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal); } - function setPositionFromEvent(pos, e) { - var offset = eventHolder.offset(); - pos.x = clamp(0, e.pageX - offset.left - plotOffset.left, plotWidth); - pos.y = clamp(0, e.pageY - offset.top - plotOffset.top, plotHeight); - } - - function setCrosshair(pos) { - if (pos == null) - crosshair.pos.x = -1; - else { - crosshair.pos.x = clamp(0, pos.x != null ? axes.xaxis.p2c(pos.x) : axes.x2axis.p2c(pos.x2), plotWidth); - crosshair.pos.y = clamp(0, pos.y != null ? axes.yaxis.p2c(pos.y) : axes.y2axis.p2c(pos.y2), plotHeight); - } - triggerRedrawOverlay(); - } - - function getSelectionForEvent() { - var x1 = Math.min(selection.first.x, selection.second.x), - x2 = Math.max(selection.first.x, selection.second.x), - y1 = Math.max(selection.first.y, selection.second.y), - y2 = Math.min(selection.first.y, selection.second.y); - - var r = {}; - if (axes.xaxis.used) - r.xaxis = { from: axes.xaxis.c2p(x1), to: axes.xaxis.c2p(x2) }; - if (axes.x2axis.used) - r.x2axis = { from: axes.x2axis.c2p(x1), to: axes.x2axis.c2p(x2) }; - if (axes.yaxis.used) - r.yaxis = { from: axes.yaxis.c2p(y1), to: axes.yaxis.c2p(y2) }; - if (axes.y2axis.used) - r.y2axis = { from: axes.y2axis.c2p(y1), to: axes.y2axis.c2p(y2) }; - return r; - } - - function triggerSelectedEvent() { - var r = getSelectionForEvent(); - - target.trigger("plotselected", [ r ]); - - // backwards-compat stuff, to be removed in future - if (axes.xaxis.used && axes.yaxis.used) - target.trigger("selected", [ { x1: r.xaxis.from, y1: r.yaxis.from, x2: r.xaxis.to, y2: r.yaxis.to } ]); - } - - function onSelectionMouseUp(e) { - // revert drag stuff for old-school browsers - if (document.onselectstart !== undefined) - document.onselectstart = workarounds.onselectstart; - if (document.ondrag !== undefined) - document.ondrag = workarounds.ondrag; - - // no more draggy-dee-drag - selection.active = false; - updateSelection(e); - - if (selectionIsSane()) { - triggerSelectedEvent(); - clickIsMouseUp = true; - } - else { - // this counts as a clear - target.trigger("plotunselected", [ ]); - target.trigger("plotselecting", [ null ]); - } - - return false; - } - - function setSelectionPos(pos, e) { - setPositionFromEvent(pos, e); - - if (options.selection.mode == "y") { - if (pos == selection.first) - pos.x = 0; - else - pos.x = plotWidth; - } - - if (options.selection.mode == "x") { - if (pos == selection.first) - pos.y = 0; - else - pos.y = plotHeight; - } - } - - function updateSelection(pos) { - if (pos.pageX == null) - return; - - setSelectionPos(selection.second, pos); - if (selectionIsSane()) { - selection.show = true; - triggerRedrawOverlay(); - } - else - clearSelection(true); - } - - function clearSelection(preventEvent) { - if (selection.show) { - selection.show = false; - triggerRedrawOverlay(); - if (!preventEvent) - target.trigger("plotunselected", [ ]); - } - } - - function setSelection(ranges, preventEvent) { - var range; - - if (options.selection.mode == "y") { - selection.first.x = 0; - selection.second.x = plotWidth; - } - else { - range = extractRange(ranges, "x"); - - selection.first.x = range.axis.p2c(range.from); - selection.second.x = range.axis.p2c(range.to); - } - - if (options.selection.mode == "x") { - selection.first.y = 0; - selection.second.y = plotHeight; - } - else { - range = extractRange(ranges, "y"); - - selection.first.y = range.axis.p2c(range.from); - selection.second.y = range.axis.p2c(range.to); - } - - selection.show = true; - triggerRedrawOverlay(); - if (!preventEvent) - triggerSelectedEvent(); - } - - function selectionIsSane() { - var minSize = 5; - return Math.abs(selection.second.x - selection.first.x) >= minSize && - Math.abs(selection.second.y - selection.first.y) >= minSize; - } - function getColorOrGradient(spec, bottom, top, defaultColor) { if (typeof spec == "string") return spec; @@ -2188,17 +2034,22 @@ for (var i = 0, l = spec.colors.length; i < l; ++i) { var c = spec.colors[i]; - gradient.addColorStop(i / (l - 1), typeof c == "string" ? c : parseColor(defaultColor).scale(c.brightness, c.brightness, c.brightness, c.opacity)); + if (typeof c != "string") { + c = $.color.parse(defaultColor).scale('rgb', c.brightness); + c.a *= c.opacity; + c = c.toString(); + } + gradient.addColorStop(i / (l - 1), c); } return gradient; } } } - - $.plot = function(target, data, options) { - var plot = new Plot(target, data, options); - /*var t0 = new Date(); + + $.plot = function(placeholder, data, options) { + var plot = new Plot($(placeholder), data, options, $.plot.plugins); + /*var t0 = new Date(); var t1 = new Date(); var tstr = "time used (msecs): " + (t1.getTime() - t0.getTime()) if (window.console) @@ -2208,6 +2059,8 @@ return plot; }; + $.plot.plugins = []; + // returns a string with the date d formatted according to fmt $.plot.formatDate = function(d, fmt, monthNames) { var leftPad = function(n) { @@ -2217,21 +2070,33 @@ var r = []; var escape = false; + var hours = d.getUTCHours(); + var isAM = hours < 12; if (monthNames == null) monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + + if (fmt.search(/%p|%P/) != -1) { + if (hours > 12) { + hours = hours - 12; + } else if (hours == 0) { + hours = 12; + } + } for (var i = 0; i < fmt.length; ++i) { var c = fmt.charAt(i); if (escape) { switch (c) { - case 'h': c = "" + d.getUTCHours(); break; - case 'H': c = leftPad(d.getUTCHours()); break; + case 'h': c = "" + hours; break; + case 'H': c = leftPad(hours); break; case 'M': c = leftPad(d.getUTCMinutes()); break; case 'S': c = leftPad(d.getUTCSeconds()); break; case 'd': c = "" + d.getUTCDate(); break; case 'm': c = "" + (d.getUTCMonth() + 1); break; case 'y': c = "" + d.getUTCFullYear(); break; case 'b': c = "" + monthNames[d.getUTCMonth()]; break; + case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break; + case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break; } r.push(c); escape = false; @@ -2251,171 +2116,4 @@ return base * Math.floor(n / base); } - function clamp(min, value, max) { - if (value < min) - return min; - else if (value > max) - return max; - else - return value; - } - - // color helpers, inspiration from the jquery color animation - // plugin by John Resig - function Color (r, g, b, a) { - - var rgba = ['r','g','b','a']; - var x = 4; //rgba.length - - while (-1<--x) { - this[rgba[x]] = arguments[x] || ((x==3) ? 1.0 : 0); - } - - this.toString = function() { - if (this.a >= 1.0) { - return "rgb("+[this.r,this.g,this.b].join(",")+")"; - } else { - return "rgba("+[this.r,this.g,this.b,this.a].join(",")+")"; - } - }; - - this.scale = function(rf, gf, bf, af) { - x = 4; //rgba.length - while (-1<--x) { - if (arguments[x] != null) - this[rgba[x]] *= arguments[x]; - } - return this.normalize(); - }; - - this.adjust = function(rd, gd, bd, ad) { - x = 4; //rgba.length - while (-1<--x) { - if (arguments[x] != null) - this[rgba[x]] += arguments[x]; - } - return this.normalize(); - }; - - this.clone = function() { - return new Color(this.r, this.b, this.g, this.a); - }; - - var limit = function(val,minVal,maxVal) { - return Math.max(Math.min(val, maxVal), minVal); - }; - - this.normalize = function() { - this.r = clamp(0, parseInt(this.r), 255); - this.g = clamp(0, parseInt(this.g), 255); - this.b = clamp(0, parseInt(this.b), 255); - this.a = clamp(0, this.a, 1); - return this; - }; - - this.normalize(); - } - - var lookupColors = { - 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], - lightpink:[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] - }; - - function extractColor(element) { - var color, elem = element; - do { - color = elem.css("background-color").toLowerCase(); - // keep going until we find an element that has color, or - // we hit the body - if (color != '' && color != 'transparent') - break; - elem = elem.parent(); - } while (!$.nodeName(elem.get(0), "body")); - - // catch Safari's way of signalling transparent - if (color == "rgba(0, 0, 0, 0)") - return "transparent"; - - return color; - } - - // parse string, returns Color - function parseColor(str) { - var result; - - // Look for rgb(num,num,num) - if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str)) - return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10)); - - // Look for rgba(num,num,num,num) - if (result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) - return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10), parseFloat(result[4])); - - // Look for rgb(num%,num%,num%) - if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str)) - return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55); - - // Look for rgba(num%,num%,num%,num) - if (result = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) - return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55, parseFloat(result[4])); - - // Look for #a0b1c2 - if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str)) - return new Color(parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)); - - // Look for #fff - if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str)) - return new Color(parseInt(result[1]+result[1], 16), parseInt(result[2]+result[2], 16), parseInt(result[3]+result[3], 16)); - - // Otherwise, we're most likely dealing with a named color - var name = $.trim(str).toLowerCase(); - if (name == "transparent") - return new Color(255, 255, 255, 0); - else { - result = lookupColors[name]; - return new Color(result[0], result[1], result[2]); - } - } - })(jQuery); diff --git a/forum/skins/default/media/js/jquery.flot.min.js b/forum/skins/default/media/js/jquery.flot.min.js new file mode 100644 index 00000000..31f465b8 --- /dev/null +++ b/forum/skins/default/media/js/jquery.flot.min.js @@ -0,0 +1 @@ +(function(){jQuery.color={};jQuery.color.make=function(G,H,J,I){var A={};A.r=G||0;A.g=H||0;A.b=J||0;A.a=I!=null?I:1;A.add=function(C,D){for(var E=0;E<C.length;++E){A[C.charAt(E)]+=D}return A.normalize()};A.scale=function(C,D){for(var E=0;E<C.length;++E){A[C.charAt(E)]*=D}return A.normalize()};A.toString=function(){if(A.a>=1){return"rgb("+[A.r,A.g,A.b].join(",")+")"}else{return"rgba("+[A.r,A.g,A.b,A.a].join(",")+")"}};A.normalize=function(){function C(E,D,F){return D<E?E:(D>F?F:D)}A.r=C(0,parseInt(A.r),255);A.g=C(0,parseInt(A.g),255);A.b=C(0,parseInt(A.b),255);A.a=C(0,A.a,1);return A};A.clone=function(){return jQuery.color.make(A.r,A.b,A.g,A.a)};return A.normalize()};jQuery.color.extract=function(E,F){var A;do{A=E.css(F).toLowerCase();if(A!=""&&A!="transparent"){break}E=E.parent()}while(!jQuery.nodeName(E.get(0),"body"));if(A=="rgba(0, 0, 0, 0)"){A="transparent"}return jQuery.color.parse(A)};jQuery.color.parse=function(A){var F,H=jQuery.color.make;if(F=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10))}if(F=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10),parseFloat(F[4]))}if(F=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55)}if(F=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(A)){return H(parseFloat(F[1])*2.55,parseFloat(F[2])*2.55,parseFloat(F[3])*2.55,parseFloat(F[4]))}if(F=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(A)){return H(parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16))}if(F=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(A)){return H(parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16))}var G=jQuery.trim(A).toLowerCase();if(G=="transparent"){return H(255,255,255,0)}else{F=B[G];return H(F[0],F[1],F[2])}};var B={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],lightpink:[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]}})();(function(C){function B(l,W,X,E){var O=[],g={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{mode:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02},x2axis:{autoscaleMargin:null},y2axis:{autoscaleMargin:0.02},series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,tickColor:"rgba(0,0,0,0.15)",labelMargin:5,borderWidth:2,borderColor:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},P=null,AC=null,AD=null,Y=null,AJ=null,s={xaxis:{},yaxis:{},x2axis:{},y2axis:{}},e={left:0,right:0,top:0,bottom:0},y=0,Q=0,I=0,t=0,L={processOptions:[],processRawData:[],processDatapoints:[],draw:[],bindEvents:[],drawOverlay:[]},G=this;G.setData=f;G.setupGrid=k;G.draw=AH;G.getPlaceholder=function(){return l};G.getCanvas=function(){return P};G.getPlotOffset=function(){return e};G.width=function(){return I};G.height=function(){return t};G.offset=function(){var AK=AD.offset();AK.left+=e.left;AK.top+=e.top;return AK};G.getData=function(){return O};G.getAxes=function(){return s};G.getOptions=function(){return g};G.highlight=AE;G.unhighlight=x;G.triggerRedrawOverlay=q;G.pointOffset=function(AK){return{left:parseInt(T(AK,"xaxis").p2c(+AK.x)+e.left),top:parseInt(T(AK,"yaxis").p2c(+AK.y)+e.top)}};G.hooks=L;b(G);r(X);c();f(W);k();AH();AG();function Z(AM,AK){AK=[G].concat(AK);for(var AL=0;AL<AM.length;++AL){AM[AL].apply(this,AK)}}function b(){for(var AK=0;AK<E.length;++AK){var AL=E[AK];AL.init(G);if(AL.options){C.extend(true,g,AL.options)}}}function r(AK){C.extend(true,g,AK);if(g.grid.borderColor==null){g.grid.borderColor=g.grid.color}if(g.xaxis.noTicks&&g.xaxis.ticks==null){g.xaxis.ticks=g.xaxis.noTicks}if(g.yaxis.noTicks&&g.yaxis.ticks==null){g.yaxis.ticks=g.yaxis.noTicks}if(g.grid.coloredAreas){g.grid.markings=g.grid.coloredAreas}if(g.grid.coloredAreasColor){g.grid.markingsColor=g.grid.coloredAreasColor}if(g.lines){C.extend(true,g.series.lines,g.lines)}if(g.points){C.extend(true,g.series.points,g.points)}if(g.bars){C.extend(true,g.series.bars,g.bars)}if(g.shadowSize){g.series.shadowSize=g.shadowSize}for(var AL in L){if(g.hooks[AL]&&g.hooks[AL].length){L[AL]=L[AL].concat(g.hooks[AL])}}Z(L.processOptions,[g])}function f(AK){O=M(AK);U();m()}function M(AN){var AL=[];for(var AK=0;AK<AN.length;++AK){var AM=C.extend(true,{},g.series);if(AN[AK].data){AM.data=AN[AK].data;delete AN[AK].data;C.extend(true,AM,AN[AK]);AN[AK].data=AM.data}else{AM.data=AN[AK]}AL.push(AM)}return AL}function T(AM,AK){var AL=AM[AK];if(!AL||AL==1){return s[AK]}if(typeof AL=="number"){return s[AK.charAt(0)+AL+AK.slice(1)]}return AL}function U(){var AP;var AV=O.length,AK=[],AN=[];for(AP=0;AP<O.length;++AP){var AS=O[AP].color;if(AS!=null){--AV;if(typeof AS=="number"){AN.push(AS)}else{AK.push(C.color.parse(O[AP].color))}}}for(AP=0;AP<AN.length;++AP){AV=Math.max(AV,AN[AP]+1)}var AL=[],AO=0;AP=0;while(AL.length<AV){var AR;if(g.colors.length==AP){AR=C.color.make(100,100,100)}else{AR=C.color.parse(g.colors[AP])}var AM=AO%2==1?-1:1;AR.scale("rgb",1+AM*Math.ceil(AO/2)*0.2);AL.push(AR);++AP;if(AP>=g.colors.length){AP=0;++AO}}var AQ=0,AW;for(AP=0;AP<O.length;++AP){AW=O[AP];if(AW.color==null){AW.color=AL[AQ].toString();++AQ}else{if(typeof AW.color=="number"){AW.color=AL[AW.color].toString()}}if(AW.lines.show==null){var AU,AT=true;for(AU in AW){if(AW[AU].show){AT=false;break}}if(AT){AW.lines.show=true}}AW.xaxis=T(AW,"xaxis");AW.yaxis=T(AW,"yaxis")}}function m(){var AW=Number.POSITIVE_INFINITY,AQ=Number.NEGATIVE_INFINITY,Ac,Aa,AZ,AV,AL,AR,Ab,AX,AP,AO,AK,Ai,Af,AT;for(AK in s){s[AK].datamin=AW;s[AK].datamax=AQ;s[AK].used=false}function AN(Al,Ak,Aj){if(Ak<Al.datamin){Al.datamin=Ak}if(Aj>Al.datamax){Al.datamax=Aj}}for(Ac=0;Ac<O.length;++Ac){AR=O[Ac];AR.datapoints={points:[]};Z(L.processRawData,[AR,AR.data,AR.datapoints])}for(Ac=0;Ac<O.length;++Ac){AR=O[Ac];var Ah=AR.data,Ae=AR.datapoints.format;if(!Ae){Ae=[];Ae.push({x:true,number:true,required:true});Ae.push({y:true,number:true,required:true});if(AR.bars.show){Ae.push({y:true,number:true,required:false,defaultValue:0})}AR.datapoints.format=Ae}if(AR.datapoints.pointsize!=null){continue}if(AR.datapoints.pointsize==null){AR.datapoints.pointsize=Ae.length}AX=AR.datapoints.pointsize;Ab=AR.datapoints.points;insertSteps=AR.lines.show&&AR.lines.steps;AR.xaxis.used=AR.yaxis.used=true;for(Aa=AZ=0;Aa<Ah.length;++Aa,AZ+=AX){AT=Ah[Aa];var AM=AT==null;if(!AM){for(AV=0;AV<AX;++AV){Ai=AT[AV];Af=Ae[AV];if(Af){if(Af.number&&Ai!=null){Ai=+Ai;if(isNaN(Ai)){Ai=null}}if(Ai==null){if(Af.required){AM=true}if(Af.defaultValue!=null){Ai=Af.defaultValue}}}Ab[AZ+AV]=Ai}}if(AM){for(AV=0;AV<AX;++AV){Ai=Ab[AZ+AV];if(Ai!=null){Af=Ae[AV];if(Af.x){AN(AR.xaxis,Ai,Ai)}if(Af.y){AN(AR.yaxis,Ai,Ai)}}Ab[AZ+AV]=null}}else{if(insertSteps&&AZ>0&&Ab[AZ-AX]!=null&&Ab[AZ-AX]!=Ab[AZ]&&Ab[AZ-AX+1]!=Ab[AZ+1]){for(AV=0;AV<AX;++AV){Ab[AZ+AX+AV]=Ab[AZ+AV]}Ab[AZ+1]=Ab[AZ-AX+1];AZ+=AX}}}}for(Ac=0;Ac<O.length;++Ac){AR=O[Ac];Z(L.processDatapoints,[AR,AR.datapoints])}for(Ac=0;Ac<O.length;++Ac){AR=O[Ac];Ab=AR.datapoints.points,AX=AR.datapoints.pointsize;var AS=AW,AY=AW,AU=AQ,Ad=AQ;for(Aa=0;Aa<Ab.length;Aa+=AX){if(Ab[Aa]==null){continue}for(AV=0;AV<AX;++AV){Ai=Ab[Aa+AV];Af=Ae[AV];if(!Af){continue}if(Af.x){if(Ai<AS){AS=Ai}if(Ai>AU){AU=Ai}}if(Af.y){if(Ai<AY){AY=Ai}if(Ai>Ad){Ad=Ai}}}}if(AR.bars.show){var Ag=AR.bars.align=="left"?0:-AR.bars.barWidth/2;if(AR.bars.horizontal){AY+=Ag;Ad+=Ag+AR.bars.barWidth}else{AS+=Ag;AU+=Ag+AR.bars.barWidth}}AN(AR.xaxis,AS,AU);AN(AR.yaxis,AY,Ad)}for(AK in s){if(s[AK].datamin==AW){s[AK].datamin=null}if(s[AK].datamax==AQ){s[AK].datamax=null}}}function c(){function AK(AM,AL){var AN=document.createElement("canvas");AN.width=AM;AN.height=AL;if(C.browser.msie){AN=window.G_vmlCanvasManager.initElement(AN)}return AN}y=l.width();Q=l.height();l.html("");if(l.css("position")=="static"){l.css("position","relative")}if(y<=0||Q<=0){throw"Invalid dimensions for plot, width = "+y+", height = "+Q}if(C.browser.msie){window.G_vmlCanvasManager.init_(document)}P=C(AK(y,Q)).appendTo(l).get(0);Y=P.getContext("2d");AC=C(AK(y,Q)).css({position:"absolute",left:0,top:0}).appendTo(l).get(0);AJ=AC.getContext("2d");AJ.stroke()}function AG(){AD=C([AC,P]);if(g.grid.hoverable){AD.mousemove(D)}if(g.grid.clickable){AD.click(d)}Z(L.bindEvents,[AD])}function k(){function AL(AT,AU){function AP(AV){return AV}var AS,AO,AQ=AU.transform||AP,AR=AU.inverseTransform;if(AT==s.xaxis||AT==s.x2axis){AS=AT.scale=I/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.min);if(AQ==AP){AT.p2c=function(AV){return(AV-AO)*AS}}else{AT.p2c=function(AV){return(AQ(AV)-AO)*AS}}if(!AR){AT.c2p=function(AV){return AO+AV/AS}}else{AT.c2p=function(AV){return AR(AO+AV/AS)}}}else{AS=AT.scale=t/(AQ(AT.max)-AQ(AT.min));AO=AQ(AT.max);if(AQ==AP){AT.p2c=function(AV){return(AO-AV)*AS}}else{AT.p2c=function(AV){return(AO-AQ(AV))*AS}}if(!AR){AT.c2p=function(AV){return AO-AV/AS}}else{AT.c2p=function(AV){return AR(AO-AV/AS)}}}}function AN(AR,AT){var AQ,AS=[],AP;AR.labelWidth=AT.labelWidth;AR.labelHeight=AT.labelHeight;if(AR==s.xaxis||AR==s.x2axis){if(AR.labelWidth==null){AR.labelWidth=y/(AR.ticks.length>0?AR.ticks.length:1)}if(AR.labelHeight==null){AS=[];for(AQ=0;AQ<AR.ticks.length;++AQ){AP=AR.ticks[AQ].label;if(AP){AS.push('<div class="tickLabel" style="float:left;width:'+AR.labelWidth+'px">'+AP+"</div>")}}if(AS.length>0){var AO=C('<div style="position:absolute;top:-10000px;width:10000px;font-size:smaller">'+AS.join("")+'<div style="clear:left"></div></div>').appendTo(l);AR.labelHeight=AO.height();AO.remove()}}}else{if(AR.labelWidth==null||AR.labelHeight==null){for(AQ=0;AQ<AR.ticks.length;++AQ){AP=AR.ticks[AQ].label;if(AP){AS.push('<div class="tickLabel">'+AP+"</div>")}}if(AS.length>0){var AO=C('<div style="position:absolute;top:-10000px;font-size:smaller">'+AS.join("")+"</div>").appendTo(l);if(AR.labelWidth==null){AR.labelWidth=AO.width()}if(AR.labelHeight==null){AR.labelHeight=AO.find("div").height()}AO.remove()}}}if(AR.labelWidth==null){AR.labelWidth=0}if(AR.labelHeight==null){AR.labelHeight=0}}function AM(){var AP=g.grid.borderWidth;for(i=0;i<O.length;++i){AP=Math.max(AP,2*(O[i].points.radius+O[i].points.lineWidth/2))}e.left=e.right=e.top=e.bottom=AP;var AO=g.grid.labelMargin+g.grid.borderWidth;if(s.xaxis.labelHeight>0){e.bottom=Math.max(AP,s.xaxis.labelHeight+AO)}if(s.yaxis.labelWidth>0){e.left=Math.max(AP,s.yaxis.labelWidth+AO)}if(s.x2axis.labelHeight>0){e.top=Math.max(AP,s.x2axis.labelHeight+AO)}if(s.y2axis.labelWidth>0){e.right=Math.max(AP,s.y2axis.labelWidth+AO)}I=y-e.left-e.right;t=Q-e.bottom-e.top}var AK;for(AK in s){K(s[AK],g[AK])}if(g.grid.show){for(AK in s){F(s[AK],g[AK]);p(s[AK],g[AK]);AN(s[AK],g[AK])}AM()}else{e.left=e.right=e.top=e.bottom=0;I=y;t=Q}for(AK in s){AL(s[AK],g[AK])}if(g.grid.show){h()}AI()}function K(AN,AQ){var AM=+(AQ.min!=null?AQ.min:AN.datamin),AK=+(AQ.max!=null?AQ.max:AN.datamax),AP=AK-AM;if(AP==0){var AL=AK==0?1:0.01;if(AQ.min==null){AM-=AL}if(AQ.max==null||AQ.min!=null){AK+=AL}}else{var AO=AQ.autoscaleMargin;if(AO!=null){if(AQ.min==null){AM-=AP*AO;if(AM<0&&AN.datamin!=null&&AN.datamin>=0){AM=0}}if(AQ.max==null){AK+=AP*AO;if(AK>0&&AN.datamax!=null&&AN.datamax<=0){AK=0}}}}AN.min=AM;AN.max=AK}function F(AP,AS){var AO;if(typeof AS.ticks=="number"&&AS.ticks>0){AO=AS.ticks}else{if(AP==s.xaxis||AP==s.x2axis){AO=0.3*Math.sqrt(y)}else{AO=0.3*Math.sqrt(Q)}}var AX=(AP.max-AP.min)/AO,AZ,AT,AV,AW,AR,AM,AL;if(AS.mode=="time"){var AU={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var AY=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var AN=0;if(AS.minTickSize!=null){if(typeof AS.tickSize=="number"){AN=AS.tickSize}else{AN=AS.minTickSize[0]*AU[AS.minTickSize[1]]}}for(AR=0;AR<AY.length-1;++AR){if(AX<(AY[AR][0]*AU[AY[AR][1]]+AY[AR+1][0]*AU[AY[AR+1][1]])/2&&AY[AR][0]*AU[AY[AR][1]]>=AN){break}}AZ=AY[AR][0];AV=AY[AR][1];if(AV=="year"){AM=Math.pow(10,Math.floor(Math.log(AX/AU.year)/Math.LN10));AL=(AX/AU.year)/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM}if(AS.tickSize){AZ=AS.tickSize[0];AV=AS.tickSize[1]}AT=function(Ac){var Ah=[],Af=Ac.tickSize[0],Ai=Ac.tickSize[1],Ag=new Date(Ac.min);var Ab=Af*AU[Ai];if(Ai=="second"){Ag.setUTCSeconds(A(Ag.getUTCSeconds(),Af))}if(Ai=="minute"){Ag.setUTCMinutes(A(Ag.getUTCMinutes(),Af))}if(Ai=="hour"){Ag.setUTCHours(A(Ag.getUTCHours(),Af))}if(Ai=="month"){Ag.setUTCMonth(A(Ag.getUTCMonth(),Af))}if(Ai=="year"){Ag.setUTCFullYear(A(Ag.getUTCFullYear(),Af))}Ag.setUTCMilliseconds(0);if(Ab>=AU.minute){Ag.setUTCSeconds(0)}if(Ab>=AU.hour){Ag.setUTCMinutes(0)}if(Ab>=AU.day){Ag.setUTCHours(0)}if(Ab>=AU.day*4){Ag.setUTCDate(1)}if(Ab>=AU.year){Ag.setUTCMonth(0)}var Ak=0,Aj=Number.NaN,Ad;do{Ad=Aj;Aj=Ag.getTime();Ah.push({v:Aj,label:Ac.tickFormatter(Aj,Ac)});if(Ai=="month"){if(Af<1){Ag.setUTCDate(1);var Aa=Ag.getTime();Ag.setUTCMonth(Ag.getUTCMonth()+1);var Ae=Ag.getTime();Ag.setTime(Aj+Ak*AU.hour+(Ae-Aa)*Af);Ak=Ag.getUTCHours();Ag.setUTCHours(0)}else{Ag.setUTCMonth(Ag.getUTCMonth()+Af)}}else{if(Ai=="year"){Ag.setUTCFullYear(Ag.getUTCFullYear()+Af)}else{Ag.setTime(Aj+Ab)}}}while(Aj<Ac.max&&Aj!=Ad);return Ah};AW=function(Aa,Ad){var Af=new Date(Aa);if(AS.timeformat!=null){return C.plot.formatDate(Af,AS.timeformat,AS.monthNames)}var Ab=Ad.tickSize[0]*AU[Ad.tickSize[1]];var Ac=Ad.max-Ad.min;var Ae=(AS.twelveHourClock)?" %p":"";if(Ab<AU.minute){fmt="%h:%M:%S"+Ae}else{if(Ab<AU.day){if(Ac<2*AU.day){fmt="%h:%M"+Ae}else{fmt="%b %d %h:%M"+Ae}}else{if(Ab<AU.month){fmt="%b %d"}else{if(Ab<AU.year){if(Ac<AU.year){fmt="%b"}else{fmt="%b %y"}}else{fmt="%y"}}}}return C.plot.formatDate(Af,fmt,AS.monthNames)}}else{var AK=AS.tickDecimals;var AQ=-Math.floor(Math.log(AX)/Math.LN10);if(AK!=null&&AQ>AK){AQ=AK}AM=Math.pow(10,-AQ);AL=AX/AM;if(AL<1.5){AZ=1}else{if(AL<3){AZ=2;if(AL>2.25&&(AK==null||AQ+1<=AK)){AZ=2.5;++AQ}}else{if(AL<7.5){AZ=5}else{AZ=10}}}AZ*=AM;if(AS.minTickSize!=null&&AZ<AS.minTickSize){AZ=AS.minTickSize}if(AS.tickSize!=null){AZ=AS.tickSize}AP.tickDecimals=Math.max(0,(AK!=null)?AK:AQ);AT=function(Ac){var Ae=[];var Af=A(Ac.min,Ac.tickSize),Ab=0,Aa=Number.NaN,Ad;do{Ad=Aa;Aa=Af+Ab*Ac.tickSize;Ae.push({v:Aa,label:Ac.tickFormatter(Aa,Ac)});++Ab}while(Aa<Ac.max&&Aa!=Ad);return Ae};AW=function(Aa,Ab){return Aa.toFixed(Ab.tickDecimals)}}AP.tickSize=AV?[AZ,AV]:AZ;AP.tickGenerator=AT;if(C.isFunction(AS.tickFormatter)){AP.tickFormatter=function(Aa,Ab){return""+AS.tickFormatter(Aa,Ab)}}else{AP.tickFormatter=AW}}function p(AO,AQ){AO.ticks=[];if(!AO.used){return }if(AQ.ticks==null){AO.ticks=AO.tickGenerator(AO)}else{if(typeof AQ.ticks=="number"){if(AQ.ticks>0){AO.ticks=AO.tickGenerator(AO)}}else{if(AQ.ticks){var AP=AQ.ticks;if(C.isFunction(AP)){AP=AP({min:AO.min,max:AO.max})}var AN,AK;for(AN=0;AN<AP.length;++AN){var AL=null;var AM=AP[AN];if(typeof AM=="object"){AK=AM[0];if(AM.length>1){AL=AM[1]}}else{AK=AM}if(AL==null){AL=AO.tickFormatter(AK,AO)}AO.ticks[AN]={v:AK,label:AL}}}}}if(AQ.autoscaleMargin!=null&&AO.ticks.length>0){if(AQ.min==null){AO.min=Math.min(AO.min,AO.ticks[0].v)}if(AQ.max==null&&AO.ticks.length>1){AO.max=Math.max(AO.max,AO.ticks[AO.ticks.length-1].v)}}}function AH(){Y.clearRect(0,0,y,Q);var AL=g.grid;if(AL.show&&!AL.aboveData){S()}for(var AK=0;AK<O.length;++AK){AA(O[AK])}Z(L.draw,[Y]);if(AL.show&&AL.aboveData){S()}}function N(AL,AR){var AO=AR+"axis",AK=AR+"2axis",AN,AQ,AP,AM;if(AL[AO]){AN=s[AO];AQ=AL[AO].from;AP=AL[AO].to}else{if(AL[AK]){AN=s[AK];AQ=AL[AK].from;AP=AL[AK].to}else{AN=s[AO];AQ=AL[AR+"1"];AP=AL[AR+"2"]}}if(AQ!=null&&AP!=null&&AQ>AP){return{from:AP,to:AQ,axis:AN}}return{from:AQ,to:AP,axis:AN}}function S(){var AO;Y.save();Y.translate(e.left,e.top);if(g.grid.backgroundColor){Y.fillStyle=R(g.grid.backgroundColor,t,0,"rgba(255, 255, 255, 0)");Y.fillRect(0,0,I,t)}var AL=g.grid.markings;if(AL){if(C.isFunction(AL)){AL=AL({xmin:s.xaxis.min,xmax:s.xaxis.max,ymin:s.yaxis.min,ymax:s.yaxis.max,xaxis:s.xaxis,yaxis:s.yaxis,x2axis:s.x2axis,y2axis:s.y2axis})}for(AO=0;AO<AL.length;++AO){var AK=AL[AO],AQ=N(AK,"x"),AN=N(AK,"y");if(AQ.from==null){AQ.from=AQ.axis.min}if(AQ.to==null){AQ.to=AQ.axis.max}if(AN.from==null){AN.from=AN.axis.min}if(AN.to==null){AN.to=AN.axis.max}if(AQ.to<AQ.axis.min||AQ.from>AQ.axis.max||AN.to<AN.axis.min||AN.from>AN.axis.max){continue}AQ.from=Math.max(AQ.from,AQ.axis.min);AQ.to=Math.min(AQ.to,AQ.axis.max);AN.from=Math.max(AN.from,AN.axis.min);AN.to=Math.min(AN.to,AN.axis.max);if(AQ.from==AQ.to&&AN.from==AN.to){continue}AQ.from=AQ.axis.p2c(AQ.from);AQ.to=AQ.axis.p2c(AQ.to);AN.from=AN.axis.p2c(AN.from);AN.to=AN.axis.p2c(AN.to);if(AQ.from==AQ.to||AN.from==AN.to){Y.beginPath();Y.strokeStyle=AK.color||g.grid.markingsColor;Y.lineWidth=AK.lineWidth||g.grid.markingsLineWidth;Y.moveTo(AQ.from,AN.from);Y.lineTo(AQ.to,AN.to);Y.stroke()}else{Y.fillStyle=AK.color||g.grid.markingsColor;Y.fillRect(AQ.from,AN.to,AQ.to-AQ.from,AN.from-AN.to)}}}Y.lineWidth=1;Y.strokeStyle=g.grid.tickColor;Y.beginPath();var AM,AP=s.xaxis;for(AO=0;AO<AP.ticks.length;++AO){AM=AP.ticks[AO].v;if(AM<=AP.min||AM>=s.xaxis.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,0);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,t)}AP=s.yaxis;for(AO=0;AO<AP.ticks.length;++AO){AM=AP.ticks[AO].v;if(AM<=AP.min||AM>=AP.max){continue}Y.moveTo(0,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}AP=s.x2axis;for(AO=0;AO<AP.ticks.length;++AO){AM=AP.ticks[AO].v;if(AM<=AP.min||AM>=AP.max){continue}Y.moveTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,-5);Y.lineTo(Math.floor(AP.p2c(AM))+Y.lineWidth/2,5)}AP=s.y2axis;for(AO=0;AO<AP.ticks.length;++AO){AM=AP.ticks[AO].v;if(AM<=AP.min||AM>=AP.max){continue}Y.moveTo(I-5,Math.floor(AP.p2c(AM))+Y.lineWidth/2);Y.lineTo(I+5,Math.floor(AP.p2c(AM))+Y.lineWidth/2)}Y.stroke();if(g.grid.borderWidth){var AR=g.grid.borderWidth;Y.lineWidth=AR;Y.strokeStyle=g.grid.borderColor;Y.strokeRect(-AR/2,-AR/2,I+AR,t+AR)}Y.restore()}function h(){l.find(".tickLabels").remove();var AK=['<div class="tickLabels" style="font-size:smaller;color:'+g.grid.color+'">'];function AM(AP,AQ){for(var AO=0;AO<AP.ticks.length;++AO){var AN=AP.ticks[AO];if(!AN.label||AN.v<AP.min||AN.v>AP.max){continue}AK.push(AQ(AN,AP))}}var AL=g.grid.labelMargin+g.grid.borderWidth;AM(s.xaxis,function(AN,AO){return'<div style="position:absolute;top:'+(e.top+t+AL)+"px;left:"+Math.round(e.left+AO.p2c(AN.v)-AO.labelWidth/2)+"px;width:"+AO.labelWidth+'px;text-align:center" class="tickLabel">'+AN.label+"</div>"});AM(s.yaxis,function(AN,AO){return'<div style="position:absolute;top:'+Math.round(e.top+AO.p2c(AN.v)-AO.labelHeight/2)+"px;right:"+(e.right+I+AL)+"px;width:"+AO.labelWidth+'px;text-align:right" class="tickLabel">'+AN.label+"</div>"});AM(s.x2axis,function(AN,AO){return'<div style="position:absolute;bottom:'+(e.bottom+t+AL)+"px;left:"+Math.round(e.left+AO.p2c(AN.v)-AO.labelWidth/2)+"px;width:"+AO.labelWidth+'px;text-align:center" class="tickLabel">'+AN.label+"</div>"});AM(s.y2axis,function(AN,AO){return'<div style="position:absolute;top:'+Math.round(e.top+AO.p2c(AN.v)-AO.labelHeight/2)+"px;left:"+(e.left+I+AL)+"px;width:"+AO.labelWidth+'px;text-align:left" class="tickLabel">'+AN.label+"</div>"});AK.push("</div>");l.append(AK.join(""))}function AA(AK){if(AK.lines.show){a(AK)}if(AK.bars.show){n(AK)}if(AK.points.show){o(AK)}}function a(AN){function AM(AY,AZ,AR,Ad,Ac){var Ae=AY.points,AS=AY.pointsize,AW=null,AV=null;Y.beginPath();for(var AX=AS;AX<Ae.length;AX+=AS){var AU=Ae[AX-AS],Ab=Ae[AX-AS+1],AT=Ae[AX],Aa=Ae[AX+1];if(AU==null||AT==null){continue}if(Ab<=Aa&&Ab<Ac.min){if(Aa<Ac.min){continue}AU=(Ac.min-Ab)/(Aa-Ab)*(AT-AU)+AU;Ab=Ac.min}else{if(Aa<=Ab&&Aa<Ac.min){if(Ab<Ac.min){continue}AT=(Ac.min-Ab)/(Aa-Ab)*(AT-AU)+AU;Aa=Ac.min}}if(Ab>=Aa&&Ab>Ac.max){if(Aa>Ac.max){continue}AU=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(Aa>=Ab&&Aa>Ac.max){if(Ab>Ac.max){continue}AT=(Ac.max-Ab)/(Aa-Ab)*(AT-AU)+AU;Aa=Ac.max}}if(AU<=AT&&AU<Ad.min){if(AT<Ad.min){continue}Ab=(Ad.min-AU)/(AT-AU)*(Aa-Ab)+Ab;AU=Ad.min}else{if(AT<=AU&&AT<Ad.min){if(AU<Ad.min){continue}Aa=(Ad.min-AU)/(AT-AU)*(Aa-Ab)+Ab;AT=Ad.min}}if(AU>=AT&&AU>Ad.max){if(AT>Ad.max){continue}Ab=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AU=Ad.max}else{if(AT>=AU&&AT>Ad.max){if(AU>Ad.max){continue}Aa=(Ad.max-AU)/(AT-AU)*(Aa-Ab)+Ab;AT=Ad.max}}if(AU!=AW||Ab!=AV){Y.moveTo(Ad.p2c(AU)+AZ,Ac.p2c(Ab)+AR)}AW=AT;AV=Aa;Y.lineTo(Ad.p2c(AT)+AZ,Ac.p2c(Aa)+AR)}Y.stroke()}function AO(AX,Ae,Ac){var Af=AX.points,AR=AX.pointsize,AS=Math.min(Math.max(0,Ac.min),Ac.max),Aa,AV=0,Ad=false;for(var AW=AR;AW<Af.length;AW+=AR){var AU=Af[AW-AR],Ab=Af[AW-AR+1],AT=Af[AW],AZ=Af[AW+1];if(Ad&&AU!=null&&AT==null){Y.lineTo(Ae.p2c(AV),Ac.p2c(AS));Y.fill();Ad=false;continue}if(AU==null||AT==null){continue}if(AU<=AT&&AU<Ae.min){if(AT<Ae.min){continue}Ab=(Ae.min-AU)/(AT-AU)*(AZ-Ab)+Ab;AU=Ae.min}else{if(AT<=AU&&AT<Ae.min){if(AU<Ae.min){continue}AZ=(Ae.min-AU)/(AT-AU)*(AZ-Ab)+Ab;AT=Ae.min}}if(AU>=AT&&AU>Ae.max){if(AT>Ae.max){continue}Ab=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AU=Ae.max}else{if(AT>=AU&&AT>Ae.max){if(AU>Ae.max){continue}AZ=(Ae.max-AU)/(AT-AU)*(AZ-Ab)+Ab;AT=Ae.max}}if(!Ad){Y.beginPath();Y.moveTo(Ae.p2c(AU),Ac.p2c(AS));Ad=true}if(Ab>=Ac.max&&AZ>=Ac.max){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.max));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.max));AV=AT;continue}else{if(Ab<=Ac.min&&AZ<=Ac.min){Y.lineTo(Ae.p2c(AU),Ac.p2c(Ac.min));Y.lineTo(Ae.p2c(AT),Ac.p2c(Ac.min));AV=AT;continue}}var Ag=AU,AY=AT;if(Ab<=AZ&&Ab<Ac.min&&AZ>=Ac.min){AU=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.min}else{if(AZ<=Ab&&AZ<Ac.min&&Ab>=Ac.min){AT=(Ac.min-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.min}}if(Ab>=AZ&&Ab>Ac.max&&AZ<=Ac.max){AU=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;Ab=Ac.max}else{if(AZ>=Ab&&AZ>Ac.max&&Ab<=Ac.max){AT=(Ac.max-Ab)/(AZ-Ab)*(AT-AU)+AU;AZ=Ac.max}}if(AU!=Ag){if(Ab<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(Ag),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AU),Ac.p2c(Aa))}Y.lineTo(Ae.p2c(AU),Ac.p2c(Ab));Y.lineTo(Ae.p2c(AT),Ac.p2c(AZ));if(AT!=AY){if(AZ<=Ac.min){Aa=Ac.min}else{Aa=Ac.max}Y.lineTo(Ae.p2c(AT),Ac.p2c(Aa));Y.lineTo(Ae.p2c(AY),Ac.p2c(Aa))}AV=Math.max(AT,AY)}if(Ad){Y.lineTo(Ae.p2c(AV),Ac.p2c(AS));Y.fill()}}Y.save();Y.translate(e.left,e.top);Y.lineJoin="round";var AP=AN.lines.lineWidth,AK=AN.shadowSize;if(AP>0&&AK>0){Y.lineWidth=AK;Y.strokeStyle="rgba(0,0,0,0.1)";var AQ=Math.PI/18;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/2),Math.cos(AQ)*(AP/2+AK/2),AN.xaxis,AN.yaxis);Y.lineWidth=AK/2;AM(AN.datapoints,Math.sin(AQ)*(AP/2+AK/4),Math.cos(AQ)*(AP/2+AK/4),AN.xaxis,AN.yaxis)}Y.lineWidth=AP;Y.strokeStyle=AN.color;var AL=V(AN.lines,AN.color,0,t);if(AL){Y.fillStyle=AL;AO(AN.datapoints,AN.xaxis,AN.yaxis)}if(AP>0){AM(AN.datapoints,0,0,AN.xaxis,AN.yaxis)}Y.restore()}function o(AN){function AP(AU,AT,Ab,AR,AV,AZ,AY){var Aa=AU.points,AQ=AU.pointsize;for(var AS=0;AS<Aa.length;AS+=AQ){var AX=Aa[AS],AW=Aa[AS+1];if(AX==null||AX<AZ.min||AX>AZ.max||AW<AY.min||AW>AY.max){continue}Y.beginPath();Y.arc(AZ.p2c(AX),AY.p2c(AW)+AR,AT,0,AV,false);if(Ab){Y.fillStyle=Ab;Y.fill()}Y.stroke()}}Y.save();Y.translate(e.left,e.top);var AO=AN.lines.lineWidth,AL=AN.shadowSize,AK=AN.points.radius;if(AO>0&&AL>0){var AM=AL/2;Y.lineWidth=AM;Y.strokeStyle="rgba(0,0,0,0.1)";AP(AN.datapoints,AK,null,AM+AM/2,Math.PI,AN.xaxis,AN.yaxis);Y.strokeStyle="rgba(0,0,0,0.2)";AP(AN.datapoints,AK,null,AM/2,Math.PI,AN.xaxis,AN.yaxis)}Y.lineWidth=AO;Y.strokeStyle=AN.color;AP(AN.datapoints,AK,V(AN.points,AN.color),0,2*Math.PI,AN.xaxis,AN.yaxis);Y.restore()}function AB(AV,AU,Ad,AQ,AY,AN,AL,AT,AS,Ac,AZ){var AM,Ab,AR,AX,AO,AK,AW,AP,Aa;if(AZ){AP=AK=AW=true;AO=false;AM=Ad;Ab=AV;AX=AU+AQ;AR=AU+AY;if(Ab<AM){Aa=Ab;Ab=AM;AM=Aa;AO=true;AK=false}}else{AO=AK=AW=true;AP=false;AM=AV+AQ;Ab=AV+AY;AR=Ad;AX=AU;if(AX<AR){Aa=AX;AX=AR;AR=Aa;AP=true;AW=false}}if(Ab<AT.min||AM>AT.max||AX<AS.min||AR>AS.max){return }if(AM<AT.min){AM=AT.min;AO=false}if(Ab>AT.max){Ab=AT.max;AK=false}if(AR<AS.min){AR=AS.min;AP=false}if(AX>AS.max){AX=AS.max;AW=false}AM=AT.p2c(AM);AR=AS.p2c(AR);Ab=AT.p2c(Ab);AX=AS.p2c(AX);if(AL){Ac.beginPath();Ac.moveTo(AM,AR);Ac.lineTo(AM,AX);Ac.lineTo(Ab,AX);Ac.lineTo(Ab,AR);Ac.fillStyle=AL(AR,AX);Ac.fill()}if(AO||AK||AW||AP){Ac.beginPath();Ac.moveTo(AM,AR+AN);if(AO){Ac.lineTo(AM,AX+AN)}else{Ac.moveTo(AM,AX+AN)}if(AW){Ac.lineTo(Ab,AX+AN)}else{Ac.moveTo(Ab,AX+AN)}if(AK){Ac.lineTo(Ab,AR+AN)}else{Ac.moveTo(Ab,AR+AN)}if(AP){Ac.lineTo(AM,AR+AN)}else{Ac.moveTo(AM,AR+AN)}Ac.stroke()}}function n(AM){function AL(AS,AR,AU,AP,AT,AW,AV){var AX=AS.points,AO=AS.pointsize;for(var AQ=0;AQ<AX.length;AQ+=AO){if(AX[AQ]==null){continue}AB(AX[AQ],AX[AQ+1],AX[AQ+2],AR,AU,AP,AT,AW,AV,Y,AM.bars.horizontal)}}Y.save();Y.translate(e.left,e.top);Y.lineWidth=AM.bars.lineWidth;Y.strokeStyle=AM.color;var AK=AM.bars.align=="left"?0:-AM.bars.barWidth/2;var AN=AM.bars.fill?function(AO,AP){return V(AM.bars,AM.color,AO,AP)}:null;AL(AM.datapoints,AK,AK+AM.bars.barWidth,0,AN,AM.xaxis,AM.yaxis);Y.restore()}function V(AM,AK,AL,AO){var AN=AM.fill;if(!AN){return null}if(AM.fillColor){return R(AM.fillColor,AL,AO,AK)}var AP=C.color.parse(AK);AP.a=typeof AN=="number"?AN:0.4;AP.normalize();return AP.toString()}function AI(){l.find(".legend").remove();if(!g.legend.show){return }var AP=[],AN=false,AV=g.legend.labelFormatter,AU,AR;for(i=0;i<O.length;++i){AU=O[i];AR=AU.label;if(!AR){continue}if(i%g.legend.noColumns==0){if(AN){AP.push("</tr>")}AP.push("<tr>");AN=true}if(AV){AR=AV(AR,AU)}AP.push('<td class="legendColorBox"><div style="border:1px solid '+g.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+AU.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+AR+"</td>")}if(AN){AP.push("</tr>")}if(AP.length==0){return }var AT='<table style="font-size:smaller;color:'+g.grid.color+'">'+AP.join("")+"</table>";if(g.legend.container!=null){C(g.legend.container).html(AT)}else{var AQ="",AL=g.legend.position,AM=g.legend.margin;if(AM[0]==null){AM=[AM,AM]}if(AL.charAt(0)=="n"){AQ+="top:"+(AM[1]+e.top)+"px;"}else{if(AL.charAt(0)=="s"){AQ+="bottom:"+(AM[1]+e.bottom)+"px;"}}if(AL.charAt(1)=="e"){AQ+="right:"+(AM[0]+e.right)+"px;"}else{if(AL.charAt(1)=="w"){AQ+="left:"+(AM[0]+e.left)+"px;"}}var AS=C('<div class="legend">'+AT.replace('style="','style="position:absolute;'+AQ+";")+"</div>").appendTo(l);if(g.legend.backgroundOpacity!=0){var AO=g.legend.backgroundColor;if(AO==null){AO=g.grid.backgroundColor;if(AO&&typeof AO=="string"){AO=C.color.parse(AO)}else{AO=C.color.extract(AS,"background-color")}AO.a=1;AO=AO.toString()}var AK=AS.children();C('<div style="position:absolute;width:'+AK.width()+"px;height:"+AK.height()+"px;"+AQ+"background-color:"+AO+';"> </div>').prependTo(AS).css("opacity",g.legend.backgroundOpacity)}}}var w=[],J=null;function AF(AR,AP,AM){var AX=g.grid.mouseActiveRadius,Aj=AX*AX+1,Ah=null,Aa=false,Af,Ad;for(Af=0;Af<O.length;++Af){if(!AM(O[Af])){continue}var AY=O[Af],AQ=AY.xaxis,AO=AY.yaxis,Ae=AY.datapoints.points,Ac=AY.datapoints.pointsize,AZ=AQ.c2p(AR),AW=AO.c2p(AP),AL=AX/AQ.scale,AK=AX/AO.scale;if(AY.lines.show||AY.points.show){for(Ad=0;Ad<Ae.length;Ad+=Ac){var AT=Ae[Ad],AS=Ae[Ad+1];if(AT==null){continue}if(AT-AZ>AL||AT-AZ<-AL||AS-AW>AK||AS-AW<-AK){continue}var AV=Math.abs(AQ.p2c(AT)-AR),AU=Math.abs(AO.p2c(AS)-AP),Ab=AV*AV+AU*AU;if(Ab<=Aj){Aj=Ab;Ah=[Af,Ad/Ac]}}}if(AY.bars.show&&!Ah){var AN=AY.bars.align=="left"?0:-AY.bars.barWidth/2,Ag=AN+AY.bars.barWidth;for(Ad=0;Ad<Ae.length;Ad+=Ac){var AT=Ae[Ad],AS=Ae[Ad+1],Ai=Ae[Ad+2];if(AT==null){continue}if(O[Af].bars.horizontal?(AZ<=Math.max(Ai,AT)&&AZ>=Math.min(Ai,AT)&&AW>=AS+AN&&AW<=AS+Ag):(AZ>=AT+AN&&AZ<=AT+Ag&&AW>=Math.min(Ai,AS)&&AW<=Math.max(Ai,AS))){Ah=[Af,Ad/Ac]}}}}if(Ah){Af=Ah[0];Ad=Ah[1];Ac=O[Af].datapoints.pointsize;return{datapoint:O[Af].datapoints.points.slice(Ad*Ac,(Ad+1)*Ac),dataIndex:Ad,series:O[Af],seriesIndex:Af}}return null}function D(AK){if(g.grid.hoverable){H("plothover",AK,function(AL){return AL.hoverable!=false})}}function d(AK){H("plotclick",AK,function(AL){return AL.clickable!=false})}function H(AL,AK,AM){var AN=AD.offset(),AS={pageX:AK.pageX,pageY:AK.pageY},AQ=AK.pageX-AN.left-e.left,AO=AK.pageY-AN.top-e.top;if(s.xaxis.used){AS.x=s.xaxis.c2p(AQ)}if(s.yaxis.used){AS.y=s.yaxis.c2p(AO)}if(s.x2axis.used){AS.x2=s.x2axis.c2p(AQ)}if(s.y2axis.used){AS.y2=s.y2axis.c2p(AO)}var AT=AF(AQ,AO,AM);if(AT){AT.pageX=parseInt(AT.series.xaxis.p2c(AT.datapoint[0])+AN.left+e.left);AT.pageY=parseInt(AT.series.yaxis.p2c(AT.datapoint[1])+AN.top+e.top)}if(g.grid.autoHighlight){for(var AP=0;AP<w.length;++AP){var AR=w[AP];if(AR.auto==AL&&!(AT&&AR.series==AT.series&&AR.point==AT.datapoint)){x(AR.series,AR.point)}}if(AT){AE(AT.series,AT.datapoint,AL)}}l.trigger(AL,[AS,AT])}function q(){if(!J){J=setTimeout(v,30)}}function v(){J=null;AJ.save();AJ.clearRect(0,0,y,Q);AJ.translate(e.left,e.top);var AL,AK;for(AL=0;AL<w.length;++AL){AK=w[AL];if(AK.series.bars.show){z(AK.series,AK.point)}else{u(AK.series,AK.point)}}AJ.restore();Z(L.drawOverlay,[AJ])}function AE(AM,AK,AN){if(typeof AM=="number"){AM=O[AM]}if(typeof AK=="number"){AK=AM.data[AK]}var AL=j(AM,AK);if(AL==-1){w.push({series:AM,point:AK,auto:AN});q()}else{if(!AN){w[AL].auto=false}}}function x(AM,AK){if(AM==null&&AK==null){w=[];q()}if(typeof AM=="number"){AM=O[AM]}if(typeof AK=="number"){AK=AM.data[AK]}var AL=j(AM,AK);if(AL!=-1){w.splice(AL,1);q()}}function j(AM,AN){for(var AK=0;AK<w.length;++AK){var AL=w[AK];if(AL.series==AM&&AL.point[0]==AN[0]&&AL.point[1]==AN[1]){return AK}}return -1}function u(AN,AM){var AL=AM[0],AR=AM[1],AQ=AN.xaxis,AP=AN.yaxis;if(AL<AQ.min||AL>AQ.max||AR<AP.min||AR>AP.max){return }var AO=AN.points.radius+AN.points.lineWidth/2;AJ.lineWidth=AO;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AK=1.5*AO;AJ.beginPath();AJ.arc(AQ.p2c(AL),AP.p2c(AR),AK,0,2*Math.PI,false);AJ.stroke()}function z(AN,AK){AJ.lineWidth=AN.bars.lineWidth;AJ.strokeStyle=C.color.parse(AN.color).scale("a",0.5).toString();var AM=C.color.parse(AN.color).scale("a",0.5).toString();var AL=AN.bars.align=="left"?0:-AN.bars.barWidth/2;AB(AK[0],AK[1],AK[2]||0,AL,AL+AN.bars.barWidth,0,function(){return AM},AN.xaxis,AN.yaxis,AJ,AN.bars.horizontal)}function R(AM,AL,AQ,AO){if(typeof AM=="string"){return AM}else{var AP=Y.createLinearGradient(0,AQ,0,AL);for(var AN=0,AK=AM.colors.length;AN<AK;++AN){var AR=AM.colors[AN];if(typeof AR!="string"){AR=C.color.parse(AO).scale("rgb",AR.brightness);AR.a*=AR.opacity;AR=AR.toString()}AP.addColorStop(AN/(AK-1),AR)}return AP}}}C.plot=function(G,E,D){var F=new B(C(G),E,D,C.plot.plugins);return F};C.plot.plugins=[];C.plot.formatDate=function(H,E,G){var L=function(N){N=""+N;return N.length==1?"0"+N:N};var D=[];var M=false;var K=H.getUTCHours();var I=K<12;if(G==null){G=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(E.search(/%p|%P/)!=-1){if(K>12){K=K-12}else{if(K==0){K=12}}}for(var F=0;F<E.length;++F){var J=E.charAt(F);if(M){switch(J){case"h":J=""+K;break;case"H":J=L(K);break;case"M":J=L(H.getUTCMinutes());break;case"S":J=L(H.getUTCSeconds());break;case"d":J=""+H.getUTCDate();break;case"m":J=""+(H.getUTCMonth()+1);break;case"y":J=""+H.getUTCFullYear();break;case"b":J=""+G[H.getUTCMonth()];break;case"p":J=(I)?("am"):("pm");break;case"P":J=(I)?("AM"):("PM");break}D.push(J);M=false}else{if(J=="%"){M=true}else{D.push(J)}}}return D.join("")};function A(E,D){return D*Math.floor(E/D)}})(jQuery);
\ No newline at end of file diff --git a/forum/skins/default/media/js/jquery.form.js b/forum/skins/default/media/js/jquery.form.js index 443114fd..443114fd 100755..100644 --- a/forum/skins/default/media/js/jquery.form.js +++ b/forum/skins/default/media/js/jquery.form.js diff --git a/forum/skins/default/media/js/jquery.i18n.js b/forum/skins/default/media/js/jquery.i18n.js index 0a155a31..0a155a31 100755..100644 --- a/forum/skins/default/media/js/jquery.i18n.js +++ b/forum/skins/default/media/js/jquery.i18n.js diff --git a/forum/skins/default/media/js/jquery.openid.js b/forum/skins/default/media/js/jquery.openid.js index af7d8cb9..af7d8cb9 100755..100644 --- a/forum/skins/default/media/js/jquery.openid.js +++ b/forum/skins/default/media/js/jquery.openid.js diff --git a/forum/skins/default/media/js/jquery.validate.pack.js b/forum/skins/default/media/js/jquery.validate.pack.js index 49134500..49134500 100755..100644 --- a/forum/skins/default/media/js/jquery.validate.pack.js +++ b/forum/skins/default/media/js/jquery.validate.pack.js diff --git a/forum/skins/default/media/js/se_hilite.js b/forum/skins/default/media/js/se_hilite.js index 42e99c8e..42e99c8e 100755..100644 --- a/forum/skins/default/media/js/se_hilite.js +++ b/forum/skins/default/media/js/se_hilite.js diff --git a/forum/skins/default/media/js/se_hilite_src.js b/forum/skins/default/media/js/se_hilite_src.js index b604f156..b604f156 100755..100644 --- a/forum/skins/default/media/js/se_hilite_src.js +++ b/forum/skins/default/media/js/se_hilite_src.js diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css index 2dd9260e..1a203164 100755 --- a/forum/skins/default/media/style/style.css +++ b/forum/skins/default/media/style/style.css @@ -2474,3 +2474,44 @@ p.signup_p { .wmd-preview li { margin-bottom:0.7em; } + +.karma-summary { + padding:5px; + font-size:13px; +} + +.karma-summary h3 { + text-align: center; + font-weight: bold; + padding:5px; +} + +.karma-diagram { + width:550px; + height:250px; + float:left; +} + +.karma-details { + float:right; + width:385px; + height:300px; + overflow-y:auto; + word-wrap:break-word; +} + +.karma-gained { + font-weight:bold; + background:#eee; + width:20px; + color:green; + padding:5px; +} + +.karma-lost { + font-weight:bold; + background:#eee; + width:20px; + color:red; + padding:5px; +} diff --git a/forum/skins/default/templates/404.html b/forum/skins/default/templates/404.html index 227de3ae..227de3ae 100755..100644 --- a/forum/skins/default/templates/404.html +++ b/forum/skins/default/templates/404.html diff --git a/forum/skins/default/templates/500.html b/forum/skins/default/templates/500.html index 51e73178..51e73178 100755..100644 --- a/forum/skins/default/templates/500.html +++ b/forum/skins/default/templates/500.html diff --git a/forum/skins/default/templates/about.html b/forum/skins/default/templates/about.html index 66dcc3fd..66dcc3fd 100755..100644 --- a/forum/skins/default/templates/about.html +++ b/forum/skins/default/templates/about.html diff --git a/forum/skins/default/templates/account_settings.html b/forum/skins/default/templates/account_settings.html index 91267d26..91267d26 100755..100644 --- a/forum/skins/default/templates/account_settings.html +++ b/forum/skins/default/templates/account_settings.html diff --git a/forum/skins/default/templates/answer_edit.html b/forum/skins/default/templates/answer_edit.html index 2d736f30..2d736f30 100755..100644 --- a/forum/skins/default/templates/answer_edit.html +++ b/forum/skins/default/templates/answer_edit.html diff --git a/forum/skins/default/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html index c390da06..c390da06 100755..100644 --- a/forum/skins/default/templates/answer_edit_tips.html +++ b/forum/skins/default/templates/answer_edit_tips.html diff --git a/forum/skins/default/templates/ask.html b/forum/skins/default/templates/ask.html index 083b01d9..083b01d9 100755..100644 --- a/forum/skins/default/templates/ask.html +++ b/forum/skins/default/templates/ask.html diff --git a/forum/skins/default/templates/badge.html b/forum/skins/default/templates/badge.html index af6aa2a2..af6aa2a2 100755..100644 --- a/forum/skins/default/templates/badge.html +++ b/forum/skins/default/templates/badge.html diff --git a/forum/skins/default/templates/badges.html b/forum/skins/default/templates/badges.html index 8de93df5..8de93df5 100755..100644 --- a/forum/skins/default/templates/badges.html +++ b/forum/skins/default/templates/badges.html diff --git a/forum/skins/default/templates/base.html b/forum/skins/default/templates/base.html index 6a06e7cd..1018da50 100755..100644 --- a/forum/skins/default/templates/base.html +++ b/forum/skins/default/templates/base.html @@ -18,11 +18,9 @@ <script src="http://www.google.com/jsapi" type="text/javascript"></script> <script type="text/javascript">google.load("jquery", "1.2.6");</script> <script type="text/javascript"> - /* <![CDATA[ */ var i18nLang = '{{settings.LANGUAGE_CODE}}'; var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}' var askbotSkin = '{{settings.ASKBOT_SKIN}}'; - /* ]] */ </script> <script type='text/javascript' src='{% media "/media/js/com.cnprog.i18n.js" %}'></script> <script type='text/javascript' src='{% media "/media/js/jquery.i18n.js" %}'></script> @@ -32,12 +30,10 @@ body { margin-top:2.4em; } </style> <script type="text/javascript"> - /* <![CDATA[ */ $(document).ready(function() { $('#validate_email_alert').click(function(){notify.close(true)}) notify.show(); }); - /* ]] */ </script> {% endif %} diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index c98e1f67..c98e1f67 100755..100644 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html diff --git a/forum/skins/default/templates/book.html b/forum/skins/default/templates/book.html index 8574fa73..8574fa73 100755..100644 --- a/forum/skins/default/templates/book.html +++ b/forum/skins/default/templates/book.html diff --git a/forum/skins/default/templates/close.html b/forum/skins/default/templates/close.html index d9e73507..d9e73507 100755..100644 --- a/forum/skins/default/templates/close.html +++ b/forum/skins/default/templates/close.html diff --git a/forum/skins/default/templates/edit_user_email_feeds_form.html b/forum/skins/default/templates/edit_user_email_feeds_form.html index 65902e7e..65902e7e 100755..100644 --- a/forum/skins/default/templates/edit_user_email_feeds_form.html +++ b/forum/skins/default/templates/edit_user_email_feeds_form.html diff --git a/forum/skins/default/templates/email_base.html b/forum/skins/default/templates/email_base.html index b74741e3..b74741e3 100755..100644 --- a/forum/skins/default/templates/email_base.html +++ b/forum/skins/default/templates/email_base.html diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html index e7b2b626..ca963237 100755..100644 --- a/forum/skins/default/templates/faq.html +++ b/forum/skins/default/templates/faq.html @@ -108,7 +108,7 @@ {% endcomment %} <div> <a id='gravatar'></a><h3 class="subtitle">{% trans "what is gravatar" %}</h3> - <p>{% trans "gravatar faq info" %}</p> + {% trans "gravatar faq info" %} </div> <div> <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3> diff --git a/forum/skins/default/templates/feedback.html b/forum/skins/default/templates/feedback.html index 38bb48ff..38bb48ff 100755..100644 --- a/forum/skins/default/templates/feedback.html +++ b/forum/skins/default/templates/feedback.html diff --git a/forum/skins/default/templates/feedback_email.txt b/forum/skins/default/templates/feedback_email.txt index df768180..df768180 100755..100644 --- a/forum/skins/default/templates/feedback_email.txt +++ b/forum/skins/default/templates/feedback_email.txt diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html index 9b7c5d98..9b7c5d98 100755..100644 --- a/forum/skins/default/templates/footer.html +++ b/forum/skins/default/templates/footer.html diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html index 099bfb85..099bfb85 100755..100644 --- a/forum/skins/default/templates/header.html +++ b/forum/skins/default/templates/header.html diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html index c2f36c9c..c2f36c9c 100755..100644 --- a/forum/skins/default/templates/index.html +++ b/forum/skins/default/templates/index.html diff --git a/forum/skins/default/templates/index_.html b/forum/skins/default/templates/index_.html index 5e4cf533..5e4cf533 100755..100644 --- a/forum/skins/default/templates/index_.html +++ b/forum/skins/default/templates/index_.html diff --git a/forum/skins/default/templates/logout.html b/forum/skins/default/templates/logout.html index 650ba044..650ba044 100755..100644 --- a/forum/skins/default/templates/logout.html +++ b/forum/skins/default/templates/logout.html diff --git a/forum/skins/default/templates/notarobot.html b/forum/skins/default/templates/notarobot.html index 698c5696..698c5696 100755..100644 --- a/forum/skins/default/templates/notarobot.html +++ b/forum/skins/default/templates/notarobot.html diff --git a/forum/skins/default/templates/pagesize.html b/forum/skins/default/templates/pagesize.html index 5037f1f6..5037f1f6 100755..100644 --- a/forum/skins/default/templates/pagesize.html +++ b/forum/skins/default/templates/pagesize.html diff --git a/forum/skins/default/templates/paginator.html b/forum/skins/default/templates/paginator.html index 2fba5425..2fba5425 100755..100644 --- a/forum/skins/default/templates/paginator.html +++ b/forum/skins/default/templates/paginator.html diff --git a/forum/skins/default/templates/post_contributor_info.html b/forum/skins/default/templates/post_contributor_info.html index 9997be5f..9997be5f 100755..100644 --- a/forum/skins/default/templates/post_contributor_info.html +++ b/forum/skins/default/templates/post_contributor_info.html diff --git a/forum/skins/default/templates/privacy.html b/forum/skins/default/templates/privacy.html index e66086dd..e66086dd 100755..100644 --- a/forum/skins/default/templates/privacy.html +++ b/forum/skins/default/templates/privacy.html diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html index 1c542c8b..1c542c8b 100755..100644 --- a/forum/skins/default/templates/question.html +++ b/forum/skins/default/templates/question.html diff --git a/forum/skins/default/templates/question_edit.html b/forum/skins/default/templates/question_edit.html index fe711849..fe711849 100755..100644 --- a/forum/skins/default/templates/question_edit.html +++ b/forum/skins/default/templates/question_edit.html diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html index 4cabea79..4cabea79 100755..100644 --- a/forum/skins/default/templates/question_edit_tips.html +++ b/forum/skins/default/templates/question_edit_tips.html diff --git a/forum/skins/default/templates/question_list.html b/forum/skins/default/templates/question_list.html index d822a267..d822a267 100755..100644 --- a/forum/skins/default/templates/question_list.html +++ b/forum/skins/default/templates/question_list.html diff --git a/forum/skins/default/templates/question_retag.html b/forum/skins/default/templates/question_retag.html index 03f3da04..03f3da04 100755..100644 --- a/forum/skins/default/templates/question_retag.html +++ b/forum/skins/default/templates/question_retag.html diff --git a/forum/skins/default/templates/question_summary_list_roll.html b/forum/skins/default/templates/question_summary_list_roll.html index 57685d6d..57685d6d 100755..100644 --- a/forum/skins/default/templates/question_summary_list_roll.html +++ b/forum/skins/default/templates/question_summary_list_roll.html diff --git a/forum/skins/default/templates/reopen.html b/forum/skins/default/templates/reopen.html index 37fb69c1..37fb69c1 100755..100644 --- a/forum/skins/default/templates/reopen.html +++ b/forum/skins/default/templates/reopen.html diff --git a/forum/skins/default/templates/revisions_answer.html b/forum/skins/default/templates/revisions_answer.html index b2e33dfe..b2e33dfe 100755..100644 --- a/forum/skins/default/templates/revisions_answer.html +++ b/forum/skins/default/templates/revisions_answer.html diff --git a/forum/skins/default/templates/revisions_question.html b/forum/skins/default/templates/revisions_question.html index 86d52a36..86d52a36 100755..100644 --- a/forum/skins/default/templates/revisions_question.html +++ b/forum/skins/default/templates/revisions_question.html diff --git a/forum/skins/default/templates/tag_selector.html b/forum/skins/default/templates/tag_selector.html index 5e3e2ad8..5e3e2ad8 100755..100644 --- a/forum/skins/default/templates/tag_selector.html +++ b/forum/skins/default/templates/tag_selector.html diff --git a/forum/skins/default/templates/tags.html b/forum/skins/default/templates/tags.html index 50f90fb1..50f90fb1 100755..100644 --- a/forum/skins/default/templates/tags.html +++ b/forum/skins/default/templates/tags.html diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html index 5931f31c..5931f31c 100755..100644 --- a/forum/skins/default/templates/user.html +++ b/forum/skins/default/templates/user.html diff --git a/forum/skins/default/templates/user_edit.html b/forum/skins/default/templates/user_edit.html index 040ebff4..8109949f 100755..100644 --- a/forum/skins/default/templates/user_edit.html +++ b/forum/skins/default/templates/user_edit.html @@ -26,10 +26,7 @@ {% else %}
<img src="{% media "/media/images/nophoto.png" %}">
{% endif %}
- <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
- <a href="http://www.gravatar.com/" target="_blank"
- title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
- </div>
+ <h1><a href="{% url faq %}#gravatar">change picture</a><h1>
</div>
<div id="askform" style="float:right;width:750px;text-align:left;">
diff --git a/forum/skins/default/templates/user_email_subscriptions.html b/forum/skins/default/templates/user_email_subscriptions.html index c0204cbc..9578046a 100755..100644 --- a/forum/skins/default/templates/user_email_subscriptions.html +++ b/forum/skins/default/templates/user_email_subscriptions.html @@ -11,7 +11,7 @@ {% if action_status %} <p class="action-status"><span>{{action_status}}</span></p> {% endif %} - <form method="POST"> + <form method="post" action=""> {% include "edit_user_email_feeds_form.html" %} <table class='form-as-table'> {{tag_filter_selection_form}} diff --git a/forum/skins/default/templates/user_favorites.html b/forum/skins/default/templates/user_favorites.html index 9db01e9a..9db01e9a 100755..100644 --- a/forum/skins/default/templates/user_favorites.html +++ b/forum/skins/default/templates/user_favorites.html diff --git a/forum/skins/default/templates/user_footer.html b/forum/skins/default/templates/user_footer.html index ee347742..ee347742 100755..100644 --- a/forum/skins/default/templates/user_footer.html +++ b/forum/skins/default/templates/user_footer.html diff --git a/forum/skins/default/templates/user_info.html b/forum/skins/default/templates/user_info.html index a583a57f..fda7133c 100755..100644 --- a/forum/skins/default/templates/user_info.html +++ b/forum/skins/default/templates/user_info.html @@ -5,7 +5,7 @@ {% load smart_if %} {% load i18n %} <div id="subheader" class="headUser"> - {{view_user.username}} + <a href="{% url user_profile view_user.id view_user.username|slugify %}">{{view_user.username}}</a> </div> <table class="user-info-table"> <tr> @@ -14,6 +14,9 @@ <tr> <td> {% gravatar view_user 128 %} + {% if request.user == view_user %} + <h1><a href="{% url faq %}#gravatar">{% trans "change picture" %}</a></h1> + {% endif %} </td> </tr> <tr> diff --git a/forum/skins/default/templates/user_recent.html b/forum/skins/default/templates/user_recent.html index b704ab25..b704ab25 100755..100644 --- a/forum/skins/default/templates/user_recent.html +++ b/forum/skins/default/templates/user_recent.html diff --git a/forum/skins/default/templates/user_reputation.html b/forum/skins/default/templates/user_reputation.html index 776935ae..954fb44d 100755..100644 --- a/forum/skins/default/templates/user_reputation.html +++ b/forum/skins/default/templates/user_reputation.html @@ -3,15 +3,15 @@ {% load extra_tags %} {% load extra_filters %} {% load humanize %} +{% load i18n %} {% block userjs %} - <script type='text/javascript' src='{% media "/media/js/excanvas.pack.js" %}'></script> - <script type='text/javascript' src='{% media "/media/js/jquery.flot.pack.js" %}'></script> + <script type='text/javascript' src='{% media "/media/js/excanvas.min.js" %}'></script> + <script type='text/javascript' src='{% media "/media/js/jquery.flot.min.js" %}'></script> <script type="text/javascript"> $().ready(function(){ var d = {{ reps }}; var placeholder = $("#diagram"); - var plot = $.plot(placeholder, [d], { xaxis: { mode: "time" }, points: { show: true }, @@ -22,19 +22,16 @@ </script> {% endblock %} {% block usercontent %} - <div style="padding:5px;font-size:13px;"> - <div id="diagram" style="width:550px;height:250px;float:left"> - - </div> - <div style="float:right; width:385px; height:300px; overflow-y:auto;word-wrap:break-word;" > + <div class="karma-summary"> + <div id="diagram" class="karma-diagram"></div> + <h3>{% trans "Change in karma per question or answer" %}</h3> + <div class="karma-details"> {% for rep in reputation %} - <p style="clear:both"> - <div style="float:left;text-align:right;font-family:arial;font-weight:bold;background:#eee;padding:2px 10px 2px 10px;margin-right:5px"> - <div style="float:left;width:20px;color:green;padding-right:5px">{{ rep.positive }}</div> - <div style="float:left;width:20px;color:red">{{ rep.negative }}</div> - - </div> - <a href="{% url question rep.question_id %}{{ rep.title|slugify }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span> + <p> + <span class="karma-gained">{{ rep.positive }}</span> + <span class="karma-lost">{{ rep.negative }}</span> + <a href="{% url question rep.question_id %}{{ rep.title|slugify }}">{{ rep.title }}</a> + <span class="small">({% diff_date rep.reputed_at %})</span> </p> {% endfor %} </div> diff --git a/forum/skins/default/templates/user_responses.html b/forum/skins/default/templates/user_responses.html index c4f4ffed..c4f4ffed 100755..100644 --- a/forum/skins/default/templates/user_responses.html +++ b/forum/skins/default/templates/user_responses.html diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html index 5ad1d71b..5ad1d71b 100755..100644 --- a/forum/skins/default/templates/user_stats.html +++ b/forum/skins/default/templates/user_stats.html diff --git a/forum/skins/default/templates/user_tabs.html b/forum/skins/default/templates/user_tabs.html index d0d52930..d0d52930 100755..100644 --- a/forum/skins/default/templates/user_tabs.html +++ b/forum/skins/default/templates/user_tabs.html diff --git a/forum/skins/default/templates/user_votes.html b/forum/skins/default/templates/user_votes.html index b56aab01..b56aab01 100755..100644 --- a/forum/skins/default/templates/user_votes.html +++ b/forum/skins/default/templates/user_votes.html diff --git a/forum/skins/default/templates/users.html b/forum/skins/default/templates/users.html index 4f92daa4..78715e05 100755..100644 --- a/forum/skins/default/templates/users.html +++ b/forum/skins/default/templates/users.html @@ -47,7 +47,7 @@ <div class="user"> <ul> - <li class="thumb"><a href="{% url user_profile user.id user.username|slugify %}">{% gravatar user 32 %}</a></li> + <li class="thumb">{% gravatar user 32 %}</li> <li><a href="{% url user_profile user.id user.username|slugify %}">{{user.username}}</a></li> <li>{% get_score_badge user %}</li> </ul> diff --git a/forum/skins/default/templates/users_questions.html b/forum/skins/default/templates/users_questions.html index 8049d832..6ebc4833 100755..100644 --- a/forum/skins/default/templates/users_questions.html +++ b/forum/skins/default/templates/users_questions.html @@ -25,22 +25,20 @@ <div class="favorites-empty"> </div> {% endif %} <div id="question-summary-{{question.id}}" class="question-summary narrow"> - <a style="text-decoration: none;" href="{% url question id=question.id %}{{question.title|slugify}}"> - <div class="stats"> - <div class="votes"> - <span class="vote-count-post">{{question.vote_count|intcomma}}</span> - {% trans "votes" %} - </div > - <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}"> - <span class="answer-count-post">{{question.answer_count|intcomma}}</span> - {% trans "answers" %} - </div> - <div class="views"> - <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span> - {% trans "views" %} - </div> + <div class="stats"> + <div class="votes"> + <span class="vote-count-post">{{question.vote_count|intcomma}}</span> + {% trans "votes" %} + </div > + <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}"> + <span class="answer-count-post">{{question.answer_count|intcomma}}</span> + {% trans "answers" %} </div> - </a> + <div class="views"> + <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span> + {% trans "views" %} + </div> + </div> <div class="summary"> <div class="question-title"> <a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a> diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py index 6dab868b..52f231fe 100755 --- a/forum/templatetags/extra_tags.py +++ b/forum/templatetags/extra_tags.py @@ -14,14 +14,19 @@ from django.utils.translation import ugettext as _ from django.utils.translation import ungettext from django.conf import settings from django.template.defaulttags import url as default_url +from django.template.defaultfilters import slugify +from django.core.urlresolvers import reverse from forum import skins register = template.Library() -GRAVATAR_TEMPLATE = ('<img class="gravatar" width="%(size)s" height="%(size)s" ' +GRAVATAR_TEMPLATE = ( + '<a style="text-decoration:none" ' + 'href="%(user_profile_url)s"><img class="gravatar" ' + 'width="%(size)s" height="%(size)s" ' 'src="http://www.gravatar.com/avatar/%(gravatar_hash)s' '?s=%(size)s&d=identicon&r=PG" ' - 'alt="%(username)s\'s gravatar image" />') + 'alt="%(username)s\'s gravatar image" /></a>') @register.simple_tag def gravatar(user, size): @@ -34,10 +39,15 @@ def gravatar(user, size): try: gravatar = user['gravatar'] username = user['username'] + user_id = user['id'] except (TypeError, AttributeError, KeyError): gravatar = user.gravatar username = user.username + user_id = user.id + slug = slugify(username) + user_profile_url = reverse('user_profile', kwargs={'id':user_id,'slug':slug}) return mark_safe(GRAVATAR_TEMPLATE % { + 'user_profile_url': user_profile_url, 'size': size, 'gravatar_hash': gravatar, 'username': template.defaultfilters.urlencode(username), @@ -247,9 +257,9 @@ def diff_date(date, limen=2): if days > 2: if date.year == now.year: - return date.strftime("%b %d at %H:%M") + return date.strftime("%b %d")# at %H:%M") else: - return date.strftime("%b %d '%y at %H:%M") + return date.strftime("%b %d '%y")# at %H:%M") elif days == 2: return _('2 days ago') elif days == 1: diff --git a/forum/views/users.py b/forum/views/users.py index ff92803c..7915ed6d 100755 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -183,6 +183,7 @@ def user_stats(request, user_id, user_view): 'la_user_bronze', 'la_user_reputation')[:100] + #this is meant for the questions answered by the user (or where answers were edited by him/her?) answered_questions = Question.objects.extra( select={ 'vote_up_count' : 'answer.vote_up_count', @@ -219,6 +220,8 @@ def user_stats(request, user_id, user_view): user_tags = Tag.objects.filter(questions__id__in = question_id_set) try: from django.db.models import Count + #todo - rewrite template to do the table joins within standard ORM + #awards = Award.objects.filter(user=user).order_by('-awarded_at') awards = Award.objects.extra( select={'id': 'badge.id', 'name':'badge.name', @@ -234,6 +237,7 @@ def user_stats(request, user_id, user_view): user_tags = user_tags.annotate(user_tag_usage_count=Count('name')) except ImportError: + #todo: remove all old django stuff, e.g. with '.group_by = ' pattern awards = Award.objects.extra( select={'id': 'badge.id', 'count': 'count(badge_id)', @@ -804,7 +808,7 @@ def user_favorites(request, user_id, user_view): }, select_params=[user_id], tables=['question', 'auth_user', 'favorite_question'], - where=['question.deleted=True AND question.last_activity_by_id = auth_user.id '+ + where=['question.deleted=False AND question.last_activity_by_id = auth_user.id '+ 'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'], params=[user_id], order_by=['-vote_count', '-question.id'] diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 4eaf9b83..65af2080 100644 --- a/locale/en/LC_MESSAGES/django.mo +++ b/locale/en/LC_MESSAGES/django.mo diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 3d1e14a3..23e1d410 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-27 11:33-0400\n" +"POT-Creation-Date: 2010-04-01 21:11-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,28 +28,27 @@ msgstr "" msgid "can't have two logins to the same account yet, sorry." msgstr "" -#: django_authopenid/forms.py:157 forum_modules/localauth/forms.py:59 +#: django_authopenid/forms.py:157 msgid "Please enter valid username and password (both are case-sensitive)." msgstr "" #: django_authopenid/forms.py:160 django_authopenid/forms.py:210 -#: forum_modules/localauth/forms.py:62 msgid "This account is inactive." msgstr "" -#: django_authopenid/forms.py:162 forum_modules/localauth/forms.py:64 +#: django_authopenid/forms.py:162 msgid "Login failed." msgstr "" -#: django_authopenid/forms.py:164 forum_modules/localauth/forms.py:66 +#: django_authopenid/forms.py:164 msgid "Please enter username and password" msgstr "" -#: django_authopenid/forms.py:166 forum_modules/localauth/forms.py:68 +#: django_authopenid/forms.py:166 msgid "Please enter your password" msgstr "" -#: django_authopenid/forms.py:168 forum_modules/localauth/forms.py:70 +#: django_authopenid/forms.py:168 msgid "Please enter user name" msgstr "" @@ -59,11 +58,11 @@ msgid "" "both fields are case-sensitive." msgstr "" -#: django_authopenid/forms.py:229 forum/authentication/forms.py:60 +#: django_authopenid/forms.py:229 msgid "Current password" msgstr "" -#: django_authopenid/forms.py:240 forum/authentication/forms.py:71 +#: django_authopenid/forms.py:240 msgid "" "Old password is incorrect. Please enter the correct " "password." @@ -80,7 +79,6 @@ msgstr "sorry, there is no such user name" #: django_authopenid/urls.py:23 django_authopenid/urls.py:24 #: django_authopenid/urls.py:25 django_authopenid/urls.py:27 #: fbconnect/urls.py:12 fbconnect/urls.py:13 fbconnect/urls.py:14 -#: forum/urls.py:93 forum/urls.py:95 forum/urls.py:96 msgid "signin/" msgstr "" @@ -92,7 +90,7 @@ msgstr "" msgid "newanswer/" msgstr "" -#: django_authopenid/urls.py:26 forum/urls.py:94 +#: django_authopenid/urls.py:26 msgid "signout/" msgstr "" @@ -101,7 +99,7 @@ msgid "complete/" msgstr "" #: django_authopenid/urls.py:29 fbconnect/urls.py:16 fbconnect/urls.py:17 -#: fbconnect/urls.py:18 forum/urls.py:98 forum_modules/localauth/urls.py:7 +#: fbconnect/urls.py:18 msgid "register/" msgstr "" @@ -130,7 +128,7 @@ msgstr "" msgid "email/" msgstr "" -#: django_authopenid/urls.py:38 forum/urls.py:99 +#: django_authopenid/urls.py:38 msgid "validate/" msgstr "" @@ -415,58 +413,56 @@ msgstr "" msgid "latest questions" msgstr "" -#: forum/forms.py:22 forum/skins/default/templates/answer_edit_tips.html:35 +#: forum/forms.py:21 forum/skins/default/templates/answer_edit_tips.html:35 #: forum/skins/default/templates/answer_edit_tips.html:39 #: forum/skins/default/templates/question_edit_tips.html:32 #: forum/skins/default/templates/question_edit_tips.html:37 msgid "title" msgstr "" -#: forum/forms.py:23 +#: forum/forms.py:22 msgid "please enter a descriptive title for your question" msgstr "" -#: forum/forms.py:28 +#: forum/forms.py:27 msgid "title must be > 10 characters" msgstr "" -#: forum/forms.py:37 +#: forum/forms.py:36 msgid "content" msgstr "" -#: forum/forms.py:43 +#: forum/forms.py:42 msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:52 forum/skins/default/templates/header.html:28 +#: forum/forms.py:51 forum/skins/default/templates/header.html:28 #: forum/skins/default/templates/header.html:56 msgid "tags" msgstr "" -#: forum/forms.py:54 +#: forum/forms.py:53 msgid "" "Tags are short keywords, with no spaces within. Up to five tags can be used." msgstr "" -#: forum/forms.py:61 forum/skins/default/templates/question_retag.html:39 +#: forum/forms.py:60 forum/skins/default/templates/question_retag.html:39 msgid "tags are required" msgstr "" -#: forum/forms.py:67 +#: forum/forms.py:66 msgid "please use 5 tags or less" msgstr "" -#: forum/forms.py:70 +#: forum/forms.py:69 msgid "tags must be shorter than 20 characters" msgstr "" -#: forum/forms.py:74 -msgid "" -"please use following characters in tags: letters 'a-z', numbers, and " -"characters '.-_#'" +#: forum/forms.py:73 +msgid "please use letters, numbers, and characters '.-_#'" msgstr "" -#: forum/forms.py:84 +#: forum/forms.py:83 #: forum/skins/default/templates/post_contributor_info.html:7 #: forum/skins/default/templates/question_summary_list_roll.html:26 #: forum/skins/default/templates/question_summary_list_roll.html:38 @@ -475,116 +471,116 @@ msgstr "" msgid "community wiki" msgstr "" -#: forum/forms.py:85 +#: forum/forms.py:84 msgid "" "if you choose community wiki option, the question and answer do not generate " "points and name of author will not be shown" msgstr "" -#: forum/forms.py:101 +#: forum/forms.py:100 msgid "update summary:" msgstr "" -#: forum/forms.py:102 +#: forum/forms.py:101 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" msgstr "" -#: forum/forms.py:105 +#: forum/forms.py:104 msgid "Automatically accept user's contributions for the email updates" msgstr "" -#: forum/forms.py:121 +#: forum/forms.py:120 msgid "Your name:" msgstr "" -#: forum/forms.py:122 +#: forum/forms.py:121 msgid "Email (not shared with anyone):" msgstr "" -#: forum/forms.py:123 +#: forum/forms.py:122 msgid "Your message:" msgstr "" -#: forum/forms.py:206 +#: forum/forms.py:205 msgid "this email does not have to be linked to gravatar" msgstr "" -#: forum/forms.py:208 +#: forum/forms.py:207 msgid "Screen name" msgstr "" -#: forum/forms.py:209 +#: forum/forms.py:208 msgid "Real name" msgstr "" -#: forum/forms.py:210 +#: forum/forms.py:209 msgid "Website" msgstr "" -#: forum/forms.py:211 +#: forum/forms.py:210 msgid "Location" msgstr "" -#: forum/forms.py:212 +#: forum/forms.py:211 msgid "Date of birth" msgstr "" -#: forum/forms.py:212 +#: forum/forms.py:211 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "" -#: forum/forms.py:213 forum/skins/default/templates/account_settings.html:21 +#: forum/forms.py:212 forum/skins/default/templates/account_settings.html:21 #: forum/skins/default/templates/authopenid/settings.html:21 msgid "Profile" msgstr "" -#: forum/forms.py:244 forum/forms.py:245 +#: forum/forms.py:243 forum/forms.py:244 msgid "this email has already been registered, please use another one" msgstr "" -#: forum/forms.py:251 +#: forum/forms.py:250 msgid "Choose email tag filter" msgstr "" -#: forum/forms.py:267 forum/forms.py:268 +#: forum/forms.py:266 forum/forms.py:267 msgid "weekly" msgstr "" -#: forum/forms.py:267 forum/forms.py:268 +#: forum/forms.py:266 forum/forms.py:267 msgid "no email" msgstr "" -#: forum/forms.py:268 +#: forum/forms.py:267 msgid "daily" msgstr "" -#: forum/forms.py:283 +#: forum/forms.py:282 msgid "Asked by me" msgstr "" -#: forum/forms.py:286 +#: forum/forms.py:285 msgid "Answered by me" msgstr "" -#: forum/forms.py:289 +#: forum/forms.py:288 msgid "Individually selected" msgstr "" -#: forum/forms.py:292 +#: forum/forms.py:291 msgid "Entire forum (tag filtered)" msgstr "" -#: forum/forms.py:346 forum/authentication/forms.py:41 +#: forum/forms.py:345 msgid "okay, let's try!" msgstr "" -#: forum/forms.py:347 forum/authentication/forms.py:42 +#: forum/forms.py:346 msgid "no community email please, thanks" msgstr "no askbot email please, thanks" -#: forum/forms.py:350 forum/authentication/forms.py:45 +#: forum/forms.py:349 msgid "please choose one of the options above" msgstr "" @@ -617,7 +613,7 @@ msgid "comments/" msgstr "" #: forum/urls.py:38 forum/urls.py:43 forum/urls.py:78 -#: forum/skins/default/templates/user_info.html:45 +#: forum/skins/default/templates/user_info.html:47 msgid "edit/" msgstr "" @@ -719,53 +715,10 @@ msgstr "" msgid "feedback/" msgstr "" -#: forum/urls.py:93 forum/urls.py:94 forum/urls.py:95 forum/urls.py:96 -#: forum/urls.py:97 forum/urls.py:98 forum/urls.py:99 forum/urls.py:100 -#: forum/urls.py:101 forum/urls.py:102 forum/urls.py:103 forum/urls.py:104 -#: forum_modules/localauth/urls.py:7 +#: forum/urls.py:89 forum/urls.py:90 msgid "account/" msgstr "" -#: forum/urls.py:97 -msgid "done/" -msgstr "" - -#: forum/urls.py:100 forum/urls.py:101 -msgid "tempsignin/" -msgstr "" - -#: forum/urls.py:102 -msgid "authsettings/" -msgstr "" - -#: forum/urls.py:103 forum/urls.py:104 -msgid "providers/" -msgstr "" - -#: forum/urls.py:103 -msgid "remove/" -msgstr "" - -#: forum/urls.py:104 -msgid "add/" -msgstr "" - -#: forum/authentication/forms.py:22 -msgid "Your account email" -msgstr "" - -#: forum/authentication/forms.py:24 -msgid "You cannot leave this field blank" -msgstr "" - -#: forum/authentication/forms.py:25 forum/utils/forms.py:111 -msgid "please enter a valid email address" -msgstr "" - -#: forum/authentication/forms.py:33 -msgid "Sorry, but this email is not on our database." -msgstr "" - #: forum/management/commands/send_email_alerts.py:236 msgid "email update message subject" msgstr "news from Q&A forum" @@ -829,27 +782,27 @@ msgstr "" msgid "First time here? Check out the <a href=\"%s\">FAQ</a>!" msgstr "" -#: forum/models/question.py:362 +#: forum/models/question.py:360 #, python-format msgid "%(author)s modified the question" msgstr "" -#: forum/models/question.py:366 +#: forum/models/question.py:364 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "" -#: forum/models/question.py:371 +#: forum/models/question.py:369 #, python-format msgid "%(people)s commented the question" msgstr "" -#: forum/models/question.py:376 +#: forum/models/question.py:374 #, python-format msgid "%(people)s commented answers" msgstr "" -#: forum/models/question.py:378 +#: forum/models/question.py:376 #, python-format msgid "%(people)s commented an answer" msgstr "" @@ -976,7 +929,6 @@ msgid "Account functions" msgstr "" #: forum/skins/default/templates/account_settings.html:29 -#: forum/skins/default/templates/auth/auth_settings.html:31 #: forum/skins/default/templates/authopenid/changepw.html:5 #: forum/skins/default/templates/authopenid/changepw.html:14 #: forum/skins/default/templates/authopenid/settings.html:29 @@ -1090,7 +1042,7 @@ msgstr "" #: forum/skins/default/templates/question_edit.html:119 #: forum/skins/default/templates/question_retag.html:75 #: forum/skins/default/templates/reopen.html:30 -#: forum/skins/default/templates/user_edit.html:87 +#: forum/skins/default/templates/user_edit.html:84 #: forum/skins/default/templates/authopenid/changeemail.html:40 msgid "Cancel" msgstr "" @@ -1345,7 +1297,7 @@ msgstr "" #: forum/skins/default/templates/question_list.html:14 #: forum/skins/default/templates/question_summary_list_roll.html:14 #: forum/skins/default/templates/questions.html:80 -#: forum/skins/default/templates/users_questions.html:32 +#: forum/skins/default/templates/users_questions.html:31 msgid "votes" msgstr "" @@ -1358,7 +1310,7 @@ msgstr "" #: forum/skins/default/templates/question_list.html:22 #: forum/skins/default/templates/question_summary_list_roll.html:15 #: forum/skins/default/templates/questions.html:81 -#: forum/skins/default/templates/users_questions.html:40 +#: forum/skins/default/templates/users_questions.html:39 msgid "views" msgstr "" @@ -1369,7 +1321,7 @@ msgstr "" #: forum/skins/default/templates/question_summary_list_roll.html:52 #: forum/skins/default/templates/questions.html:136 #: forum/skins/default/templates/tags.html:49 -#: forum/skins/default/templates/users_questions.html:52 +#: forum/skins/default/templates/users_questions.html:50 msgid "using tags" msgstr "" @@ -1564,18 +1516,24 @@ msgstr "" #: forum/skins/default/templates/faq.html:110 msgid "what is gravatar" -msgstr "What is gravatar?" +msgstr "How to change my picture (gravatar) and what is gravatar?" #: forum/skins/default/templates/faq.html:111 msgid "gravatar faq info" msgstr "" -"<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</" -"strong>ecognized <strong>avatar</strong> - your unique avatar image " -"associated with your email address. It's simply a picture that shows next to " -"your posts on the websites that support gravatar protocol. By default gravar " -"appears as a square filled with a snowflake-like figure. You can <strong>set " -"your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</" -"strong></a>" +"<p>The picture that appears on the users profiles is called " +"<strong>gravatar</strong> (which means <strong>g</strong>lobally <strong>r</" +"strong>ecognized <strong>avatar</strong>).</p><p>Here is how it works: a " +"<strong>cryptographic key</strong> (unbreakable code) is calculated from " +"your email address. You upload your picture (or your favorite alter ego " +"image) the website <a href='http://gravatar.com'><strong>gravatar.com</" +"strong></a> from where we later retreive your image using the key.</" +"p><p>This way all the websites you trust can show your image next to your " +"posts and your email address remains private.</p><p>Please " +"<strong>personalize your account</strong> with an image - just register at " +"<a href='http://gravatar.com'><strong>gravatar.com</strong></a> (just please " +"be sure to use the same email address that you used to register with us). " +"Default image that looks like a kitchen tile is generated automatically.</p>" #: forum/skins/default/templates/faq.html:114 msgid "To register, do I need to create new password?" @@ -1739,7 +1697,7 @@ msgid "books" msgstr "" #: forum/skins/default/templates/header.html:33 -#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:195 +#: forum/templatetags/extra_tags.py:176 forum/templatetags/extra_tags.py:205 msgid "badges" msgstr "" @@ -1857,7 +1815,6 @@ msgstr "list of all questions" #: forum/skins/default/templates/index.html:92 #: forum/skins/default/templates/index_.html:121 -#: forum/skins/default/templates/auth/signup.html:28 #: forum/skins/default/templates/authopenid/signup.html:28 msgid "or" msgstr "" @@ -1874,7 +1831,7 @@ msgstr "unanswered questions" #: forum/skins/default/templates/index_.html:42 #: forum/skins/default/templates/question_list.html:16 -#: forum/skins/default/templates/users_questions.html:34 +#: forum/skins/default/templates/users_questions.html:33 msgid "this answer has been accepted to be correct" msgstr "" @@ -1882,7 +1839,7 @@ msgstr "" #: forum/skins/default/templates/question_list.html:18 #: forum/skins/default/templates/question_summary_list_roll.html:13 #: forum/skins/default/templates/questions.html:79 -#: forum/skins/default/templates/users_questions.html:36 +#: forum/skins/default/templates/users_questions.html:35 msgid "answers" msgstr "" @@ -1892,7 +1849,7 @@ msgstr "" #: forum/skins/default/templates/question_summary_list_roll.html:52 #: forum/skins/default/templates/questions.html:136 #: forum/skins/default/templates/tags.html:49 -#: forum/skins/default/templates/users_questions.html:52 +#: forum/skins/default/templates/users_questions.html:50 msgid "see questions tagged" msgstr "" @@ -2644,25 +2601,16 @@ msgstr "" msgid "edit profile" msgstr "" -#: forum/skins/default/templates/user_edit.html:31 -msgid "image associated with your email address" -msgstr "" - -#: forum/skins/default/templates/user_edit.html:31 -#, python-format -msgid "avatar, see %(gravatar_faq_url)s" -msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>" - -#: forum/skins/default/templates/user_edit.html:36 -#: forum/skins/default/templates/user_info.html:56 +#: forum/skins/default/templates/user_edit.html:33 +#: forum/skins/default/templates/user_info.html:53 msgid "Registered user" msgstr "" -#: forum/skins/default/templates/user_edit.html:43 +#: forum/skins/default/templates/user_edit.html:40 msgid "Screen Name" msgstr "" -#: forum/skins/default/templates/user_edit.html:86 +#: forum/skins/default/templates/user_edit.html:83 #: forum/skins/default/templates/user_email_subscriptions.html:20 msgid "Update" msgstr "" @@ -2684,55 +2632,63 @@ msgstr "" msgid "Stop sending email" msgstr "Stop Email" -#: forum/skins/default/templates/user_info.html:22 -#: forum/skins/default/templates/users.html:26 forum/views/users.py:916 +#: forum/skins/default/templates/user_info.html:18 +msgid "change picture" +msgstr "" + +#: forum/skins/default/templates/user_info.html:25 +#: forum/skins/default/templates/users.html:26 forum/views/users.py:920 msgid "reputation" msgstr "karma" -#: forum/skins/default/templates/user_info.html:32 +#: forum/skins/default/templates/user_info.html:35 msgid "Moderate this user" msgstr "" -#: forum/skins/default/templates/user_info.html:45 +#: forum/skins/default/templates/user_info.html:47 msgid "update profile" msgstr "" -#: forum/skins/default/templates/user_info.html:60 +#: forum/skins/default/templates/user_info.html:57 msgid "real name" msgstr "" -#: forum/skins/default/templates/user_info.html:65 +#: forum/skins/default/templates/user_info.html:62 msgid "member for" msgstr "member since" -#: forum/skins/default/templates/user_info.html:70 +#: forum/skins/default/templates/user_info.html:67 msgid "last seen" msgstr "" -#: forum/skins/default/templates/user_info.html:76 +#: forum/skins/default/templates/user_info.html:73 msgid "user website" msgstr "" -#: forum/skins/default/templates/user_info.html:82 +#: forum/skins/default/templates/user_info.html:79 msgid "location" msgstr "" -#: forum/skins/default/templates/user_info.html:89 +#: forum/skins/default/templates/user_info.html:86 msgid "age" msgstr "" -#: forum/skins/default/templates/user_info.html:90 +#: forum/skins/default/templates/user_info.html:87 msgid "age unit" msgstr "years old" -#: forum/skins/default/templates/user_info.html:96 +#: forum/skins/default/templates/user_info.html:93 msgid "todays unused votes" msgstr "" -#: forum/skins/default/templates/user_info.html:97 +#: forum/skins/default/templates/user_info.html:94 msgid "votes left" msgstr "" +#: forum/skins/default/templates/user_reputation.html:27 +msgid "Change in karma per question or answer" +msgstr "" + #: forum/skins/default/templates/user_stats.html:12 #, python-format msgid "" @@ -2850,19 +2806,19 @@ msgstr[1] "" msgid "User profile" msgstr "" -#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:890 +#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:894 msgid "overview" msgstr "" -#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:898 +#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:902 msgid "recent activity" msgstr "" -#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:908 +#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:912 msgid "comments and answers to others questions" msgstr "" -#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:907 +#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:911 msgid "responses" msgstr "" @@ -2874,11 +2830,11 @@ msgstr "Graph of user karma" msgid "reputation history" msgstr "karma history" -#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:934 +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:938 msgid "user vote record" msgstr "" -#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:933 +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:937 msgid "casted votes" msgstr "votes" @@ -2890,11 +2846,11 @@ msgstr "" msgid "favorites" msgstr "" -#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:943 +#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:947 msgid "email subscription settings" msgstr "" -#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:942 +#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:946 msgid "email subscriptions" msgstr "" @@ -2936,323 +2892,6 @@ msgstr "" msgid "thumb-up off" msgstr "" -#: forum/skins/default/templates/auth/auth_settings.html:5 -#: forum/skins/default/templates/auth/auth_settings.html:7 -msgid "Authentication settings" -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:9 -msgid "" -"These are the external authentication providers currently associated with " -"your account." -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:12 -msgid "remove" -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:17 -msgid "" -"You currently have no external authentication provider associated with your " -"account." -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:19 -msgid "Add new provider" -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:21 -#: forum/skins/default/templates/authopenid/changepw.html:8 -msgid "This is where you can change your password. Make sure you remember it!" -msgstr "" -"<span class='strong'>To change your password</span> please fill out and " -"submit this form" - -#: forum/skins/default/templates/auth/auth_settings.html:24 -msgid "" -"You can set up a password for your account, so you can login using standard " -"username and password!" -msgstr "" - -#: forum/skins/default/templates/auth/auth_settings.html:31 -msgid "Create password" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:5 -#: forum/skins/default/templates/authopenid/complete.html:19 -msgid "Connect your OpenID with this site" -msgstr "New user signup" - -#: forum/skins/default/templates/auth/complete.html:8 -#: forum/skins/default/templates/authopenid/complete.html:22 -msgid "Connect your OpenID with your account on this site" -msgstr "New user signup" - -#: forum/skins/default/templates/auth/complete.html:12 -msgid "You are here for the first time with " -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:13 -msgid "" -"Please create your screen name and save your email address. Saved email " -"address will let you subscribe for the updates on the most interesting " -"questions and will be used to create and retrieve your unique avatar image. " -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:15 -#: forum/skins/default/templates/authopenid/complete.html:42 -msgid "This account already exists, please use another." -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:30 -#: forum/skins/default/templates/authopenid/complete.html:57 -msgid "Sorry, looks like we have some errors:" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:47 -#: forum/skins/default/templates/authopenid/complete.html:82 -msgid "Screen name label" -msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)" - -#: forum/skins/default/templates/auth/complete.html:54 -#: forum/skins/default/templates/authopenid/complete.html:89 -msgid "Email address label" -msgstr "" -"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with " -"anyone, must be valid</i>)" - -#: forum/skins/default/templates/auth/complete.html:60 -#: forum/skins/default/templates/auth/signup.html:18 -#: forum/skins/default/templates/authopenid/complete.html:95 -#: forum/skins/default/templates/authopenid/signup.html:18 -msgid "receive updates motivational blurb" -msgstr "" -"<strong>Receive forum updates by email</strong> - this will help our " -"community grow and become more useful.<br/>By default <span " -"class='orange'>Q&A</span> forum sends up to <strong>one email digest per " -"week</strong> - only when there is anything new.<br/>If you like, please " -"adjust this now or any time later from your user account." - -#: forum/skins/default/templates/auth/complete.html:64 -#: forum/skins/default/templates/auth/signup.html:22 -#: forum/skins/default/templates/authopenid/complete.html:99 -#: forum/skins/default/templates/authopenid/signup.html:22 -msgid "please select one of the options above" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:67 -#: forum/skins/default/templates/authopenid/complete.html:102 -msgid "Tag filter tool will be your right panel, once you log in." -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:68 -#: forum/skins/default/templates/authopenid/complete.html:103 -msgid "create account" -msgstr "Signup" - -#: forum/skins/default/templates/auth/complete.html:77 -#: forum/skins/default/templates/authopenid/complete.html:112 -msgid "Existing account" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:78 -#: forum/skins/default/templates/authopenid/complete.html:113 -msgid "user name" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:79 -#: forum/skins/default/templates/authopenid/complete.html:114 -msgid "password" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:86 -#: forum/skins/default/templates/authopenid/complete.html:121 -msgid "Register" -msgstr "" - -#: forum/skins/default/templates/auth/complete.html:87 -#: forum/skins/default/templates/authopenid/complete.html:122 -#: forum/skins/default/templates/authopenid/signin.html:164 -msgid "Forgot your password?" -msgstr "" - -#: forum/skins/default/templates/auth/email_validation.html:6 -#: forum/skins/default/templates/auth/temp_login_email.html:6 -#: forum/skins/default/templates/authopenid/email_validation.txt:2 -msgid "Greetings from the Q&A forum" -msgstr "" - -#: forum/skins/default/templates/auth/email_validation.html:8 -#: forum/skins/default/templates/authopenid/email_validation.txt:4 -msgid "To make use of the Forum, please follow the link below:" -msgstr "" - -#: forum/skins/default/templates/auth/email_validation.html:12 -#: forum/skins/default/templates/authopenid/email_validation.txt:8 -msgid "Following the link above will help us verify your email address." -msgstr "" - -#: forum/skins/default/templates/auth/email_validation.html:14 -#: forum/skins/default/templates/auth/temp_login_email.html:14 -msgid "" -"If you beleive that this message was sent in mistake -\n" -" no further action is needed. Just ingore this email, we apologize\n" -" for any inconvenience" -msgstr "" - -#: forum/skins/default/templates/auth/email_validation.html:18 -#: forum/skins/default/templates/auth/temp_login_email.html:18 -msgid "" -"Sincerely,<br />\n" -" Forum Administrator" -msgstr "" -"Sincerely,\n" -"Q&A Forum Administrator" - -#: forum/skins/default/templates/auth/signin.html:22 -#: forum/skins/default/templates/authopenid/signin.html:5 -#: forum/skins/default/templates/authopenid/signin.html:21 -msgid "User login" -msgstr "User login" - -#: forum/skins/default/templates/auth/signin.html:29 -#: forum/skins/default/templates/authopenid/signin.html:42 -msgid "Click to sign in through any of these services." -msgstr "" -"<p><span class=\"big strong\">Please select your favorite login method below." -"</span></p><p><font color=\"gray\">External login services use <a href=" -"\"http://openid.net\"><b>OpenID</b></a> technology, where your password " -"always stays confidential between you and your login provider and you don't " -"have to remember another one.</font></p>" - -#: forum/skins/default/templates/auth/signin.html:34 -msgid "" -"Take the oppurtunity to validate my email next to the external provider I " -"choose." -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:76 -#: forum/skins/default/templates/auth/signin.html:82 -msgid "Or..." -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:84 -msgid "Click" -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:84 -msgid "if you're having troubles signing in." -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:88 -msgid "Enter your " -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:144 -#: forum/skins/default/templates/authopenid/signin.html:174 -msgid "Why use OpenID?" -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:147 -#: forum/skins/default/templates/authopenid/signin.html:177 -msgid "with openid it is easier" -msgstr "With the OpenID you don't need to create new username and password." - -#: forum/skins/default/templates/auth/signin.html:150 -#: forum/skins/default/templates/authopenid/signin.html:180 -msgid "reuse openid" -msgstr "You can safely re-use the same login for all OpenID-enabled websites." - -#: forum/skins/default/templates/auth/signin.html:153 -#: forum/skins/default/templates/authopenid/signin.html:183 -msgid "openid is widely adopted" -msgstr "" -"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" -"enabled." - -#: forum/skins/default/templates/auth/signin.html:156 -#: forum/skins/default/templates/authopenid/signin.html:186 -msgid "openid is supported open standard" -msgstr "OpenID is based on an open standard, supported by many organizations." - -#: forum/skins/default/templates/auth/signin.html:161 -#: forum/skins/default/templates/authopenid/signin.html:191 -msgid "Find out more" -msgstr "" - -#: forum/skins/default/templates/auth/signin.html:162 -#: forum/skins/default/templates/authopenid/signin.html:192 -msgid "Get OpenID" -msgstr "" - -#: forum/skins/default/templates/auth/signup.html:4 -#: forum/skins/default/templates/authopenid/signup.html:4 -msgid "Signup" -msgstr "" - -#: forum/skins/default/templates/auth/signup.html:8 -#: forum/skins/default/templates/authopenid/signup.html:8 -msgid "Create login name and password" -msgstr "" - -#: forum/skins/default/templates/auth/signup.html:10 -#: forum/skins/default/templates/authopenid/signup.html:10 -msgid "Traditional signup info" -msgstr "" -"<span class='strong big'>If you prefer, create your forum login name and " -"password here. However</span>, please keep in mind that we also support " -"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can " -"simply reuse your external login (e.g. Gmail or AOL) without ever sharing " -"your login details with anyone and having to remember yet another password." - -#: forum/skins/default/templates/auth/signup.html:25 -#: forum/skins/default/templates/authopenid/signup.html:25 -msgid "" -"Please read and type in the two words below to help us prevent automated " -"account creation." -msgstr "" - -#: forum/skins/default/templates/auth/signup.html:27 -#: forum/skins/default/templates/authopenid/signup.html:27 -msgid "Create Account" -msgstr "" - -#: forum/skins/default/templates/auth/signup.html:29 -msgid "return to login page" -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_email.html:8 -msgid "You're seeing this because someone requested a temporary login link" -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_email.html:12 -msgid "Following the link above will give you access to your account." -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_request.html:5 -msgid "Request temporary login key" -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_request.html:7 -msgid "Account: request temporary login key" -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_request.html:8 -msgid "" -"\n" -" If you're experiencing problems accessing your account, or if you forgot " -"your password,\n" -" here you can request a temporary login key. Fill out your account email " -"and we'll send you a temporary access link that\n" -" will enable you to access your account. This token is valid only once " -"and for a limited period of time.\n" -" " -msgstr "" - -#: forum/skins/default/templates/auth/temp_login_request.html:25 -msgid "Send link" -msgstr "" - #: forum/skins/default/templates/authopenid/changeemail.html:3 #: forum/skins/default/templates/authopenid/changeemail.html:9 #: forum/skins/default/templates/authopenid/changeemail.html:38 @@ -3386,6 +3025,20 @@ msgstr "" msgid "Account: change password" msgstr "Change your password" +#: forum/skins/default/templates/authopenid/changepw.html:8 +msgid "This is where you can change your password. Make sure you remember it!" +msgstr "" +"<span class='strong'>To change your password</span> please fill out and " +"submit this form" + +#: forum/skins/default/templates/authopenid/complete.html:19 +msgid "Connect your OpenID with this site" +msgstr "New user signup" + +#: forum/skins/default/templates/authopenid/complete.html:22 +msgid "Connect your OpenID with your account on this site" +msgstr "New user signup" + #: forum/skins/default/templates/authopenid/complete.html:27 #, python-format msgid "register new %(provider)s account info, see %(gravatar_faq_url)s" @@ -3439,6 +3092,68 @@ msgstr "" "and will be used to create and retrieve your unique avatar image - <a href='%" "(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" +#: forum/skins/default/templates/authopenid/complete.html:42 +msgid "This account already exists, please use another." +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:57 +msgid "Sorry, looks like we have some errors:" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:82 +msgid "Screen name label" +msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)" + +#: forum/skins/default/templates/authopenid/complete.html:89 +msgid "Email address label" +msgstr "" +"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with " +"anyone, must be valid</i>)" + +#: forum/skins/default/templates/authopenid/complete.html:95 +#: forum/skins/default/templates/authopenid/signup.html:18 +msgid "receive updates motivational blurb" +msgstr "" +"<strong>Receive forum updates by email</strong> - this will help our " +"community grow and become more useful.<br/>By default <span " +"class='orange'>Q&A</span> forum sends up to <strong>one email digest per " +"week</strong> - only when there is anything new.<br/>If you like, please " +"adjust this now or any time later from your user account." + +#: forum/skins/default/templates/authopenid/complete.html:99 +#: forum/skins/default/templates/authopenid/signup.html:22 +msgid "please select one of the options above" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:102 +msgid "Tag filter tool will be your right panel, once you log in." +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:103 +msgid "create account" +msgstr "Signup" + +#: forum/skins/default/templates/authopenid/complete.html:112 +msgid "Existing account" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:113 +msgid "user name" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:114 +msgid "password" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:121 +msgid "Register" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:122 +#: forum/skins/default/templates/authopenid/signin.html:168 +msgid "Forgot your password?" +msgstr "" + #: forum/skins/default/templates/authopenid/confirm_email.txt:2 msgid "Thank you for registering at our Q&A forum!" msgstr "" @@ -3500,6 +3215,18 @@ msgstr "" msgid "Delete account permanently" msgstr "" +#: forum/skins/default/templates/authopenid/email_validation.txt:2 +msgid "Greetings from the Q&A forum" +msgstr "" + +#: forum/skins/default/templates/authopenid/email_validation.txt:4 +msgid "To make use of the Forum, please follow the link below:" +msgstr "" + +#: forum/skins/default/templates/authopenid/email_validation.txt:8 +msgid "Following the link above will help us verify your email address." +msgstr "" + #: forum/skins/default/templates/authopenid/email_validation.txt:10 msgid "" "If you beleive that this message was sent in mistake - \n" @@ -3560,6 +3287,11 @@ msgstr "" "* login with user name %(username)s and password %(password)s\n" "* go to your user profile and set the password to something you can remember" +#: forum/skins/default/templates/authopenid/signin.html:5 +#: forum/skins/default/templates/authopenid/signin.html:21 +msgid "User login" +msgstr "User login" + #: forum/skins/default/templates/authopenid/signin.html:28 #, python-format msgid "" @@ -3584,6 +3316,15 @@ msgstr "" "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be " "posted once you log in.</span>" +#: forum/skins/default/templates/authopenid/signin.html:42 +msgid "Click to sign in through any of these services." +msgstr "" +"<p><span class=\"big strong\">Please select your favorite login method below." +"</span></p><p><font color=\"gray\">External login services use <a href=" +"\"http://openid.net\"><b>OpenID</b></a> technology, where your password " +"always stays confidential between you and your login provider and you don't " +"have to remember another one.</font></p>" + # msgid "Click to sign in through any of these services." # msgstr "" # "<p><span class=\"big strong\">Please select your favorite login method below." @@ -3593,14 +3334,14 @@ msgstr "" # "have to remember another one. " # "Askbot option requires your login name and " # "password entered here.</font></p>" -#: forum/skins/default/templates/authopenid/signin.html:140 +#: forum/skins/default/templates/authopenid/signin.html:144 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>" msgstr "" "<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" " "class='big strong'>Provider user name</span><br/><span class='grey'>(or " "select another login method above)</span>" -#: forum/skins/default/templates/authopenid/signin.html:147 +#: forum/skins/default/templates/authopenid/signin.html:151 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" @@ -3609,29 +3350,86 @@ msgstr "" "openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose " "another login method above)</span>" -#: forum/skins/default/templates/authopenid/signin.html:149 -#: forum/skins/default/templates/authopenid/signin.html:162 +#: forum/skins/default/templates/authopenid/signin.html:153 +#: forum/skins/default/templates/authopenid/signin.html:166 msgid "Login" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:153 +#: forum/skins/default/templates/authopenid/signin.html:157 msgid "Enter your login name and password" msgstr "" "<span class='big strong'>Enter your Askbot login and password</span><br/" "><span class='grey'>(or select your OpenID provider above)</span>" -#: forum/skins/default/templates/authopenid/signin.html:157 +#: forum/skins/default/templates/authopenid/signin.html:161 msgid "Login name" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:159 +#: forum/skins/default/templates/authopenid/signin.html:163 msgid "Password" msgstr "" -#: forum/skins/default/templates/authopenid/signin.html:163 +#: forum/skins/default/templates/authopenid/signin.html:167 msgid "Create account" msgstr "" +#: forum/skins/default/templates/authopenid/signin.html:178 +msgid "Why use OpenID?" +msgstr "" + +#: forum/skins/default/templates/authopenid/signin.html:181 +msgid "with openid it is easier" +msgstr "With the OpenID you don't need to create new username and password." + +#: forum/skins/default/templates/authopenid/signin.html:184 +msgid "reuse openid" +msgstr "You can safely re-use the same login for all OpenID-enabled websites." + +#: forum/skins/default/templates/authopenid/signin.html:187 +msgid "openid is widely adopted" +msgstr "" +"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" +"enabled." + +#: forum/skins/default/templates/authopenid/signin.html:190 +msgid "openid is supported open standard" +msgstr "OpenID is based on an open standard, supported by many organizations." + +#: forum/skins/default/templates/authopenid/signin.html:195 +msgid "Find out more" +msgstr "" + +#: forum/skins/default/templates/authopenid/signin.html:196 +msgid "Get OpenID" +msgstr "" + +#: forum/skins/default/templates/authopenid/signup.html:4 +msgid "Signup" +msgstr "" + +#: forum/skins/default/templates/authopenid/signup.html:8 +msgid "Create login name and password" +msgstr "" + +#: forum/skins/default/templates/authopenid/signup.html:10 +msgid "Traditional signup info" +msgstr "" +"<span class='strong big'>If you prefer, create your forum login name and " +"password here. However</span>, please keep in mind that we also support " +"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can " +"simply reuse your external login (e.g. Gmail or AOL) without ever sharing " +"your login details with anyone and having to remember yet another password." + +#: forum/skins/default/templates/authopenid/signup.html:25 +msgid "" +"Please read and type in the two words below to help us prevent automated " +"account creation." +msgstr "" + +#: forum/skins/default/templates/authopenid/signup.html:27 +msgid "Create Account" +msgstr "" + #: forum/skins/default/templates/authopenid/signup.html:29 msgid "return to OpenID login" msgstr "" @@ -3641,26 +3439,26 @@ msgstr "" msgid "Connect to %(APP_SHORT_NAME)s with Facebook!" msgstr "" -#: forum/templatetags/extra_tags.py:167 forum/templatetags/extra_tags.py:194 +#: forum/templatetags/extra_tags.py:177 forum/templatetags/extra_tags.py:204 msgid "reputation points" msgstr "karma" -#: forum/templatetags/extra_tags.py:254 +#: forum/templatetags/extra_tags.py:264 msgid "2 days ago" msgstr "" -#: forum/templatetags/extra_tags.py:256 +#: forum/templatetags/extra_tags.py:266 msgid "yesterday" msgstr "" -#: forum/templatetags/extra_tags.py:258 +#: forum/templatetags/extra_tags.py:268 #, python-format msgid "%(hr)d hour ago" msgid_plural "%(hr)d hours ago" msgstr[0] "" msgstr[1] "" -#: forum/templatetags/extra_tags.py:260 +#: forum/templatetags/extra_tags.py:270 #, python-format msgid "%(min)d min ago" msgid_plural "%(min)d mins ago" @@ -3707,6 +3505,10 @@ msgstr "Your email <i>(never shared)</i>" msgid "email address is required" msgstr "" +#: forum/utils/forms.py:111 +msgid "please enter a valid email address" +msgstr "" + #: forum/utils/forms.py:112 msgid "this email is already used by someone else, please choose another" msgstr "" @@ -3731,69 +3533,6 @@ msgstr "" msgid "sorry, entered passwords did not match, please try again" msgstr "" -#: forum/views/auth.py:99 forum/views/auth.py:108 -msgid "" -"Sorry, these login credentials belong to anoother user. Plese terminate your " -"current session and try again." -msgstr "" - -#: forum/views/auth.py:101 -msgid "You are already logged in with that user." -msgstr "" - -#: forum/views/auth.py:106 -msgid "These login credentials are already associated with your account." -msgstr "" - -#: forum/views/auth.py:112 -msgid "The new credentials are now associated with your account" -msgstr "" - -#: forum/views/auth.py:150 -msgid "" -"Oops, something went wrong in the middle of this process. Please try again." -msgstr "" - -#: forum/views/auth.py:210 -msgid "Temporary login link" -msgstr "" - -#: forum/views/auth.py:215 -msgid "An email has been sent with your temporary login key" -msgstr "" - -#: forum/views/auth.py:230 -msgid "" -"You are logged in with a temporary access key, please take the time to fix " -"your issue with authentication." -msgstr "" - -#: forum/views/auth.py:236 -msgid "Email Validation" -msgstr "" - -#: forum/views/auth.py:247 -msgid "Thank you, your email is now validated." -msgstr "" - -#: forum/views/auth.py:271 -msgid "Your password was changed" -msgstr "" - -#: forum/views/auth.py:273 -msgid "New password set" -msgstr "New password created" - -#: forum/views/auth.py:306 -#, python-format -msgid "You removed the association with %s" -msgstr "" - -#: forum/views/auth.py:345 -#, python-format -msgid "Welcome back %s, you are now logged in" -msgstr "" - #: forum/views/commands.py:209 #, python-format msgid "subscription saved, %(email)s needs validation, see %(details_url)s" @@ -3817,59 +3556,59 @@ msgstr "" msgid "We look forward to hearing your feedback! Please, give it next time :)" msgstr "" -#: forum/views/users.py:851 forum/views/users.py:855 +#: forum/views/users.py:855 forum/views/users.py:859 msgid "changes saved" msgstr "" -#: forum/views/users.py:861 +#: forum/views/users.py:865 msgid "email updates canceled" msgstr "" -#: forum/views/users.py:891 +#: forum/views/users.py:895 msgid "user profile" msgstr "" -#: forum/views/users.py:892 +#: forum/views/users.py:896 msgid "user profile overview" msgstr "" -#: forum/views/users.py:899 +#: forum/views/users.py:903 msgid "recent user activity" msgstr "" -#: forum/views/users.py:900 +#: forum/views/users.py:904 msgid "profile - recent activity" msgstr "" -#: forum/views/users.py:909 +#: forum/views/users.py:913 msgid "profile - responses" msgstr "" -#: forum/views/users.py:917 +#: forum/views/users.py:921 msgid "user reputation in the community" msgstr "user karma" -#: forum/views/users.py:918 +#: forum/views/users.py:922 msgid "profile - user reputation" msgstr "Profile - User's Karma" -#: forum/views/users.py:924 +#: forum/views/users.py:928 msgid "favorite questions" msgstr "" -#: forum/views/users.py:925 +#: forum/views/users.py:929 msgid "users favorite questions" msgstr "" -#: forum/views/users.py:926 +#: forum/views/users.py:930 msgid "profile - favorite questions" msgstr "" -#: forum/views/users.py:935 +#: forum/views/users.py:939 msgid "profile - votes" msgstr "" -#: forum/views/users.py:944 +#: forum/views/users.py:948 msgid "profile - email subscriptions" msgstr "" @@ -3897,65 +3636,23 @@ msgstr "" msgid "books/" msgstr "" -#: forum_modules/facebookauth/authentication.py:29 -msgid "Sorry, your Facebook session has expired, please try again" -msgstr "" - -#: forum_modules/facebookauth/authentication.py:31 -msgid "" -"The authentication with Facebook connect failed due to an invalid signature" -msgstr "" - -#: forum_modules/facebookauth/authentication.py:33 -msgid "" -"The authentication with Facebook connect failed, cannot find authentication " -"tokens" -msgstr "" - -#: forum_modules/localauth/urls.py:7 -msgid "local/" -msgstr "" - -#: forum_modules/localauth/views.py:23 -msgid "A validation email has been sent to your email address. " -msgstr "" - -#: forum_modules/oauthauth/consumer.py:33 -msgid "Error, the oauth token is not on the server" -msgstr "" - -#: forum_modules/oauthauth/consumer.py:38 -msgid "Something went wrong! Auth tokens do not match" -msgstr "" - -#: forum_modules/openidauth/consumer.py:40 -msgid "Sorry, but your input is not a valid OpenId" -msgstr "" - -#: forum_modules/openidauth/consumer.py:92 -msgid "The OpenId authentication request was canceled" -msgstr "" - -#: forum_modules/openidauth/consumer.py:94 -msgid "The OpenId authentication failed: " -msgstr "" - -#: forum_modules/openidauth/consumer.py:96 -msgid "Setup needed" -msgstr "" - -#: forum_modules/openidauth/consumer.py:98 -msgid "The OpenId authentication failed with an unknown status: " -msgstr "" - -#: forum_modules/openidauth/templates/openidurl.html:7 -msgid "Enter your OpenId Url" -msgstr "" - #: stackexchange/management/commands/load_stackexchange.py:124 msgid "Congratulations, you are now an Administrator" msgstr "" +#~ msgid "avatar, see %(gravatar_faq_url)s" +#~ msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>" + +#~ msgid "" +#~ "Sincerely,<br />\n" +#~ " Forum Administrator" +#~ msgstr "" +#~ "Sincerely,\n" +#~ "Q&A Forum Administrator" + +#~ msgid "New password set" +#~ msgstr "New password created" + #~ msgid "" #~ "\n" #~ " have total %(q_num)s unanswered questions\n" |