From 27ade53af3e39f9e92649836184f3b976f88803d Mon Sep 17 00:00:00 2001 From: ganyiang Date: Wed, 14 May 2014 09:45:11 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=92=88=E5=AF=B9OSP=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E9=9C=80=E6=B1=82=E7=9A=84=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=9A=201.=E5=BC=80=E6=BA=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=A4=BE=E5=8C=BA(OSP)index=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0[=E8=BD=AF=E4=BB=B6=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E]=E5=B1=95=E7=A4=BA=202.osp=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=A2=9E=E5=8A=A0[=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=80=81=E5=8A=BF]=E3=80=81[=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E5=88=9B=E6=96=B0=E8=B6=8B=E5=8A=BF]=20=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ps.此次为不负责任的提交~ --- .../_show_topics.html.erb | 380 +++++++++- app/views/open_source_projects/index.html.erb | 190 ++++- public/javascripts/ichart.1.2.min.js | 9 + public/stylesheets/buglist-div-use.css | 41 + public/stylesheets/buglist-ichart.css | 74 ++ public/stylesheets/buglist.css | 706 ++++++++++++++++++ public/stylesheets/sec-analysis.css | 41 + 7 files changed, 1427 insertions(+), 14 deletions(-) create mode 100644 public/javascripts/ichart.1.2.min.js create mode 100644 public/stylesheets/buglist-div-use.css create mode 100644 public/stylesheets/buglist-ichart.css create mode 100644 public/stylesheets/buglist.css create mode 100644 public/stylesheets/sec-analysis.css diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 3ede2730e..306e0c8e5 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -1,7 +1,358 @@ + -
- 共有 <%= link_to memos.count %> 个贴子 + + + + + +<%= javascript_include_tag "ichart.1.2.min" %> +<%= stylesheet_link_tag "sec-analysis.css" %> +<%= stylesheet_link_tag "buglist-ichart.css" %> +<%= stylesheet_link_tag "buglist.css" %> + +
+
+
+
+

+
+
+ +
+

项目安全态势

More >>
+
+
+ +
+
+
+
+
+ + + + +
+
+
+
+

+
+
+ +
+

技术创新趋势

More >>
+
+
+ +
+
+
+
+ + +
+ +

全球热帖

更多>>
<% if memos.any? %> @@ -20,9 +371,20 @@ <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %> - 回答 + 回帖 + + + + + + + + + +
<%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %>
关注
+ @@ -36,19 +398,17 @@ - + - + - - - +
帖子来源：<%= link_to topic.url, topic.url%> 帖子来源：<%=link_to 'OSChina', topic.url %> + <%= no_use_link(topic, User.current) %>
<%= image_tag( "/images/sidebar/tags.png") %> - <%= render :partial => 'tags/tag_name', :locals => {:obj => topic,:object_flag => "9",:non_list_all => true }%>
diff --git a/app/views/open_source_projects/index.html.erb b/app/views/open_source_projects/index.html.erb index 01848edce..d958165ed 100644 --- a/app/views/open_source_projects/index.html.erb +++ b/app/views/open_source_projects/index.html.erb @@ -1,4 +1,4 @@ -
+
<%= form_tag(:controller => 'open_source_projects', :action => "search", :method => :get) do %> @@ -18,15 +18,16 @@
<% end %>
+ +<%= javascript_include_tag "ichart.1.2.min" %> +<%= stylesheet_link_tag "buglist-div-use.css" %> +<%= stylesheet_link_tag "buglist-ichart.css" %> +<%= stylesheet_link_tag "buglist.css" %> + +
+
+
+
+

安全态势分析

+
+
+ +
+

软件安全漏洞

More >>
+
+
+ +
+
+
+
+
+ + + + + + <%#======================================================================box before%> -
+
diff --git a/public/javascripts/ichart.1.2.min.js b/public/javascripts/ichart.1.2.min.js new file mode 100644 index 000000000..77dd6363a --- /dev/null +++ b/public/javascripts/ichart.1.2.min.js @@ -0,0 +1,9 @@ +/** + * ichartjs Library v1.2 http://www.ichartjs.com/ + * + * @author wanghe + * @Copyright 2013 wanghetommy@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + */ +;(function(c){var a=navigator.userAgent.toLowerCase(),b=Object.prototype.toString,d=/opera/.test(a),e=/\bchrome\b/.test(a),f=/webkit/.test(a),g=!e&&/safari/.test(a),j=!d&&/msie/.test(a),k=!!document.createElement("canvas").getContext,l=!f&&/gecko/.test(a),p=/ipod|ipad|iphone|android/gi.test(a),m=function(a,b,d,i){return d*a/i+b},r={easeIn:function(a,b,d,i){return d*(a/=i)*a*a+b},easeOut:function(a,b,d,i){return d*((a=a/i-1)*a*a+1)+b},easeInOut:function(a,b,d,i){return 1>(a/=i/2)?d/2*a*a*a+b:d/2*((a-=2)*a*a+2)+b}},o=function(a){var c=!1,v=!1,i=[],u=function(){if(document.addEventListener)return function(){document.removeEventListener("DOMContentLoaded",u,!1);w()};if(document.attachEvent)return function(){"complete"===document.readyState&&(document.detachEvent("onreadystatechange",u),w())}}(),y=function(){if(!c){try{document.documentElement.doScroll("left")}catch(a){setTimeout(y,1);return}w()}},w=function(){if(!c){c=!0;for(var a=0;ab;)b*=10,d*=10;return C(a*d+i)/d},O={white:"rgb(255,255,255)",green:"rgb(0,128,0)",gray:"rgb(80,80,80)",red:"rgb(255,0,0)",blue:"rgb(0,0,255)",yellow:"rgb(255,255,0)",black:"rgb(0,0,0)"},P=function(a){var i=/rgb\((\w*),(\w*),(\w*)\)/.exec(a);if(i)return[i[1],i[2],i[3]];if(i=/rgba\((\w*),(\w*),(\w*),(.*)\)/.exec(a))return[i[1],i[2],i[3],i[4]];throw Error("invalid colors value '"+a+"'");},H=function(a){if(!a)return a;a=a.replace(/\s/g,"").toLowerCase();if(/^rgb\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3}\)$/.exec(a)||/^rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},(0(\.[0-9])?|1(\.0)?)\)$/.exec(a))return a;if(/^#(([a-fA-F0-9]{6,7})|([a-fA-F0-9]{3}))$/.exec(a))return a=a.replace(/#/g,"").replace(/^(\w)(\w)(\w)$/,"$1$1$2$2$3$3"),(7==a.length?"rgba(":"rgb(")+parseInt(a.substring(0,2),16)+","+parseInt(a.substring(2,4),16)+","+parseInt(a.substring(4,6),16)+(7==a.length?",0."+a.substring(6,7)+")":")");if(O[a])return O[a];throw Error("invalid colors value '"+a+"'");},Q=function(a,i){i=i||0.14;return 0.5i?i:a/2},R=function(a,i,b,d){if(!i)return i;var i=P(H(i)),c;c=i;var u=void 0,e=void 0;s.isArray(c)&&(u=c[1],e=c[2],c=c[0]);c/=255;var u=u/255,e=e/255,y=L(L(c,u),e),f=M(M(c,u),e),f=y-f;if(0==f)c=[0,0,y];else{var w;c==y?w=(u-e)/f:u==y?w=(e-c)/f+2:e==y&&(w=(c-u)/f+4);w*=60;0>w&&(w+=360);c=[w,f/y,y]}c[1]-=0!=d?d||0.05:d;a?(c[2]-=Q(c[2],b),c[1]=s.upTo(c[1],1),c[2]=s.lowTo(c[2],0)):(c[2]+=Q(1-c[2],b),c[1]=s.lowTo(c[1],0),c[2]=s.upTo(c[2],1));d=i[3];a=i=void 0;s.isArray(c)&&(a=d,d=c[1],i=c[2],c=c[0]);var g,j,k,b=F(c/60)%6,e=c/60-b;c=i*(1-d);u=i*(1-d*e);d=i*(1-d*(1-e));switch(b){case 0:g=i;j=d;k=c;break;case 1:g=u;j=i;k=c;break;case 2:g=c;j=i;k=d;break;case 3:g=c;j=u;k=i;break;case 4:g=d;j=c;k=i;break;case 5:g=i,j=c,k=u}return"rgb"+(a?"a":"")+"("+C(255*g)+","+C(255*j)+","+C(255*k)+(a?","+a+")":")")};s.apply(s,{getFont:function(a,i,b,c){return a+" "+i+(c||"px")+" "+b},getDoc:function(){return a.contentWindow?a.contentWindow.document:a.contentDocument?a.contentDocument:a.document},DefineAbstract:function(a,i){if(!i[a])throw Error("Cannot instantiate the type '"+i.type+"'.you must implements it with method '"+a+"'.");},getAA:function(a){return"linear"==a?m:"easeInOut"==a||"easeIn"==a||"easeOut"==a?r[a]:m},noConflict:function(){return o},plugin:function(a,i,b){s.isFunction(a)&&a.plugin(i,b)},parsePadding:function(a,i){a=a||0;if(s.isNumber(a))return[a,a,a,a];if(s.isArray(a))return a;i=i||0;a=a.replace(/^\s+|\s+$/g,"").replace(/\s{2,}/g,/\s/).replace(/\s/g,",").split(",");1==a.length?a[0]=a[1]=a[2]=a[3]=A(a[0])||i:2==a.length?(a[0]=a[2]=A(a[0])||i,a[1]=a[3]=A(a[1])||i):3==a.length?(a[0]=A(a[0])||i,a[1]=a[3]=A(a[1])||i,a[2]=A(a[2])||i):(a[0]=A(a[0])||i,a[1]=A(a[1])||i,a[2]=A(a[2])||i,a[3]=A(a[3])||i);return a},distanceP2P:function(a,i,b,c){return T((b-a)*(b-a)+(c-i)*(c-i))},atan2Radian:function(a,i,b,c){if(a==b)return c>i?z/2:3*z/2;if(i==c)return b>a?0:z;var d=s.quadrant(a,i,b,c),a=n(J((i-c)/(a-b)));return d?(3==d?B:z)+(2==d?a:-a):a},angle2Radian:function(a){return a*z/180},radian2Angle:function(a){return 180*a/z},quadrant:function(a,i,b,c){return aa;)a+=B;return a},visible:function(a,i,b){if(a>=i)return[];var c=s.quadrantd(a),d=s.quadrantd(i);if((2==c||3==c)&&(2==d||3==d)&&i-az)a=B;else{if(i>B)return[{s:a,e:z,f:b},{s:B,e:i,f:b}];i>z&&(i=z)}return{s:a,e:i,f:b}},quadrantd:function(a){if(0==a)return 0;if(0==a%B)return 3;for(;0>a;)a+=B;return K(2*(a%B)/z)-1},upTo:function(a,i){return i>a?a:i},lowTo:function(a,i){return ii?s.between(i,a,b):b>i?i:bb&&ab?b+B:b;b%=B;return i-a>b},angleZInRange:function(a,i,b){return ia||bb&&a=b&&a<=b},inEllipse:function(a,i,b,c){return 1>=a*a/b/b+i*i/c/c},p2Point:function(a,i,b,c){return{x:a+I(b)*c,y:i+E(b)*c}},toRgb:H,toRgba:function(a,i){var b=P(H(a));return"rgba("+b[0]+","+b[1]+","+b[2]+","+i+")"},vectorP2P:function(a,i,b){b||(i=s.angle2Radian(i),a=s.angle2Radian(a));i=E(i);return{x:i*E(a),y:i*I(a)}},uid:function(a){return(a||"ichartjs")+"_"+K(1E4*Math.random())+(new Date).getTime().toString().substring(4)},register:function(a){if(s.isString(a))G[a.toLowerCase()]=a;else{var i=a.get("id");if(!i||""==i){for(i=s.uid(a.type);D[i];)i=s.uid(a.type);a.push("id",i)}if(D[i])throw Error("exist reduplicate id :"+i);a.id=i;D[i]=a}},create:function(a){if(!a.type||!G[a.type])throw Error("TypeNotFoundException["+a.type+"]");return new s[G[a.type]](a)},get:function(a){return D[a]},isPercent:function(a){return s.isString(a)&&a.match(/(.*)%/)},parsePercent:function(a,i){s.isString(a)&&(a=a.match(/(.*)%/))&&(a=i?F(A(a[1])*i/100):a[1]/100);return!a||0>=a||a>i?i:a},parseFloat:function(a,i){if(!s.isNumber(a)&&(a=A(a),!s.isNumber(a)))throw Error("["+i+"]="+a+"is not a valid number.");return a},ceil:function(a){return N(a,1)},floor:function(a){return N(a,-1)},_2D:"2d",_3D:"3d",light:function(a,i,b){return R(!1,a,i,b)},dark:function(a,i,b){return R(!0,a,i,b)},fixPixel:function(a){return s.isNumber(a)?a:A(a.replace("px",""))||0},toPixel:function(a){return s.isNumber(a)?a+"px":s.fixPixel(a)+"px"},emptyFn:function(){return!0},supportCanvas:k,isOpera:d,isWebKit:f,isChrome:e,isSafari:g,isIE:j,isGecko:l,isMobile:p,touch:"ontouchend"in document,FRAME:p?30:60});s.Assert={isTrue:function(a,i){if(!0!==a)throw Error(i);}};s.requestAnimFrame=function(){var i=a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(i){a.setTimeout(i,1E3/60)};return function(a){i(a)}}();s.Event={addEvent:function(a,i,b,c){a.addEventListener?a.addEventListener(i,b,c):a.attachEvent?a.attachEvent("on"+i,b):a["on"+i]=b},fix:function(i){"undefined"==typeof i&&(i=a.event);var b={target:i.target,pageX:i.pageX,pageY:i.pageY,offsetX:i.offsetX,offsetY:i.offsetY,stopPropagation:!1,event:i};if("undefined"==typeof i.offsetX){i.target||(b.target=i.srcElement||document);i.targetTouches&&(b.pageX=i.targetTouches[0].pageX,b.pageY=i.targetTouches[0].pageY);if(null==b.pageX&&null!=i.clientX){var c=document.documentElement,d=document.body;b.pageX=i.clientX+(c&&c.scrollLeft||d&&d.scrollLeft||0)-(c&&c.clientLeft||d&&d.clientLeft||0);b.pageY=i.clientY+(c&&c.scrollTop||d&&d.scrollTop||0)-(c&&c.clientTop||d&&d.clientTop||0)}for(var d=c=0,u=i.target;u!=document.body&&u;)c+=u.offsetLeft-(u.scrollLeft||0),d+=u.offsetTop,u=u.offsetParent;b.offsetX=b.pageX-c;b.offsetY=b.pageY-d}b.x=b.offsetX;b.y=b.offsetY;i.stopPropagation||(i.stopPropagation=function(){a.event.cancelBubble=true});return b}};return s}(c);Array.prototype.each=function(a,b){for(var c=this.length,i,d=0;di;d--)if(a?!a(this[d],this[d-1]):this[d]d&&(b=a.push("width",d)),d>b)){var f=a.get("align")||a.C;f==a.C?e+=(d-b)/2:f==a.R&&(e+=d-b)}a.x=a.push(a.X,e+a.get("offsetx"));a.y=a.push(a.Y,a.get(a.Y)+a.get("offsety"));a.push("fontStyle",c.getFont(a.get("fontweight"),a.get("fontsize"),a.get("font"),a.get("fontunit")));a.data=a.get("data");a.get("tip.enable")&&(a.pushIf("tip.border.color",a.get("f_color")),c.isFunction(a.get("tip.invokeOffset"))||a.push("tip.invokeOffset",a.tipInvoke()))},isMouseOver:function(a){return this.isEventValid(a,this)},redraw:function(a){this.root.draw(a,this.root.Combination)},last:c.emptyFn,commonDraw:function(a){a.proxy||a.doDraw.call(a,a)}});c.Tip=c.extend(c.Html,{configure:function(){c.Tip.superclass.configure.apply(this,arguments);this.type="tip";this.set({name:"",index:0,value:"",text:"",showType:"follow",invokeOffset:null,fade_duration:300,move_duration:100,timing_function:"ease-out",invokeOffsetDynamic:!1,style:"textAlign:left;padding:4px 5px;cursor:pointer;backgroundColor:rgba(239,239,239,.85);fontSize:12px;color:black;",border:{enable:!0,radius:5},delay:200});this.registerEvent("parseText")},position:function(a,b,c){c.style.top=(0>a?0:a)+"px";c.style.left=(0>b?0:b)+"px"},follow:function(a,b,d){d.get("invokeOffsetDynamic")?b.hit&&((c.isString(b.text)||c.isNumber(b.text))&&d.text(b.name,b.value,b.text,b.i,d),a=d.get("invokeOffset")(d.width(),d.height(),b),d.position(a.top,a.left,d)):"follow"!=d.get("showType")&&c.isFunction(d.get("invokeOffset"))?(a=d.get("invokeOffset")(d.width(),d.height(),b),d.position(a.top,a.left,d)):d.position(a.y-1.1*d.height()-2,a.x+2,d)},text:function(a,b,c,e,f){f.dom.innerHTML=f.fireString(f,"parseText",[f,a,b,c,e],c)},hidden:function(){this.get("animation")?this.css("opacity",0):this.css("visibility","hidden")},doAction:function(a){a.T.on("mouseover",function(b,c,e){a.show(c,e)}).on("mouseout",function(b,c){a.hidden(c)});if("follow"==a.get("showType"))a.T.on("mousemove",function(b,c,e){a.T.variable.event.mouseover&&setTimeout(function(){a.T.variable.event.mouseover&&a.follow(c,e,a)},a.get("delay"))})},initialize:function(){c.Tip.superclass.initialize.call(this);var a=this._();a.text(a.get("name"),a.get("value"),a.get("text"),a.get("index"),a);a.hidden();if(a.get("animation")){var b=a.get("move_duration")/1E3+"s "+a.get("timing_function")+" 0s";a.transition("opacity "+a.get("fade_duration")/1E3+"s "+a.get("timing_function")+" 0s");a.transition("top "+b);a.transition("left "+b);a.onTransitionEnd(function(){0==a.css("opacity")&&a.css("visibility","hidden")},!1)}}});c.CrossHair=c.extend(c.Html,{configure:function(){c.CrossHair.superclass.configure.apply(this,arguments);this.type="crosshair";this.set({top:0,left:0,hcross:!0,vcross:!0,invokeOffset:null,line_width:1,line_color:"#1A1A1A",delay:200})},follow:function(a,b,c){c.get("invokeOffset")?(a=c.get("invokeOffset")(a,b))&&a.hit?(c.o_valid=!0,c.position(a.top-c.top,a.left-c.left,c)):(!a||!c.o_valid)&&c.position(c.owidth,c.oheight,c):c.position(a.y-c.top-1,a.x-c.left-1,c)},position:function(a,b,c){c.horizontal.style.top=a-c.size+"px";c.vertical.style.left=b-c.size+"px"},doCreate:function(a,b,d){var e=document.createElement("div");e.style.width=c.toPixel(b);e.style.height=c.toPixel(d);e.style.backgroundColor=a.get("line_color");e.style.position="absolute";a.dom.appendChild(e);return e},doAction:function(a){a.T.on("mouseover",function(b,c,e){a.show(c,e)}).on("mouseout",function(b,c,e){a.hidden(c,e)}).on("mousemove",function(b,c,e){a.follow(c,e,a)})},initialize:function(){c.CrossHair.superclass.initialize.call(this);var a=this._(),b=c.toPixel(a.get("line_width"));a.size=a.get("line_width")/2;a.top=c.fixPixel(a.get(a.O));a.left=c.fixPixel(a.get(a.L));a.owidth=-a.T.root.width;a.oheight=-a.T.root.height;a.o_valid=!1;a.css("width","0px");a.css("height","0px");a.css("top",a.top+"px");a.css("left",a.left+"px");a.css("visibility","hidden");a.horizontal=a.doCreate(a,a.get("hcross")?c.toPixel(a.get(a.W)):"0px",b);a.vertical=a.doCreate(a,b,a.get("vcross")?c.toPixel(a.get(a.H)):"0px")}});c.Legend=c.extend(c.Component,{configure:function(){c.Legend.superclass.configure.apply(this,arguments);this.type="legend";this.set({data:void 0,width:"auto",column:1,row:"max",maxwidth:0,line_height:16,sign:"square",sign_size:10,sign_space:5,legend_space:5,z_index:1009,text_with_sign_color:!1,align:"right",valign:"middle"});this.atomic=!0;this.registerEvent("parse")},isEventValid:function(a,b){var c={valid:!1};a.x>this.x&&a.xb.y&&a.ye.x&&a.xe.y&&a.ya.get("maxwidth")&&(d=Math.floor(a.get("fontsize")*(a.get("maxwidth")/e)),!(10>d&&1==j))){9a.x?b.get("l_originx"):a.x)+a.get("offsetx"));a.y=a.push(a.Y,(0>a.y?b.get("t_originy"):a.y)+a.get("offsety"));g=a.y+a.get("padding_top");d=a.get("legend_space")+a.get("signwidth");for(p=0;pe*d&&(e+=Math.ceil((f-e*d)/d),e=a.push("row",e));a.columnwidth=[];a.columnheight=[];a.doLayout(a,b)}});c.Label=c.extend(c.Component,{configure:function(){c.Label.superclass.configure.apply(this,arguments);this.type="label";this.set({text:"",line_height:12,line_thickness:1,sign:"square",sign_size:12,padding:"2 5",offsety:2,sign_space:5,background_color:"#efefef",text_with_sign_color:!1});this.atomic=!0;this.registerEvent()},isEventValid:function(a,b){return{valid:c.inRange(b.labelx,b.labelx+b.get(b.W),a.x)&&c.inRange(b.labely,b.labely+b.get(b.H),a.y)}},text:function(a){a&&this.push("text",a);this.push(this.W,this.T.measureText(this.get("text"))+this.get("hpadding")+this.get("sign_size")+this.get("sign_space"))},localizer:function(a){var b=a.get("quadrantd"),c=a.get("line_points"),e=a.get("smooth"),b=1<=b&&2>=b,f=a.get("labelx"),g=a.get("labely");a.labelx=f+(b?-a.get(a.W)-e:e);a.labely=g-a.get(a.H)/2;c[2]={x:f,y:g};c[3]={x:c[2].x+(b?-e:e),y:c[2].y}},doLayout:function(a,b,c,e){e.push("labelx",e.get("labelx")+a/c);e.push("labely",e.get("labely")+b/c);e.get("line_points").each(function(c,d){c.x+=a;c.y+=b;return 1==d},e);e.localizer(e)},doDraw:function(a){var b=a.get("line_points"),c=a.get("sign_size"),e=a.labelx+a.get("padding_left"),f=a.labely+a.get("padding_top");a.T.label(b,a.get("line_thickness"),a.get("border.color"));a.T.box(a.labelx,a.labely,a.get(a.W),a.get(a.H),a.get("border"),a.get("f_color"),!1,a.get("shadow"));a.T.textStyle(a.L,a.O,a.get("fontStyle"));b=a.get("color");a.get("text_with_sign_color")&&(b=a.get("scolor"));"square"==a.get("sign")?a.T.box(e,f,c,c,0,a.get("scolor")):a.get("sign")&&a.T.round(e+c/2,f+c/2,c/2,a.get("scolor"));a.T.fillText(a.get("text"),e+c+a.get("sign_space"),f,a.get("textwidth"),b)},doConfig:function(){c.Label.superclass.doConfig.call(this);var a=this._();a.T.textFont(a.get("fontStyle"));a.get("fontsize")>a.get("line_height")&&a.push("line_height",a.get("fontsize"));a.get("sign")||(a.push("sign_size",0),a.push("sign_space",0));a.push(a.H,a.get("line_height")+a.get("vpadding"));a.text();a.localizer(a)}});c.Text=c.extend(c.Component,{configure:function(){c.Text.superclass.configure.apply(this,arguments);this.type="text";this.set({text:"",textAlign:"center",align:"center",background_color:0,textBaseline:"top",border:{enable:!1},width:0,height:0,padding:0,writingmode:"lr",line_height:16,rotate:0});this.registerEvent()},doDraw:function(a){a.get("box_feature")&&a.T.box(a.x,a.y,a.get(a.W),a.get(a.H),a.get("border"),a.get("f_color"));a.T.text(a.get("text"),a.get("textx"),a.get("texty"),a.get(a.W)-a.get("hpadding"),a.get("color"),a.get("textAlign"),a.get("textBaseline"),a.get("fontStyle"),a.get("writingmode"),a.get("line_height"),a.get("shadow"),a.get("rotate"))},isEventValid:function(){return{valid:!1}},doLayout:function(a,b,c,e){e.x=e.push(e.X,e.x+a);e.y=e.push(e.Y,e.y+b);e.push("textx",e.get("textx")+a);e.push("texty",e.get("texty")+b)},doConfig:function(){c.Text.superclass.doConfig.call(this);var a=this._(),b=a.x,d=a.y+a.get("padding_top"),e=a.get(a.W),f=a.get(a.H),g=a.get("textAlign"),b=b+(g==a.C?e/2:g==a.R?e-a.get("padding_right"):a.get("padding_left"));f&&(d+=f/2,a.push("textBaseline","middle"));a.push("textx",b);a.push("texty",d);a.push("box_feature",e&&f);a.applyGradient()}});(function(a){function b(i){"string"===typeof i&&(i=a(i));if(!i||!i.tagName||"canvas"!=i.tagName.toLowerCase())throw Error("there not a canvas element");this.canvas=i;this.c=this.canvas.getContext("2d")}var c=Math.PI,e=c/90,f=e/2,g=Math.ceil,j=Math.floor,k=2*c,l=Math.max,p=Math.min,m=Math.sin,r=Math.cos,o=function(a,b){return 1==a?j(b)+0.5:Math.round(b)},t=function(a,b,c,d){var e=b.x,f=b.y,g=a[c-1],j=a[c+1],k,n;if(ca&&n>f?(n=l(a,f),d=2*f-n):nc&&d>f?(d=l(c,f),n=2*f-d):df?d.length:f;for(var k=0;kf?j.length:f),b.push("maxItemSize",f);else if("stacked"==b.dataType||"complex"==b.dataType){var k=j.length,n,o,m,r="stacked"==b.dataType;if(0==k)for(var k=i[0].value.length,t=0;t=c)return this;this.save().gCo(t).strokeStyle(k,l,n).fillStyle(g).beginPath();d?(this.moveTo(a+r(e)*(c-d),b+m(e)*(c-d)).lineTo(a+r(e)*c,b+m(e)*c),this.c.arc(a,b,c,e,f,q),this.lineTo(a+r(f)*(c-d),b+m(f)*(c-d)),this.c.arc(a,b,c-d,f,e,!q)):(this.c.arc(a,b,c,e,f,q),p&&this.lineTo(a,b));this.closePath();k?this.shadowOn(o).stroke(k).shadowOff().fill(g):this.shadowOn(o).fill(g);return this.restore()},sector:function(a,b,c,d,e,f,g,j,k,n,l,o,m,q){l&&this.arc(a,b,c,d,e,f,g,j,k,n,l,o,!m,!q);return this.arc(a,b,c,d,e,f,g,j,k,n,!1,o,!m)},sector3D:function(){var i=function(i,b,c,d,u,f,g,j,y){var g=function(a,e){this.lineTo(i+c*r(a),b+(e||0)+d*m(a))},k=u;for(this.fillStyle(a.dark(y)).moveTo(i+c*r(u),b+d*m(u)).beginPath();k<=f;)g.call(this,k),k+=e;g.call(this,f);this.lineTo(i+c*r(f),b+j+d*m(f));for(k=f;k>=u;)g.call(this,k,j),k-=e;g.call(this,u,j);this.lineTo(i+c*r(u),b+d*m(u)).closePath().fill(!0)},b=function(a,i,b,c,d,e,u,f){b=a+b*r(u);c=i+e+c*m(u);this.moveTo(a,i).beginPath().fillStyle(f).lineTo(a,i+e).lineTo(b,c).lineTo(b,c-e).lineTo(a,i).closePath().fill(!0)},c=function(i,c,d,e,f,g,k,j,y){var w=a.quadrantd(f),l=a.quadrantd(g),y=a.dark(y);(1==w||2==w)&&b.call(this,i,c,d,e,k,j,f,y);(0==l||3==l)&&b.call(this,i,c,d,e,k,j,g,y)},d=function(a,b,d,e,u,f,g,k,j,w,l,o,m){this.ellipse(a,b+g,d,e,u,f,k,j,w,l,o,m,!0);c.call(this,a,b,d,e,u,f,m,g,k);this.ellipse(a,b,d,e,u,f,k,j,w,l,!1,m,!0);i.call(this,a,b,d,e,u,f,m,g,k);return this};d.layerPaint=c;d.sPaint=i;d.layerDraw=b;return d}(),textStyle:function(a,b,c){return this.textAlign(a).textBaseline(b).textFont(c)},strokeStyle:function(a,b,c,d){if(a&&(b&&(this.c.lineWidth=b),c&&(this.c.strokeStyle=c),d))this.c.lineJoin=d;return this},globalAlpha:function(a){a&&(this.c.globalAlpha=a);return this},fillStyle:function(a){a&&(this.c.fillStyle=a);return this},arc2:function(a,b,c,d,e,f){c&&this.c.arc(a,b,c,d,e,f);return this},textAlign:function(a){a&&(this.c.textAlign=a);return this},textBaseline:function(a){a&&(this.c.textBaseline=a);return this},textFont:function(a){a&&(this.c.font=a);return this},shadowOn:function(a){a&&(this.c.shadowColor=a.color,this.c.shadowBlur=a.blur,this.c.shadowOffsetX=a.offsetx,this.c.shadowOffsetY=a.offsety);return this},shadowOff:function(){this.c.shadowColor="white";this.c.shadowBlur=this.c.shadowOffsetX=this.c.shadowOffsetY=0;return this},gradient:function(a,b,c,d,e,f,g){var f=f.toLowerCase(),k=a,j=b,n=!f.indexOf("linear"),f=f.substring(14);if(n){switch(f){case "updown":j+=d;break;case "downup":b+=d;break;case "leftright":k+=c;break;case "rightleft":a+=c;break;default:return e[0]}return this.avgLinearGradient(a,b,k,j,e)}a+=c/2;b+=d/2;return this.avgRadialGradient(a,b,g||0,a,b,c>d?d:c,"outin"==f?e.reverse():e)},avgLinearGradient:function(a,b,c,d,e){a=this.createLinearGradient(a,b,c,d);for(b=0;bq.length;)q.push(!1);d=o(n,d);e=o(n,e);j=[];0>e?a.isObject(q[4])&&j.push(a.applyIf({points:[{x:b,y:c-k},{x:d,y:e-k},{x:d+g,y:e-k},{x:b+g,y:c-k}]},q[4])):a.isObject(q[0])&&j.push(a.applyIf({points:[{x:b,y:c},{x:d,y:e},{x:d+g,y:e},{x:b+g,y:c}]},q[0]));a.isObject(q[1])&&j.push(a.applyIf({points:[{x:d,y:e},{x:d,y:e-k},{x:d+g,y:e-k},{x:d+g,y:e}]},q[1]));a.isObject(q[2])&&j.push(a.applyIf({points:[{x:b,y:c},{x:b,y:c-k},{x:d,y:e-k},{x:d,y:e}]},q[2]));a.isObject(q[3])&&j.push(a.applyIf({points:[{x:b+g,y:c},{x:b+g,y:c-k},{x:d+g,y:e-k},{x:d+g,y:e}]},q[3]));0>e?a.isObject(q[0])&&j.push(a.applyIf({points:[{x:b,y:c},{x:d,y:e},{x:d+g,y:e},{x:b+g,y:c}]},q[0])):a.isObject(q[4])&&j.push(a.applyIf({points:[{x:b,y:c-k},{x:d,y:e-k},{x:d+g,y:e-k},{x:b+g,y:c-k}]},q[4]));a.isObject(q[5])&&j.push(a.applyIf({points:[{x:b,y:c},{x:b,y:c-k},{x:b+g,y:c-k},{x:b+g,y:c}]},q[5]));j.each(function(a){this.polygon(a.color,l,n,m,a.shadow,a.alpha,a.points)},this);return this},polygon:function(a,b,c,d,e,f,g,k,j,l){this.save().strokeStyle(b,c,d).beginPath().fillStyle(a).globalAlpha(f).shadowOn(e).moveTo(g[0].x,g[0].y);if(k){this.moveTo(o(c,l[0].x),o(c,l[0].y)).lineTo(o(c,g[0].x),o(c,g[0].y));for(d=1;d=k||n<=k||b!=d&&c!=e)return this.line(b,c,d,e,f,g,m);if(b>d||c>e)q=b,b=d,d=q,q=c,c=e,e=q;this.save().gCo(m).strokeStyle(!0,f,g).beginPath().moveTo(b,c);f=k*(l||1);g=j(n/(k+f));n=n-g*(k+f)>k;l=c==e;g=n?g+1:g;for(m=1;m<=g;m++)this.lineTo(l?b+k*m+f*(m-1):b,l?c:c+k*m+f*(m-1)).moveTo(l?b+(k+f)*m:b,l?c:c+(k+f)*m);n||this.lineTo(d,e);return this.stroke(!0).restore()},line:function(a,b,c,d,e,f,g){if(!e)return this;this.save().gCo(g);return this.beginPath().strokeStyle(!0,e,f).moveTo(o(e,a),o(e,b)).lineTo(o(e,c),o(e,d)).stroke(!0).restore()},round:function(a,b,c,d,e,f){return this.arc(a,b,c,0,0,k,d,!!f,e,f)},round0:function(a,b,c,d,e){return this.arc(a.x,a.y,b,0,0,k,c,!!e,d,e)},fillRect:function(a,b,c,d){this.c.fillRect(a,b,c,d);return this},translate:function(a,b){this.c.translate(a,b);return this},rotate:function(a){this.c.rotate(a);return this},clearRect:function(a,b,c,d){c=c||this.canvas.width;d=d||this.canvas.height;this.c.clearRect(a||0,b||0,c,d);return this},gCo:function(a){return a?this.gCO(a):this},gCO:function(a){this.c.globalCompositeOperation=a?"destination-over":"source-over";return this},box:function(b,e,f,l,m,q,s,p,t){m=m||{enable:0};if(m.enable){var n=m.width,r=m.color,v=m.radius,z=a.isNumber(n),n=a.parsePadding(n);n[0]==n[1]&&n[1]==n[2]&&n[2]==n[3]&&(z=!0);p=p?1:-1;f+=p*(n[1]+n[3])/2;l+=p*(n[0]+n[2])/2;b-=p*(n[3]/2);e-=p*(n[0]/2);n=z?n[0]:n;v=!z||!v||0==v||"0"==v?0:a.parsePadding(v)}this.save().gCo(t).fillStyle(q).strokeStyle(z,n,r);v?this.beginPath().moveTo(o(n,b+v[0]),o(n,e)).lineTo(o(n,b+f-v[1]),o(n,e)).arc2(o(n,b+f-v[1]),o(n,e+v[1]),v[1],3*c/2,k).lineTo(o(n,b+f),o(n,e+l-v[2])).arc2(o(n,b+f-v[2]),o(n,e+l-v[2]),v[2],0,c/2).lineTo(o(n,b+v[3]),o(n,e+l)).arc2(o(n,b+v[3]),o(n,e+l-v[3]),v[3],c/2,c).lineTo(o(n,b),o(n,e+v[0])).arc2(o(n,b+v[0]),o(n,e+v[0]),v[0],c,3*c/2).closePath().shadowOn(s).stroke(n).shadowOff().fill(q):!m.enable||z?(n&&m.enable&&(this.shadowOn(s).c.strokeRect(b,e,f,l),this.shadowOff()),q&&this.fillRect(b,e,f,l)):(n&&(r=a.isArray(r)?r:[r,r,r,r],this.shadowOn(s).line(b+f,e+n[0]/2,b+f,e+l-n[0]/2,n[1],r[1],0).line(b,e+n[0]/2,b,e+l-n[0]/2,n[3],r[3],0).line(j(b-n[3]/2),e,b+f+n[1]/2,e,n[0],r[0],0).line(j(b-n[3]/2),e+l,b+f+n[1]/2,e+l,n[2],r[2],0).shadowOff()),q&&this.beginPath().moveTo(j(b+n[3]/2),j(e+n[0]/2)).lineTo(g(b+f-n[1]/2),e+n[0]/2).lineTo(g(b+f-n[1]/2),g(e+l-n[2]/2)).lineTo(j(b+n[3]/2),g(e+l-n[2]/2)).lineTo(j(b+n[3]/2),j(e+n[0]/2)).closePath().fill(q));return this.restore()},toDataURL:function(a){return this.canvas.toDataURL(a||"image/png")},addEvent:function(b,c,d){a.Event.addEvent(this.canvas,b,c,d)}};a.taylor={light:function(a,b){b.highlight=!1;a.on("mouseover",function(){b.highlight=!0;a.redraw("mouseover")}).on("mouseout",function(){b.highlight=!1;a.redraw("mouseout")}).on("beforedraw",function(){a.push("f_color",b.highlight?a.get("light_color"):a.get("f_color_"));return!0})}};a.Chart=a.extend(a.Painter,{configure:function(){a.Chart.superclass.configure.apply(this,arguments);this.type="chart";this.dataType="simple";this.set({id:"",render:"",data:[],width:void 0,height:void 0,lineJoin:"round",align:"center",default_mouseover_css:!0,turn_off_touchmove:!1,showpercent:!1,decimalsnum:1,title:{text:"",fontweight:"bold",fontsize:20,height:30},subtitle:{text:"",fontweight:"bold",fontsize:16,height:20},footnote:{text:"",color:"#5d7f97",textAlign:"right",height:20},animation:!1,doAnimation:null,animation_timing_function:"easeInOut",animation_duration:1E3,z_index:999,legend:{enable:!1},tip:{enable:!1}});this.registerEvent("beforeAnimation","afterAnimation","resize","animating");this.T=null;this.show=this.Animationed=this.Combination=this.Rendered=!1;this.data=[];this.plugins=[];this.components=[];this.oneways=[];this.total=0;this.ICHARTJS_CHART=!0},toDataURL:function(a){return this.T.toDataURL(a)},segmentRect:function(){this.Combination||this.T.clearRect()},resetCanvas:function(){this.Combination||this.T.box(this.get("l_originx"),this.get("t_originy"),this.get("client_width"),this.get("client_height"),0,this.get("f_color"),0,0,!0)},animation:function(b){b.segmentRect();b.coo&&!b.ILLUSIVE_COO&&b.coo.draw();b.doAnimation(b.variable.animation.time,b.duration,b);b.plugins.each(function(a){a.A_draw&&(a.variable.animation.animating=!0,a.variable.animation.time=b.variable.animation.time,a.draw(),a.variable.animation.animating=!1)});b.Combination||(b.oneways.each(function(a){a.draw()}),b.variable.animation.time(a.isArray(c)?c.zIndex||0:c.get("z_index"))};this.components.sor(b);this.oneways.sor(b)},commonDraw:function(b,c){b.show=!1;b.redraw||(a.Assert.isTrue(b.Rendered,b.type+" has not rendered"),a.Assert.isTrue(b.data&&0");e.push("");e.push("

Your browser does not support the canvas element

");e.push("
");d.innerHTML=e.join("");c.shell=a(c.shellid);c.T=c.target=new b(c.canvasid);c.size(c);c.Rendered=!0},setUp:function(){var a=this._();a.redraw=!1;a.T.clearRect();a.initialization=!1;a.initialize()},load:function(a){var b=this._();b.push("data",a||[]);b.setUp();(b.Combination?b.root:b).draw()},resize:function(b,c){var b=a.parseFloat(b),c=a.parseFloat(c),d=this._();d.Combination||(d.width=d.push(d.W,b),d.height=d.push(d.H,c),d.size(d));d.set(d.fireEvent(d,"resize",[b,c]));d.setUp();d.plugins.eachAll(function(a){a.Combination&&a.resize(b,c)});d.Combination||d.draw()},size:function(a){a.T.canvas.width=a.width=a.pushIf(a.W,400);a.T.canvas.height=a.height=a.pushIf(a.H,300);a.shell.style.width=a.width+"px";a.shell.style.height=a.height+"px"},initialize:function(){var b=this._(),c=b.get("data"),d=b.get("render");b.push(b.X,null);b.push(b.Y,null);b.Combination?(a.apply(b.options,a.clone([b.W,b.H,"padding","border","client_height","client_width","minDistance","maxDistance","centerx","centery","l_originx","r_originx","t_originy","b_originy"],b.root.options,!0)),b.width=b.get(b.W),b.height=b.get(b.H),b.shell=b.root.shell,b.Rendered=!0):b.Rendered||d&&b.create(b,a(d));b.Rendered&&!b.initialization&&(c&&0e&&(k=a.push("start_scale",c.floor(e)));if(!c.isNumber(j)||jj-k){g=(j-k+"").indexOf(".")+1;for(b=1;0b.get("minValue"))a.min_scale=b.get("minValue");if(!a.end_scale||j&&a.end_scaleb.x&&a.xb.y}},doDraw:function(a){a.T.box(a.x,a.y,a.width,a.height,0,a.get("f_color"));if(a.get("striped")){var b,d,e=!1;a.get("axis.width");var f=c.dark(a.get("background_color"),a.get("striped_factor"),0)}var g="v"==a.get("striped_direction");a.gridlines.each(function(c){a.get("striped")&&(e&&(g?a.T.box(c.x1,c.y1+c.width,c.x2-c.x1,d-c.y1-c.width,0,f):a.T.box(b+c.width,c.y2,c.x1-b,c.y1-c.y2,0,f)),b=c.x1,d=c.y1,e=!e)}).each(function(b){b.overlap||(b.solid?a.T.line(b.x1,b.y1,b.x2,b.y2,b.width,b.color):a.T.dotted(b.x1,b.y1,b.x2,b.y2,b.width,b.color,b.size,b.fator))});a.T.box(a.x,a.y,a.width,a.height,a.get("axis"),!1,a.get("shadow"),!0);a.scale.each(function(a){a.draw()})},destroy:function(){this.crosshair&&this.crosshair.destroy()},doCrosshair:function(a){a.get("crosshair.enable")&&!a.crosshair&&(a.push("crosshair.wrap",a.root.shell),a.push("crosshair.height",a.height),a.push("crosshair.width",a.width),a.push("crosshair.top",a.y),a.push("crosshair.left",a.x),a.crosshair=new c.CrossHair(a.get("crosshair"),a))},doConfig:function(){c.Coordinate2D.superclass.doConfig.call(this);var a=this._();a.atomic=!1;a.width=a.get("_width");a.height=a.get("_height");a.valid_width=a.get("valid_width_value");a.valid_height=a.get("valid_height_value");a.get("gradient")&&c.isString(a.get("f_color"))&&a.push("f_color",a.T.avgLinearGradient(a.x,a.y,a.x,a.y+a.height,[a.get("dark_color"),a.get("light_color")]));if(a.get("axis.enable")){var b=a.get("axis.width");c.isArray(b)||a.push("axis.width",[b,b,b,b])}else a.push("axis.width",[0,0,0,0]);a.doCrosshair(a);var d,e=(b=!(!a.get("gridlinesVisible")||!a.get("grids")))&&!!a.get("grids.horizontal"),f=b&&!!a.get("grids.vertical"),g=a.height,j=a.width,k=a.valid_width,l=a.valid_height,b=a.get("gridlinesVisible")&&a.get("scale2grid")&&!(e&&f),p=a.push("x_start",a.x+(j-k)/2),m=a.push("y_start",a.y+(g-l)/2),r=a.get("axis.width");a.push("x_end",a.x+(j+k)/2);a.push("y_end",a.y+(g+l)/2);c.isArray(a.get("scale"))||(c.isObject(a.get("scale"))?a.push("scale",[a.get("scale")]):a.push("scale",[]));a.get("scale").each(function(b){d=(d=b.position)||a.L;d=d.toLowerCase();b[a.X]=a.x;b.coo=a;b[a.Y]=a.y;b.valid_x=p;b.valid_y=m;b.position=d;d==a.O?(b.which="h",b.distance=j,b.valid_distance=k):d==a.R?(b.which="v",b.distance=g,b.valid_distance=l,b[a.X]+=j,b.valid_x+=k):d==a.B?(b.which="h",b.distance=j,b.valid_distance=k,b[a.Y]+=g,b.valid_y+=l):(b.which="v",b.distance=g,b.valid_distance=l);a.scale.push(new c.Scale(b,a.root))},a);var o=a.push("ignoreOverlap",a.get("ignoreOverlap")&&a.get("axis.enable")||a.get("ignoreEdge"));if(o)var t=a.get("ignoreEdge")?function(b,c,d){return"v"==b?d==a.y||d==a.y+g:c==a.x||c==a.x+b}:function(b,c,d){return"v"==b?d==a.y&&0j?j:b);for(x=0;x<=q;x++)o&&a.gridlines.push(c.applyIf({overlap:t.call(a,"h",a.x+x*b,a.y),x1:a.x+x*b,y1:a.y,x2:a.x+x*b,y2:a.y+g,H:!1,width:i.width,color:i.color},i))}if(e){x=a.get("grids.horizontal");c.Assert.isTrue(0g?g:b);for(x=0;x<=q;x++)o&&a.gridlines.push(c.applyIf({overlap:t.call(a,"v",a.x,a.y+x*b),x1:a.x,y1:a.y+x*b,x2:a.x+j,y2:a.y+x*b,H:!0,width:v.width,color:v.color},v))}}});c.Coordinate3D=c.extend(c.Coordinate2D,{configure:function(){c.Coordinate3D.superclass.configure.apply(this,arguments);this.type="coordinate3d";this.dimension=c._3D;this.set({xAngle:60,yAngle:20,xAngle_:void 0,yAngle_:void 0,zHeight:0,pedestal_height:22,board_deep:20,left_board:!0,gradient:!0,color_factor:0.18,ignoreEdge:!0,striped:!1,grid_color:"#a4ad96",background_color:"#d6dbd2",shadow_offsetx:4,shadow_offsety:2,wall_style:[],axis:{enable:!1}})},doDraw:function(a){var b=a.width,c=a.height,e=a.get("xAngle_"),f=a.get("yAngle_"),g=a.get("zHeight"),j=a.get("z_offx"),k=a.get("z_offy");a.get("pedestal_height")&&a.T.cube3D(a.x,a.y+c+a.get("pedestal_height"),e,f,!1,b,a.get("pedestal_height"),3*g/2,a.get("axis.enable"),a.get("axis.width"),a.get("axis.color"),a.get("bottom_style"));a.get("board_deep")&&a.T.cube3D(a.x+j,a.y+c-k,e,f,!1,b,c,a.get("board_deep"),a.get("axis.enable"),a.get("axis.width"),a.get("axis.color"),a.get("board_style"));a.T.cube3D(a.x,a.y+c,e,f,!1,b,c,g,a.get("axis.enable"),a.get("axis.width"),a.get("axis.color"),a.get("wall_style"));a.gridlines.each(function(b){b.solid?(a.get("left_board")&&a.T.line(b.x1,b.y1,b.x1+j,b.y1-k,b.width,b.color),a.T.line(b.x1+j,b.y1-k,b.x2+j,b.y2-k,b.width,b.color)):(a.get("left_board")&&a.T.dotted(b.x1,b.y1,b.x1+j,b.y1-k,b.width,b.color,b.size,b.fator),a.T.dotted(b.x1+j,b.y1-k,b.x2+j,b.y2-k,b.width,b.color,b.size,b.fator))});a.scale.each(function(a){a.draw()})},doConfig:function(){c.Coordinate3D.superclass.doConfig.call(this);for(var a=this._(),b=a.get("wall_style"),d=a.get("background_color")||"#d6dbd2",e=a.height,f=a.width,g=a.get("color_factor"),j=a.push("z_offx",a.get("xAngle_")*a.get("zHeight")),k=a.push("z_offy",a.get("yAngle_")*a.get("zHeight"));6>b.length;)b.push({color:d});a.get("left_board")||(b[2]=!1,a.scale.each(function(a){a.doLayout(j,-k,a)}));a.push("bottom_style",[{color:a.get("shadow_color"),shadow:a.get("shadow")},!1,!1,{color:b[3].color},!1,{color:b[3].color}]);a.push("board_style",[!1,!1,!1,{color:b[4].color},{color:b[5].color},!1]);a.get("gradient")&&(c.isString(b[0].color)&&(b[0].color=a.T.avgLinearGradient(a.x,a.y+e,a.x+f,a.y+e,[c.dark(b[0].color,g/2+0.06),c.dark(b[0].color,g/2+0.06)])),c.isString(b[1].color)&&(b[1].color=a.T.avgLinearGradient(a.x+j,a.y-k,a.x+j,a.y+e-k,[c.dark(b[1].color,g),c.light(b[1].color,g)])),c.isString(b[2].color)&&(b[2].color=a.T.avgLinearGradient(a.x,a.y,a.x,a.y+e,[c.light(b[2].color,g/3),c.dark(b[2].color,g)])),a.get("bottom_style")[5].color=a.T.avgLinearGradient(a.x,a.y+e,a.x,a.y+e+a.get("pedestal_height"),[c.light(b[3].color,g/2+0.06),c.dark(b[3].color,g/2,0)]));a.push("wall_style",[b[0],b[1],b[2]])}});c.Rectangle=c.extend(c.Component,{configure:function(){c.Rectangle.superclass.configure.apply(this,arguments);this.type="rectangle";this.set({width:0,height:0,value_space:4,value:"",label:{},name:"",tipAlign:"top",valueAlign:"top",shadow_blur:3,shadow_offsety:-1});this.atomic=!0;this.registerEvent("parseText");this.label=null},last:function(a){a.label&&a.label.draw()},doDraw:function(a){a.drawRectangle()},doConfig:function(){c.Rectangle.superclass.doConfig.call(this);var a=this._(),b=a.variable.event,d=a.get("valueAlign");c.taylor.light(a,b);a.width=a.get(a.W);a.height=a.get(a.H);var b=a.push("centerx",a.x+a.width/2),e=a.push("centery",a.y+a.height/2),f=a.C,g="middle",j=a.get("value_space");d==a.L?(f=a.R,b=a.x-j):d==a.R?(f=a.L,b=a.x+a.width+j):d==a.B?(e=a.y+a.height+j,g=a.O):d==a.O&&(e=a.y-j,g=a.B);a.get("label")&&(a.push("label.originx",b),a.push("label.originy",e),a.push("label.text",a.push("value",a.fireString(a,"parseText",[a,a.get("value")],a.get("value")))),c.applyIf(a.get("label"),{textAlign:f,textBaseline:g,color:a.get("color")}),a.label=new c.Text(a.get("label"),a));a.get("tip.enable")&&("follow"!=a.get("tip.showType")&&a.push("tip.invokeOffsetDynamic",!1),a.tip=new c.Tip(a.get("tip"),a))}});c.Rectangle2D=c.extend(c.Rectangle,{configure:function(){c.Rectangle2D.superclass.configure.apply(this,arguments);this.type="rectangle2d";this.set({shadow_offsety:-2})},drawRectangle:function(){var a=this._();a.T.box(a.get(a.X),a.get(a.Y),a.get(a.W),a.get(a.H),a.get("border"),a.get("f_color"),a.get("shadow"))},isEventValid:function(a,b){return{valid:a.x>b.x&&a.xb.y}},tipInvoke:function(){var a=this._();return function(b,c){return{left:a.tipX(b,c),top:a.tipY(b,c)}}},doConfig:function(){c.Rectangle2D.superclass.doConfig.call(this);var a=this._(),b=a.get("tipAlign");b==a.L||b==a.R?a.tipY=function(b,c){return a.get("centery")-c/2}:a.tipX=function(b){return a.get("centerx")-b/2};b==a.L?a.tipX=function(b){return a.x-a.get("value_space")-b}:b==a.R?a.tipX=function(){return a.x+a.width+a.get("value_space")}:a.tipY=b==a.B?function(){return a.y+a.height+3}:function(b,c){return a.y-c-3};a.applyGradient()}});c.Rectangle3D=c.extend(c.Rectangle,{configure:function(){c.Rectangle3D.superclass.configure.apply(this,arguments);this.type="rectangle3d";this.dimension=c._3D;this.set({zHeight:void 0,xAngle:60,yAngle:20,xAngle_:void 0,yAngle_:void 0,shadow_offsetx:2})},drawRectangle:function(){var a=this._();a.T.cube(a.get(a.X),a.get(a.Y),a.get("xAngle_"),a.get("yAngle_"),a.get(a.W),a.get(a.H),a.get("zHeight"),a.get("f_color"),a.get("border.enable"),a.get("border.width"),a.get("light_color"),a.get("shadow"))},isEventValid:function(a,b){return{valid:a.x>b.x&&a.xb.y}},tipInvoke:function(){var a=this._();return function(b,c){return{left:a.topCenterX-b/2,top:a.topCenterY-c}}},doConfig:function(){c.Rectangle3D.superclass.doConfig.call(this);var a=this._();a.pushIf("zHeight",a.get(a.W));a.topCenterX=a.x+(a.get(a.W)+a.get(a.W)*a.get("xAngle_"))/2;a.topCenterY=a.y-a.get(a.W)*a.get("yAngle_")/2-a.get("value_space");a.get("valueAlign")==a.O&&a.label&&(a.label.push("textx",a.topCenterX),a.label.push("texty",a.topCenterY))}});c.Sector=c.extend(c.Component,{configure:function(){c.Sector.superclass.configure.apply(this,arguments);this.type="sector";this.set({value:"",name:"",ignored:!1,counterclockwise:!1,startAngle:0,middleAngle:0,endAngle:0,totalAngle:0,bound_event:"click",expand:!1,donutwidth:0,mutex:!1,increment:void 0,label_length:void 0,gradient_mode:"RadialGradientOutIn",mini_label_threshold_angle:15,mini_label:!1,label:{},rounded:!1});this.atomic=!0;this.registerEvent("changed","parseText");this.tip=this.label=null},bound:function(){this.expanded||this.toggle()},rebound:function(){this.expanded&&this.toggle()},toggle:function(){this.fireEvent(this,this.get("bound_event"),[this])},getDimension:function(){var a=this._();return{x:a.x,x:a.y,startAngle:a.get("startAngle"),middleAngle:a.get("middleAngle"),endAngle:a.get("endAngle")}},doDraw:function(a){a.get("ignored")||(a.label&&!a.get("mini_label")&&a.label.draw(),a.drawSector(),a.label&&a.get("mini_label")&&a.label.draw())},doText:function(a,b,d){a.push("label.originx",b);a.push("label.originy",d);a.push("label.textBaseline","middle");a.label=new c.Text(a.get("label"),a)},doLabel:function(a,b,d,e,f,g,j,k){a.push("label.originx",b);a.push("label.originy",d);a.push("label.quadrantd",e);a.push("label.line_points",f);a.push("label.labelx",g);a.push("label.labely",j);a.push("label.smooth",k);a.push("label.angle",a.get("middleAngle")%(2*Math.PI));a.label=new c.Label(a.get("label"),a)},isLabel:function(){return this.get("label")&&!this.get("mini_label")},doConfig:function(){c.Sector.superclass.doConfig.call(this);var a=this._(),b=a.variable.event,d=a.get("label"),e=a.get("bound_event"),f;a.get("rounded")?(a.push("startAngle",0),a.push("endAngle",2*Math.PI)):(c.taylor.light(a,b),a.push("totalAngle",a.get("endAngle")-a.get("startAngle")),d&&(a.get("mini_label")&&(a.get("mini_label_threshold_angle")*Math.PI/180>a.get("totalAngle")?a.push("mini_label",!1):c.apply(a.get("label"),a.get("mini_label"))),a.push("label.text",a.fireString(a,"parseText",[a,a.get("label.text")],a.get("label.text"))),a.pushIf("label.border.color",a.get("border.color")),a.push("label.scolor",a.get("background_color"))),a.variable.event.status=a.expanded=a.get("expand"),a.get("tip.enable")&&("follow"!=a.get("tip.showType")&&a.push("tip.invokeOffsetDynamic",!1),a.tip=new c.Tip(a.get("tip"),a)),b.poped=!1,a.on(e,function(){b.poped=true;a.expanded=!a.expanded;a.redraw(e);b.poped=false}),a.on("beforedraw",function(c,j){if(j==e){f=false;a.x=a.get(a.X);a.y=a.get(a.Y);if(a.expanded)if(a.get("mutex")&&!b.poped){a.expanded=false;f=true}else{a.x=a.x+a.get("inc_x");a.y=a.y-a.get("inc_y")}if(b.status!=a.expanded){a.fireEvent(a,"changed",[a,a.expanded]);f=true;b.status=a.expanded}d&&f&&a.label.doLayout(a.get("inc_x")*(a.expanded?1:-1),-a.get("inc_y")*(a.expanded?1:-1),2,a.label)}return true}))}});c.Sector2D=c.extend(c.Sector,{configure:function(){c.Sector2D.superclass.configure.apply(this,arguments);this.type="sector2d";this.set({radius:0})},drawSector:function(){this.T.sector(this.x,this.y,this.r,this.get("donutwidth"),this.get("startAngle"),this.get("endAngle"),this.get("f_color"),this.get("border.enable"),this.get("border.width"),this.get("border.color"),this.get("shadow"),this.get("counterclockwise"))},isEventValid:function(a,b){if(!b.get("ignored")){if(b.isLabel()&&b.label.isEventValid(a,b.label).valid)return{valid:!0};var d=c.distanceP2P(b.x,b.y,a.x,a.y),e=b.get("donutwidth");if(b.rd)return{valid:!1};if(c.angleInRange(b.get("startAngle"),b.get("endAngle"),c.atan2Radian(b.x,b.y,a.x,a.y)))return{valid:!0}}return{valid:!1}},tipInvoke:function(){var a=this,b=a.get("middleAngle"),d=c.quadrantd(b);return function(e,f){var g=c.p2Point(a.x,a.y,b,0.8*a.r);return{left:1<=d&&2>=d?g.x-e:g.x,top:2<=d?g.y-f:g.y}}},doConfig:function(){c.Sector2D.superclass.doConfig.call(this);var a=this._();a.r=a.get("radius");a.get("donutwidth")>a.r&&a.push("donutwidth",0);a.applyGradient(a.x-a.r,a.y-a.r,1.8*a.r,1.8*a.r);var b=a.get("middleAngle"),d=a.pushIf("increment",c.lowTo(5,a.r/10));a.push("inc_x",d*Math.cos(2*Math.PI-b));a.push("inc_y",d*Math.sin(2*Math.PI-b));d*=2;if(a.get("label"))if(a.get("mini_label"))P2=c.p2Point(a.x,a.y,b,a.get("donutwidth")?a.r-a.get("donutwidth")/2:5*a.r/8),a.doText(a,P2.x,P2.y);else{var e=c.quadrantd(b),f=c.p2Point(a.x,a.y,b,a.r+d),g=c.p2Point(a.x,a.y,b,a.r+0.6*d);P2=c.p2Point(a.x,a.y,b,a.r);a.doLabel(a,P2.x,P2.y,e,[{x:P2.x,y:P2.y},{x:g.x,y:g.y},{x:f.x,y:f.y}],f.x,f.y,0.4*d)}}});c.Sector3D=c.extend(c.Sector,{configure:function(){c.Sector3D.superclass.configure.apply(this,arguments);this.type="sector3d";this.dimension=c._3D;this.set({semi_major_axis:0,semi_minor_axis:0,cylinder_height:0});this.proxy=!0},isEventValid:function(a,b){if(!b.get("ignored")){if(b.isLabel()&&b.label.isEventValid(a,b.label).valid)return{valid:!0};if(!c.inEllipse(a.x-b.x,a.y-b.y,b.a,b.b))return{valid:!1};if(c.angleZInRange(b.sA,b.eA,c.atan2Radian(b.x,b.y,a.x,a.y)))return{valid:!0}}return{valid:!1}},p2p:function(a,b,c,e){return{x:a+this.a*Math.cos(c)*e,y:b+this.b*Math.sin(c)*e}},tipInvoke:function(){var a=this,b=a.get("middleAngle"),d=c.quadrantd(b);return function(c,f){var g=a.p2p(a.x,a.y,b,0.6);return{left:2<=d&&3>=d?g.x-c:g.x,top:3<=d?g.y-f:g.y}}},doConfig:function(){c.Sector3D.superclass.doConfig.call(this);var a=this._(),b=a.get("counterclockwise"),d=a.get("middleAngle");a.a=a.get("semi_major_axis");a.b=a.get("semi_minor_axis");a.h=a.get("cylinder_height");c.Assert.isTrue(0<=a.a*a.b,"major&minor");var e=2*Math.PI,f=function(d){for(;0>d;)d+=e;return Math.abs(c.atan2Radian(0,0,a.a*Math.cos(d),b?-a.b*Math.sin(d):a.b*Math.sin(d)))},g=a.pushIf("increment",c.lowTo(5,a.a/10));a.sA=f.call(a,a.get("startAngle"));a.eA=f.call(a,a.get("endAngle"));a.mA=f.call(a,d);a.push("inc_x",g*Math.cos(e-a.mA));a.push("inc_y",g*Math.sin(e-a.mA));g*=2;if(a.get("label"))if(a.get("mini_label"))g=a.p2p(a.x,a.y,d,0.5),a.doText(a,g.x,g.y);else{var f=c.quadrantd(d),j=a.p2p(a.x,a.y,d,g/a.a+1),k=a.p2p(a.x,a.y,d,0.6*g/a.a+1),d=a.p2p(a.x,a.y,d,1);a.doLabel(a,d.x,d.y,f,[{x:d.x,y:d.y},{x:k.x,y:k.y},{x:j.x,y:j.y}],j.x,j.y,0.4*g)}}});c.Pie=c.extend(c.Chart,{configure:function(){c.Pie.superclass.configure.call(this);this.type="pie";this.set({radius:"100%",offset_angle:0,separate_angle:0,bound_event:"click",counterclockwise:!1,intellectLayout:!0,layout_distance:4,pop_animate:!1,mutex:!1,increment:void 0,sub_option:{label:{}}});this.registerEvent("bound","rebound");this.sectors=[];this.components.push(this.sectors);this.ILLUSIVE_COO=!0},toggle:function(a){this.sectors[a||0].toggle()},bound:function(a){this.sectors[a||0].bound()},rebound:function(a){this.sectors[a||0].rebound()},getSectors:function(){return this.sectors},doAnimation:function(a,b,c){var e=0,f=c.oA;c.sectors.each(function(g){e=c.animationArithmetic(a,0,g.get("totalAngle"),b);g.push("startAngle",f);g.push("endAngle",f+=e);c.is3D()||g.drawSector()});c.is3D()&&c.proxy.drawSector()},parse:function(a){a.data.each(function(b,c){a.doParse(a,b,c)},a);a.localizer(a)},doParse:function(a,b,c){var e=b.name+" "+a.getPercent(b.value);a.doActing(a,b,null,c,e);a.push("sub_option.id",c);a.get("sub_option.label")&&a.push("sub_option.label.text",e);a.push("sub_option.listeners.changed",function(b,c){a.fireEvent(a,c?"bound":"rebound",[a,b.get("name")])});a.sectors.push(a.doSector(a,b))},doSector:function(a){return new c[a.sub](a.get("sub_option"),a)},dolayout:function(a,b,d,e,f,g){if(a.is3D()?c.inEllipse(a.get(a.X)-b,a.topY-d,a.a,a.b):c.distanceP2P(a.get(a.X),a.topY,b,d)j&&b.labely-j-1g&&b.labelx-gf?-1:1),b,e,f)},a);c.push(b)})}},doConfig:function(){c.Pie.superclass.doConfig.call(this);var a=this._(),b,d=a.get("radius"),e=a.get("sub_option.label")?0.35:0.44,f=2*Math.PI;a.sub=a.is3D()?"Sector3D":"Sector2D";a.sectors.zIndex=a.get("z_index");a.sectors.length=0;a.oA=c.angle2Radian(a.get("offset_angle"))%f;a.is3D()&&(e+=0.06);var g=a.data.length,j=c.angle2Radian(c.between(0,90,a.get("separate_angle"))),k=f-j,j=j/g,l=a.oA+j,p=l;0==a.total&&(b=1/g);a.data.each(function(c,d){l+=(b||c.value/a.total)*k;d==g-1&&(l=f+a.oA);c.startAngle=p;c.endAngle=l;c.totalAngle=l-p;c.middleAngle=(p+l)/2;p=l+j},a);a.r=d=c.parsePercent(d,Math.floor(a.get("minDistance")*e));a.topY=a.originXY(a,[d+a.get("l_originx"),a.get("r_originx")-d,a.get("centerx")],[a.get("centery")]).y;c.apply(a.get("sub_option"),c.clone([a.X,a.Y,"bound_event","mutex","increment"],a.options))}});c.Pie2D=c.extend(c.Pie,{configure:function(){c.Pie2D.superclass.configure.call(this);this.type="pie2d"},doConfig:function(){c.Pie2D.superclass.doConfig.call(this);var a=this._();a.push("sub_option.radius",a.r);a.parse(a)}});c.register("Pie2D");c.Pie3D=c.extend(c.Pie,{configure:function(){c.Pie3D.superclass.configure.apply(this,arguments);this.type="pie3d";this.dimension=c._3D;this.set({zRotate:45,yHeight:30});this.positive=!0},doSector:function(a,b){a.push("sub_option.cylinder_height",b.cylinder_height?b.cylinder_height*a.get("zRotate_"):a.get("cylinder_height"));return new c[a.sub](a.get("sub_option"),a)},one:function(a){var b,d,e=[],f=a.get("counterclockwise"),g=function(a,b){return 1+Math.sin(b?a+Math.PI:a)},j;lay=function(a,d,e,f){j=c.quadrantd(d);(a&&(0==j||3==j)||!a&&(2==j||1==j))&&b.push({g:d,z:d==e,x:f.x,y:f.y,a:f.a,b:f.b,color:c.dark(f.get("background_color")),h:f.h,F:f})};a.proxy=new c.Custom({z_index:a.get("z_index")+1,drawFn:function(){this.drawSector();e=[];a.sectors.each(function(a){a.get("label")&&(a.expanded?e.push(a.label):a.label.draw())});e.each(function(a){a.draw()})}});a.proxy.drawSector=function(){a.sectors.each(function(b){a.T.ellipse(b.x,b.y+b.h,b.a,b.b,b.get("startAngle"),b.get("endAngle"),0,b.get("border.enable"),b.get("border.width"),b.get("border.color"),b.get("shadow"),f,!0)},a);b=[];d=[];a.sectors.each(function(a){lay(f,a.get("startAngle"),a.get("endAngle"),a);lay(!f,a.get("endAngle"),a.get("startAngle"),a);d=d.concat(c.visible(a.get("startAngle"),a.get("endAngle"),a))},a);b.sor(function(a,b){var c=g(a.g)-g(b.g);return 0==c?a.z:0g((a.s+a.e)/2,1)-g((b.s+b.e)/2,1)});d.each(function(b){a.T.sector3D.sPaint.call(a.T,b.f.x,b.f.y,b.f.a,b.f.b,b.s,b.e,f,b.f.h,b.f.get("f_color"))},a);a.sectors.each(function(b){a.T.ellipse(b.x,b.y,b.a,b.b,b.get("startAngle"),b.get("endAngle"),b.get("f_color"),b.get("border.enable"),b.get("border.width"),b.get("border.color"),!1,!1,!0)},a)};a.one=c.emptyFn},doConfig:function(){c.Pie3D.superclass.doConfig.call(this);var a=this._(),b=c.angle2Radian(a.get("zRotate"));a.push("cylinder_height",a.get("yHeight")*a.push("zRotate_",Math.abs(Math.cos(b))));a.a=a.push("sub_option.semi_major_axis",a.r);a.b=a.push("sub_option.semi_minor_axis",a.r*Math.abs(Math.sin(b)));a.topY=a.push("sub_option.originy",a.get(a.Y)-a.get("yHeight")/2);a.parse(a);a.one(a);a.components.push(a.proxy)}});c.register("Pie3D");c.Donut2D=c.extend(c.Pie,{configure:function(){c.Donut2D.superclass.configure.call(this);this.type="donut2d";this.set({donutwidth:0.3,center:{text:"",line_height:24,fontweight:"bold",fontsize:24}})},doConfig:function(){c.Donut2D.superclass.doConfig.call(this);var a=this._(),b=a.r;a.push("sub_option.radius",b);0a.get("donutwidth")?a.push("donutwidth",Math.floor(b*a.get("donutwidth"))):a.get("donutwidth")>=b&&a.push("donutwidth",0),a.push("sub_option.donutwidth",a.get("donutwidth")));c.isString(a.get("center"))&&a.push("center",c.applyIf({text:a.get("center")},a.default_.center));""!=a.get("center.text")&&(a.push("center.originx",a.get(a.X)),a.push("center.originy",a.get(a.Y)),a.push("center.textBaseline","middle"),a.center=new c.Text(a.get("center"),a),a.components.push(a.center));a.parse(a)}});c.register("Donut2D");c.Column=c.extend(c.Chart,{configure:function(){c.Column.superclass.configure.call(this);this.type="column";this.set({coordinate:{},column_width:void 0,column_space:void 0,text_space:6,scaleAlign:"left",sub_option:{},label:{}});this.registerEvent();this.rectangles=[];this.labels=[];this.components.push(this.labels);this.components.push(this.rectangles)},doAnimation:function(a,b,c){var e;c.labels.each(function(a){a.draw()});c.rectangles.each(function(f){e=Math.ceil(c.animationArithmetic(a,0,f.height,b));f.push(c.Y,f.y+(f.height-e));f.push(c.H,e);f.drawRectangle()})},getCoordinate:function(){return this.coo},doLabel:function(a,b,d,e,f){a.labels.push(new c.Text(c.apply(a.get("label"),{id:b,text:d,originx:e,originy:f}),a))},doParse:function(a,b,c,e){a.doActing(a,b,e,c)},engine:function(a){var b=a.get("column_width"),c=a.get("column_space"),e=a.coo.getScale(a.get("scaleAlign")),f=a.coo.valid_height,g=b/2,j=b*(a.get("group_fator")||0),k="complex"!=a.dataType?b+c:a.data.length*b+c+(a.is3D()?(a.data.length-1)*j:0),l=a.coo.get("y_end"),p=l-e.basic*f-(a.is3D()?a.get("zHeight")*(a.get("bottom_scale")-1)/2*a.get("yAngle_"):0),m=c+a.coo.get("x_start"),l=l+a.get("text_space")+a.coo.get("axis.width")[2];a.doEngine(a,b,c,e,f,g,j,k,m,p,l)},doConfig:function(){c.Column.superclass.doConfig.call(this);var a=this._();a.sub=a.is3D()?"Rectangle3D":"Rectangle2D";a.rectangles.length=0;a.labels.length=0;a.rectangles.zIndex=a.get("z_index");a.labels.zIndex=a.get("z_index")+1;a.coo=c.Coordinate.coordinate_.call(a,function(){var b=a.data.length,c=a.get("coordinate.valid_width_value"),e,f,g;"complex"==a.dataType?(g=a.get("labels").length,b=g*b+(a.is3D()?(b-1)*g*a.get("group_fator"):0),e=Math.floor(c/(g+1+b)),f=a.pushIf("column_width",e),g+=1):("stacked"==a.dataType&&(b=a.get("labels").length),e=Math.floor(2*c/(3*b+1)),f=a.pushIf("column_width",e),g=b+1);f*b>c&&(f=a.push("column_width",e));a.push("column_space",(c-f*b)/g);a.is3D()&&(a.push("zHeight",a.get("column_width")*a.get("zScale")),a.push("sub_option.zHeight",a.get("zHeight")),a.push("sub_option.xAngle_",a.get("xAngle_")),a.push("sub_option.yAngle_",a.get("yAngle_")))});a.push("sub_option.width",a.get("column_width"))}});c.Column2D=c.extend(c.Column,{configure:function(){c.Column2D.superclass.configure.call(this);this.type="column2d"},doEngine:function(a,b,d,e,f,g,j,k,l,p,m){var r;a.data.each(function(b,d){r=(b.value-e.start)*f/e.distance;a.doParse(a,b,d,{id:d,originx:l+d*k,originy:p-(0c&&(f=a.push("bar_height",e));a.push("bar_space",(c-f*b)/g)});a.push("sub_option.height",a.get("bar_height"));a.push("sub_option.valueAlign",a.R);a.push("sub_option.tipAlign",a.R)}});c.Bar2D=c.extend(c.Bar,{configure:function(){c.Bar2D.superclass.configure.call(this);this.type="bar2d"},doEngine:function(a,b,d,e,f,g,j,k,l,p){var m;a.data.each(function(b,d){m=(b.value-e.start)*f/e.distance;a.doParse(a,b,d,{id:d,originy:p+d*j,width:Math.abs(m),originx:k+(0e.tipPosition&&0k-f-a-b?k-(f+b):k+b,j=0==e.tipPosition%2?j+c:j-g-c;return{left:k,top:j}}},PP:function(a,b,c,e,f,g){a.get("area")&&a.polygons.push([a.get("area_color")||a.get("light_color2"),0,a.get("brushsize"),0,0,a.get("area_opacity"),a.get("smooth")?b:[{x:c,y:e}].concat(b.concat([{x:f,y:g}])),a.get("smooth"),a.get("smoothing")||1.5,[{x:c,y:e},{x:f,y:g}]])},parse:function(a){a.polygons=[];a.lines=[];a.intersections=[];a.labels=[];var b=a.get("points"),d=a.get("intersection"),e=!!a.get("label"),f=[],g=!1,j=a.get("smooth"),k=a.get("smoothing")||1.5,l=a.get("f_color"),p=a.get("brushsize"),m=a.get("point_size");if(d){var r=a.getPlugin("sign"),o=l,t=a.get("hollow_color");a.sign_plugin=c.isFunction(r);a.sign_plugin_fn=r;a.get("hollow_inside")&&(o=t,t=l)}b.each(function(b){b.x_=b.x;b.y_=b.y;!b.ignored&&e&&(a.push("label.originx",b.x),a.push("label.originy",b.y-m/2-1),a.push("label.text",a.fireString(a,"parseText",[a,b.value],b.value)),c.applyIf(a.get("label"),{textBaseline:"bottom",color:a.get("f_color")}),a.labels.push(new c.Text(a.get("label"),a)));b.ignored&&g?(a.lines.push([f,p,l,j,k]),a.PP(a,f,f[0].x,a.y,f[f.length-1].x,a.y),f=[],g=!1):b.ignored||(f.push(b),g=!0);d&&!b.ignored&&a.intersections.push(a.sign_plugin?[a.T,a.get("sign"),b,m,b.color||o,b.hollow_color||t]:a.get("hollow")?[b,m/2-p+1,b.color||o,p+1,b.hollow_color||t]:[b,m/2,b.color||o])});f.length&&(a.lines.push([f,p,l,j,k]),a.PP(a,f,f[0].x,a.y,f[f.length-1].x,a.y))},doConfig:function(){c.LineSegment.superclass.doConfig.call(this);c.Assert.isTrue(0=f||f>d/2)f=a.push("event_range_x",d/2);0==e&&(e=a.push("event_range_y",b/2));a.get("tip.enable")&&(a.on("mouseover",function(){g.push(a);a.tipPosition=g.length}).on("mouseout",function(){g.pop()}),a.push("tip.invokeOffsetDynamic",!0),a.tip=new c.Tip(a.get("tip"),a));var l=a.get("coordinate"),p=a.get("limit_y"),m=a.get("keep_with_coordinate"),r=function(a,b,c){return!a.ignored&&Math.abs(b-a.x)=j.length-1){e=c.between(0,j.length-1,e);return r(j[e],b.x,b.y)?o(e):{valid:m}}for(var f=e;f<=e+1;f++)if(r(j[f],b.x,b.y))return o(f);return{valid:m}}}});c.Line=c.extend(c.Chart,{configure:function(){c.Line.superclass.configure.call(this);this.type="line";this.set({brushsize:1,coordinate:{axis:{width:[0,0,2,2]}},crosshair:{enable:!1},tipMocker:null,tipMockerOffset:null,scaleAlign:"left",labelAlign:"bottom",labels:[],label_space:6,proportional_spacing:!0,sub_option:{},legend:{sign:"bar"},label:{}});this.registerEvent("parsePoint");this.lines=[];this.components.push(this.lines)},getCoordinate:function(){return this.coo},doConfig:function(){c.Line.superclass.doConfig.call(this);var a=this._(),b=1==a.data.length;a.lines.length=0;a.lines.zIndex=a.get("z_index");var d=a.pushIf("sub_option.keep_with_coordinate",b);a.get("crosshair.enable")&&(a.pushIf("crosshair.hcross",b),a.push("crosshair.invokeOffset",function(b){b=a.lines[0].isEventValid(b);return b.valid?b:d}));a.Combination||(a.push("coordinate.crosshair",a.get("crosshair")),a.pushIf("coordinate.scale",[{position:a.get("scaleAlign"),max_scale:a.get("maxValue")},{position:a.get("labelAlign"),start_scale:1,scale:1,end_scale:a.get("maxItemSize"),labels:a.get("labels"),label:a.get("label")}]));a.coo=c.Coordinate.coordinate_.call(a);a.Combination&&(a.coo.push("crosshair",a.get("crosshair")),a.coo.doCrosshair(a.coo));var e=b=a.coo.valid_width,f=a.get("maxItemSize")-1,g=b/f,j=a.get("point_space");a.get("proportional_spacing")&&(j&&jr?0:1m||p>c.top)c.top=p}return{left:c.left-a-l>5?c.left-a-5:c.left+5,top:c.top}});var v=a.get("tip.listeners.parseText");v&&delete a.get("tip.listeners").parseText;a.mocker=new c.Custom({eventValid:function(b){t=a.lines[0].isEventValid(b);t.hit=o!=t.i;if(t.valid){o=t.i;k=[];a.lines.each(function(a,c){q=a.isEventValid(b);if(c==0)t.minTop=t.maxTop=q.top;else{t.minTop=Math.min(t.minTop,q.top);t.maxTop=Math.max(t.maxTop,q.top)}k.push(v?v(null,q.name,q.value,q.text,q.i):q.name+" "+q.value)});t.text=a.get("tipMocker").call(a,k,t.i)||"tipMocker not return"}return t.valid?t:false}});new c.Tip(a.get("tip"),a.mocker);a.register(a.mocker)}a.pushIf("sub_option.area_opacity",a.get("area_opacity"))}});c.LineBasic2D=c.extend(c.Line,{configure:function(){c.LineBasic2D.superclass.configure.call(this);this.type="basicline2d";this.tipInvokeHeap=[]},doAnimation:function(a,b,c){c.lines.each(function(e){e.get("points").each(function(f){f.y=e.y-Math.ceil(c.animationArithmetic(a,0,e.y-f.y_,b))});e.drawSegment()})},doConfig:function(){c.LineBasic2D.superclass.doConfig.call(this);var a=this._(),b,d=a.coo.valid_height,e=a.get("point_space"),f,g,j,k=a.get("sub_option.originx"),l,p;a.push("sub_option.tip.showType","follow");a.push("sub_option.coordinate",a.coo);a.push("sub_option.tipInvokeHeap",a.tipInvokeHeap);a.push("sub_option.point_space",e);a.data.each(function(m){b=a.coo.getScale(m.scaleAlign||a.get("scaleAlign"));l=a.get("sub_option.originy")-b.basic*d;f=[];m.value.each(function(r,o){g=e*o;j=(r-b.start)*d/b.distance;p={x:k+g,y:l-j,value:r,text:m.name+" "+r};c.merge(p,a.fireEvent(a,"parsePoint",[m,r,g,j,o,b]));f.push(p)},a);c.merge(a.get("sub_option"),m);a.push("sub_option.points",f);a.push("sub_option.brushsize",m.linewidth||m.line_width);a.lines.push(new c.LineSegment(a.get("sub_option"),a))},this)}});c.register("LineBasic2D");c.Area2D=c.extend(c.LineBasic2D,{configure:function(){c.Area2D.superclass.configure.call(this);this.type="area2d";this.set({area_opacity:0.3})},doConfig:function(){this.push("sub_option.area",!0);c.Area2D.superclass.doConfig.call(this)}});c.register("Area2D")})(iChart); \ No newline at end of file diff --git a/public/stylesheets/buglist-div-use.css b/public/stylesheets/buglist-div-use.css new file mode 100644 index 000000000..e84fb88cc --- /dev/null +++ b/public/stylesheets/buglist-div-use.css @@ -0,0 +1,41 @@ + .mask{ + position: relative; + overflow: hidden; + margin: 0px 0 0 0; + width: 970px; + + } + .header2{ + float: left; + width: 100%; + background-color: #f4f4f4 + } + .colleft{ + position: relative; + width: 100%; + right: 50%; + background-color: #000000 + } + .col1{ + position: relative; + overflow: hidden; + float: left; + width: 470px; + left: 100%; + + } + .col2{ + position: relative; + overflow: hidden; + float: left; + width: 470px; + left: 3%; + } + +a:hover, a:active { +color: #c61a1a; +text-decoration: underline; +} + + + diff --git a/public/stylesheets/buglist-ichart.css b/public/stylesheets/buglist-ichart.css new file mode 100644 index 000000000..9bf74fc1f --- /dev/null +++ b/public/stylesheets/buglist-ichart.css @@ -0,0 +1,74 @@ +@CHARSET "utf-8"; +/*body { + padding:0px; + margin:0px; + margin-top:10px; + text-align: left; + font-family:'微软雅黑',Trebuchet MS,Verdana,Helvetica,Arial,sans-serif; +}*/ +.ichartjs_btn{ + padding:2px 5px; + line-height:25px; + color:#0b2946; + cursor: pointer; + text-align:center; + font-size:12px; + /*border:1px solid #98adc1;*/ + -webkit-box-shadow:0px 0px 2px #375073; + -moz-box-shadow:0px 0px 2px #375073; + box-shadow:0px 0px 2px #375073; + /*-moz-border-radius:5px;*/ + /*-webkit-border-radius:5px;*/ + /*-khtml-border-radius:5px;*/ + /*border-radius:0px*/ +} +.ichartjs_author{ + position: absolute; + font-size:12px; + right: 20px; + top: 0px; +} +.ichartjs_author a{ + color:#113659; +} + +.ichartjs_info{ + position:relative; + margin:10px; + padding:5px; + color:#1b4267; +} +.ichartjs_sm{ + margin:10px 0px; + font-size: 13px; + font-weight: 60; +} +.ichartjs_details{ + padding:0px; + text-indent:2em; + font-size: 12px; + line-height:20px; +} +#ichartjs_code{ + display:none; +} +#ichartjs_result{ + position: absolute; + left: 20px; + bottom: 20px; + padding:8px; + color:#fefefe; + font-size:20px; + font-weight:600; + background-color:#6d869f; + cursor: pointer; + text-align:center; + /*border:1px solid #6a869d;*/ + -webkit-box-shadow:0px 0px 2px #375073; + -moz-box-shadow:0px 0px 2px #375073; + box-shadow:0px 0px 2px #375073; + /*-moz-border-radius:10px;*/ + /*-webkit-border-radius:10px;*/ + /*-khtml-border-radius:0px;*/ + /*border-radius:10px*/ +} \ No newline at end of file diff --git a/public/stylesheets/buglist.css b/public/stylesheets/buglist.css new file mode 100644 index 000000000..ed9c0d24a --- /dev/null +++ b/public/stylesheets/buglist.css @@ -0,0 +1,706 @@ +@charset utf-8; + + +a { +cursor:pointer; +} + +a:link { +color:#105DB5; +text-decoration:none; +} + +h3 { +font-size:16px; +} + +button { +border:1px solid #ccc; +border-radius:4px; +font-size:14px; +font-weight:700; +margin:5px 0; +padding:5px 18px 6px; +} + +pre { +white-space:0; +word-wrap:break-word; +} + +/*#main { +text-align:left; +width:870px; +background:#FFF; +margin:auto; +} + +#content { +background:#FFF; +width:94%; +float:left; +padding-top:45px; +margin:5px 25px; +}*/ + + + + +.li_list { +clear:both; +padding:0 0 0 0px; +} + +.li_more { +text-align:right; +clear:both; +margin:5px 0; +padding:0 0 1px; +} + +.li_time { +padding:0 7px 0 0; +} + +div.pages { +color:#AAA; +font-size:13px; +text-align:right; +margin:10px 0; +} + +div.pages a,.thispage,.break { +margin:2px; +padding:0 4px; +} + +div.pages .prev { +margin-right:5px; +} + +div.pages .next { +margin-left:5px; +} + +div.pages .thispage { +background:none repeat scroll 0 0 #4D5256; +color:#FFF; +} + + + +.clearfix:after { +clear:both; +content:" "; +display:block; +height:0; +line-height:0; +visibility:hidden; +} + +.searchform .searchinput { +background:none repeat scroll 0 0 #FFF; +border:medium none; +float:left; +font-family:Arial,sans-serif; +font-size:13px; +width:72px; +margin:0; +padding:0; +} + +.searchform .searchinput:focus { +width:196px; +} + + + + + + + +.article_title { +font-weight:700; +border-bottom:1px solid #CCC; +margin-bottom:5px; +padding:5px 0 10px; +} + +.vuln { +font-weight:700; +border-bottom:medium none!important; +padding:3px 0; +} + +.article { +padding:5px 0 5px 12px; +} + +.at_hr { +font-weight:700; +border-left:7px solid #778087; +border-bottom:medium none!important; +margin:9px 0; +padding:5px; +} + +.article_exp { +padding:0 0 0 20px; +} + +.sh_reference { +padding:0 0 0 15px; +} + +.sh_reference blockquote { +padding:5px 18px; +} + +.Statement { +color:red; +} + +.cell { +border-bottom:1px dashed #E0E0E0; +line-height:18px; +list-style:none; +padding:9px 0 9px 15px; +} + +.fade { +color:#999; +font-size:14px; +font-weight:700; +vertical-align:middle; +} + +.created { +color:#999; +display:block; +font-size:11px; +} + +.ntitle { +font-size:22px; +font-weight:700; +border-bottom:1px dashed #ECECEC; +padding:5px 15px; +} + +.nutime { +color:#999; +font-size:12px; +padding:5px 15px; +} + +.notags { +font-size:11px; +text-align:right; +margin-top:-24px; +padding:5px 15px; +} + +.notags a { +background:none repeat scroll 0 0 #778087; +border-radius:10px; +color:#FFF; +margin-bottom:5px; +padding:2px 10px; +} + +.notags a:hover { +background:none repeat scroll 0 0 #4D5256; +color:white; +text-decoration:none; +} + +.node_dir_list { +width:570px; +float:left; +overflow:hidden; +border-right:1px dashed #E2E2E2; +} + +.node_dir_side { +float:right; +width:220px; +overflow:hidden; +margin:0; +padding:0 15px 0 10px; +} + +.node_list ul { +clear:both; +padding:0 30px; +} + +.node_list li { +clear:both; +height:38px; +list-style-type:square; +font-size:15px; +padding:3px; +} + + + +.return_te { +text-align:right; +font-size:12px; +vertical-align:bottom; +margin-bottom:-15px; +padding-right:15px; +} + +.editor { +width:600px; +overflow:hidden; +font-size:12px; +} + +.editor .tools { +height:20px; +line-height:20px; +padding:0; +} + +.editor .tools a { +margin-right:15px; +text-decoration:none; +overflow:hidden; +} + +.editor .Container { +display:none; +position:absolute; +float:left; +z-index:1000; +width:330px; +height:95px; +border:1px solid #BBB; +background:#FFF; +overflow:hidden; +cursor:default; +padding:5px 0 10px 10px; +} + +.editor .imgIframe { +border:0; +width:100%; +height:22px; +margin:0; +padding:0; +} + +.editor .Button { +text-align:center; +margin:0; +padding:5px 0; +} + +.editor #attinfoDiv { +padding-top:5px; +color:#000; +} + +.Button input { +margin-right:5px; +font-size:12px; +} + +.editor input { +margin-right:5px; +font-size:11px; +} + +.na_list { +clear:both; +padding:15px 0 0 62px; +} + +.return_Nadir { +font-weight:700; +font-size:20px; +padding:0 0 15px; +} + +.return_Nav { +padding-left:10px; +align:left; +font-weight:700; +font-size:15px; +} + +.return_Nav a { +padding:0 .5px; +} + +.applists { +width:100%; +list-style-type:none; +float:left; +border-top:1px dashed #E0E0E0; +padding:40px 0 10px; +} + +.applists ul { +list-style-type:none; +width:98%; +list-style-position:outside; +float:left; +margin:5px 5px 10px 25px; +padding:0; +} + +.applists ul li { +width:25%; +display:inline; +float:left; +line-height:24px; +margin:0; +} + +.return_top { +text-align:right; +font-size:10px; +vertical-align:bottom; +margin-top:-15px; +padding-right:30px; +} + +.return_top a { +color:#999; +text-decoration:none; +} + +.return_en { +vertical-align:top; +align:left; +font-weight:900; +font-size:22px; +color:#666; +} + +.maintinfo { +width:820px; +background-color:#E9EEF2; +border-radius:5px; +float:left; +font-size:14px; +height:90px; +line-height:1.6; +position:relative; +color:#666; +border-style:none none inset; +margin:10px 0 15px; +} + +.maintinfo strong { +float:left; +font-size:20px; +height:64px; +padding-top:28px; +text-align:center; +width:230px; +} + +.maintinfo div { +padding:22px 0 18px; +} + +.maintinfo b { +font-size:13px; +font-weight:400; +margin-right:15px; +} + +.maintinfo em { +font-size:12px; +margin-right:15px; +} + +.maintinfo span { +float:right; +margin-top:-15px; +font-size:10px; +padding-right:9px; +} + +.maintinfo .blogo { +background:url(http://mit00.02753.com/sebug_flat_0da.png) no-repeat scroll 0 0 transparent; +display:block; +height:19px; +text-indent:-5000px; +width:52px; +float:right; +margin:-35px -58px 0 0; +} + +.aside { +float:right; +font-size:11px; +width:280px; +} + +.aside .group { +border-bottom:1px dashed #ECECEC; +clear:both; +margin-bottom:10px; +padding-bottom:10px; +} + +.aside .group li { +float:left; +height:22px; +margin-right:1%; +overflow:hidden; +white-space:nowrap; +width:32.299999%; +} + +.indexarticle { +float:left; +padding-right:5px; +width:530px; +} + +.bug_index_list ul { +list-style:none; +margin-bottom:20px; +} + +.bug_index_list li { +padding-left:10px; +position:relative; +line-height:26px; +} + +.indexarticle .topitems { +clear:both; +margin-bottom:20px; +font-size:11px; +padding:10px 0 0 10px; +} + +.indexarticle .topitems li { +float:left; +height:22px; +margin-right:1%; +overflow:hidden; +white-space:nowrap; +width:23%; +} + +.indexseach { +text-align:center; +margin:auto; +padding:110px 0; +} + +.lsbb { +background:#eee; +border:1px solid #999; +border-top-color:#ccc; +border-left-color:#ccc; +height:30px; +width:120px; +} + +.lsb { +font:14px arial; +background-position:bottom; +border:none; +color:#000; +cursor:pointer; +height:30px; +vertical-align:top; +background:#f1f1f1; +margin:0; +} + +.lsb:active { +background:#ccc; +} + +.tsf-p { +width:480px; +margin:0 auto; +} + +.lst-td { +border-bottom:1px solid #999; +padding-right:16px; +} + +.lst { +-moz-box-sizing:content-box; +background:#fff; +border:1px solid #ccc; +border-bottom:none; +color:#4D5256; +font:20px arial; +float:left; +height:26px; +vertical-align:middle; +width:100%; +padding:2px 10px 2px 6px; +} + +.com { +color:#800; +} + +.lit { +color:#066; +} + +.pun,.opn,.clo { +color:#440; +} + +.fun { +color:#red; +} + +.str,.atv { +color:#080; +} + +.kwd,.tag { +color:#008; +} + +.pln { +color:#000; +} + +.prettyprint { +padding:10px 0 10px 20px; +} + +ol.linenums { +margin:0 0 0 20px; +} + +ol.linenums li { +color:#959595; +line-height:15px; +padding:0 5px; +} + +.prettyprint-dark { +background-color:#1d1f21; +border:0; +padding:10px; +} + +.prettyprint-dark.linenums li { +color:#444; +} + +.prettyprint-dark.linenums li:hover { +background-color:#282a2e; +} + +.prettyprint-dark.kwd,.prettyprint-dark.tag { +color:#006; +font-weight:700; +} + +.prettyprint-dark.str,.prettyprint-dark.atv { +color:#060; +} + +#slider1 { +width:805px; +height:285px; +position:relative; +overflow:hidden; +} + +#slider1Content { +width:805px; +position:absolute; +top:0; +margin-left:0; +} + +.slider1Image { +float:center; +position:relative; +display:none; +} + +.slider1Image span { +position:absolute; +font:10px/15px Arial,sans-serif; +width:805px; +background-color:#E9EEF2; +filter:alpha(opacity=70); +-moz-opacity:.7; +-khtml-opacity:.7; +opacity:.7; +color:#000; +display:none; +padding:10px 13px; +} + +.top { +top:0; +left:0; +} + +.slider1Image span strong { +font-size:14px; +} + +.chart_p { +font-size:11px; +line-height:18px; +} + +#isad { +float:right; +background:url(http://mit00.02753.com/www/img/icon_ad.png) no-repeat scroll 0 0 transparent; +font-size:11px; +padding-left:20px; +line-height:11px; +} + +*,div.pages .next a,div.pages .prev a { +margin:0; +padding:0; +} + +a:hover,.created a:hover { +background-color:#105DB5; +color:#FFF; +text-decoration:none; +} + +h1,h2 { +font-size:18px; +} + +.fixed,.clear { +clear:both; +} + +.li_list li,.na_list li { +clear:both; +height:18px; +list-style-type:square; +padding:2px; +} + +div.pages .break,.created a { +color:#999; +} + +.tomore,.at_sebug { +padding:5px 0; +} + +.typ,.atn,.dec,.var,.prettyprint-dark.typ,.prettyprint-dark .atn,.prettyprint-dark .dec,.prettyprint-dark.var { +color:#606; +} \ No newline at end of file diff --git a/public/stylesheets/sec-analysis.css b/public/stylesheets/sec-analysis.css new file mode 100644 index 000000000..f3f2989b1 --- /dev/null +++ b/public/stylesheets/sec-analysis.css @@ -0,0 +1,41 @@ + .mask{ + position: relative; + overflow: hidden; + margin: 0px 0 0 0; + width: 690px; + + } + .header2{ + float: left; + width: 100%; + background-color: #f4f4f4 + } + .colleft{ + position: relative; + width: 100%; + right: 50%; + background-color: #000000 + } + .col1{ + position: relative; + overflow: hidden; + float: left; + width: 50%; + left: 100%; + + } + .col2{ + position: relative; + overflow: hidden; + float: left; + width: 50%; + left: 1%; + } + +a:hover, a:active { +color: #c61a1a; +text-decoration: underline; +} + + + From eda5121195e9d40785cd9761a72dc3277c438a9c Mon Sep 17 00:00:00 2001 From: ganyiang Date: Wed, 14 May 2014 12:03:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?1.=E6=96=B0=E5=A2=9Eosp=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=B8=96=E5=AD=90=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=88=E5=BE=85=E6=94=B9=E8=BF=9B=EF=BC=89?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9osp=E7=A4=BE=E5=8C=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84[=E5=85=A8=E7=90=83=E7=83=AD=E5=B8=96]=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F=EF=BC=8C=E9=BB=98=E8=AE=A425?= =?UTF-8?q?=E6=9D=A1->10=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open_source_projects_controller.rb | 35 ++++++++- .../open_source_projects/_show_memo.html.erb | 77 +++++++++++++++++++ .../_show_topics.html.erb | 11 ++- .../open_source_projects/showmemo.html.erb | 54 +++++++++++++ 4 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 app/views/open_source_projects/_show_memo.html.erb create mode 100644 app/views/open_source_projects/showmemo.html.erb diff --git a/app/controllers/open_source_projects_controller.rb b/app/controllers/open_source_projects_controller.rb index 4feca7b27..52b81610f 100644 --- a/app/controllers/open_source_projects_controller.rb +++ b/app/controllers/open_source_projects_controller.rb @@ -57,7 +57,7 @@ class OpenSourceProjectsController < ApplicationController @memo = RelativeMemo.new(:open_source_project => @open_source_project) @topic_count = @open_source_project.topics.count - @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] + @topic_pages = Paginator.new @topic_count, 10, params['page'] @memos = @open_source_project.topics. reorder("#{RelativeMemo.table_name}.sticky DESC"). includes(:last_reply). @@ -73,11 +73,40 @@ class OpenSourceProjectsController < ApplicationController format.json { render json: @open_source_project } end end - - def search + + +def search end + +# added by yiang 暴力添加,请绕道 +def showmemo + @open_source_project = OpenSourceProject.find(params[:id]) + + sort_init 'updated_at', 'desc' + sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at", + 'replies' => "#{RelativeMemo.table_name}.replies_count", + 'updated_at' => "COALESCE (last_replies_relative_memos.created_at, #{RelativeMemo.table_name}.created_at)" + + @memo = RelativeMemo.new(:open_source_project => @open_source_project) + @topic_count = @open_source_project.topics.count + @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] + @memos = @open_source_project.topics. + reorder("#{RelativeMemo.table_name}.sticky DESC"). + includes(:last_reply). + limit(@topic_pages.per_page). + offset(@topic_pages.offset). + order(sort_clause). + all + + respond_to do |format| + format.html { + render :layout => "base_opensource_p" + } + format.json { render json: @open_source_project } + end +end # GET /open_source_projects/new # GET /open_source_projects/new.json def new diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb new file mode 100644 index 000000000..0314bd3dc --- /dev/null +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -0,0 +1,77 @@ + + + +
+ 共有 <%= link_to memos.count %> 个贴子 +
+ <% if memos.any? %> + <% memos.each do |topic| %> + + + + + + +
<%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%> + <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> + + + + + + + + + + + + + + + + + + + +
<%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %> + + + + + + + +
<%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %>
回帖
 + + + + + + + +
<%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %>
关注
 + + + + + + + +
<%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %>
浏览
帖子来源：<%=link_to 'OSChina', topic.url %> + <%= no_use_link(topic, User.current) %>
+ + <% end %> + + <% else %> +

+ <%= l(:label_no_data) %> +

+ <% end %> +
\ No newline at end of file diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 306e0c8e5..8e958101d 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -20,7 +20,7 @@
- +

项目安全态势

<%= link_to "More >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    @@ -211,7 +211,8 @@
-

技术创新趋势

More >>
+

技术创新趋势

<%= link_to "More >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %> +
    @@ -352,7 +353,8 @@
    -

    全球热帖

    更多>> +

    全球热帖

     + <%= link_to "更多>>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    <% if memos.any? %> @@ -408,13 +410,10 @@ <%= no_use_link(topic, User.current) %> - - - <% end %> <%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos} %> +
    \ No newline at end of file From 543a199c5f4720ebc0b9fe262b0e1655f902d577 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Mon, 19 May 2014 15:40:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E5=BC=A0?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=A1=A8relative=5Fmemo=5Fto=5Fopen=5Fsource?= =?UTF-8?q?=5Fprojects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/relative_memo.rb | 2 +- .../relative_memo_to_open_source_project.rb | 3 +++ ...40515013449_add_author_to_relative_memo.rb | 2 +- ...e_relative_memo_to_open_source_projects.rb | 10 +++++++ db/schema.rb | 26 ++++++++++++------- .../relative_memo_to_open_source_projects.yml | 11 ++++++++ ...lative_memo_to_open_source_project_test.rb | 7 +++++ 7 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 app/models/relative_memo_to_open_source_project.rb create mode 100644 db/migrate/20140516031200_create_relative_memo_to_open_source_projects.rb create mode 100644 test/fixtures/relative_memo_to_open_source_projects.yml create mode 100644 test/unit/relative_memo_to_open_source_project_test.rb diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb index 24504241e..ba7974da3 100644 --- a/app/models/relative_memo.rb +++ b/app/models/relative_memo.rb @@ -12,7 +12,7 @@ class RelativeMemo < ActiveRecord::Base acts_as_taggable acts_as_attachable - validates_presence_of :osp_id, :subject + validates_presence_of :subject #validates :content, presence: true # validates_length_of :subject, maximum: 50 #validates_length_of :content, maximum: 3072 diff --git a/app/models/relative_memo_to_open_source_project.rb b/app/models/relative_memo_to_open_source_project.rb new file mode 100644 index 000000000..5dd00338c --- /dev/null +++ b/app/models/relative_memo_to_open_source_project.rb @@ -0,0 +1,3 @@ +class RelativeMemoToOpenSourceProject < ActiveRecord::Base + # attr_accessible :title, :body +end diff --git a/db/migrate/20140515013449_add_author_to_relative_memo.rb b/db/migrate/20140515013449_add_author_to_relative_memo.rb index 96f83f2c0..ba097ac4c 100644 --- a/db/migrate/20140515013449_add_author_to_relative_memo.rb +++ b/db/migrate/20140515013449_add_author_to_relative_memo.rb @@ -2,6 +2,6 @@ class AddAuthorToRelativeMemo < ActiveRecord::Migration def change add_column :relative_memos, :username, :string add_column :relative_memos, :userhomeurl, :string - add_column :relative_memos, :date_collected, :datetime + add_column :relative_memos, :date_collected, :date end end diff --git a/db/migrate/20140516031200_create_relative_memo_to_open_source_projects.rb b/db/migrate/20140516031200_create_relative_memo_to_open_source_projects.rb new file mode 100644 index 000000000..492577c6c --- /dev/null +++ b/db/migrate/20140516031200_create_relative_memo_to_open_source_projects.rb @@ -0,0 +1,10 @@ +class CreateRelativeMemoToOpenSourceProjects < ActiveRecord::Migration + def change + create_table :relative_memo_to_open_source_projects do |t| + t.integer :osp_id + t.integer :relative_memo_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b5cabfa7f..94206f0d4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140513073801) do +ActiveRecord::Schema.define(:version => 20140516031200) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -52,14 +52,11 @@ ActiveRecord::Schema.define(:version => 20140513073801) do add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" - create_table "attachmentstypes", :id => false, :force => true do |t| - t.integer "id", :null => false - t.integer "typeId" + create_table "attachmentstypes", :force => true do |t| + t.integer "typeId", :null => false t.string "typeName", :limit => 50 end - add_index "attachmentstypes", ["id"], :name => "id" - create_table "auth_sources", :force => true do |t| t.string "type", :limit => 30, :default => "", :null => false t.string "name", :limit => 60, :default => "", :null => false @@ -652,6 +649,13 @@ ActiveRecord::Schema.define(:version => 20140513073801) do add_index "queries", ["project_id"], :name => "index_queries_on_project_id" add_index "queries", ["user_id"], :name => "index_queries_on_user_id" + create_table "relative_memo_to_open_source_projects", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "relative_memos", :force => true do |t| t.integer "osp_id", :null => false t.integer "parent_id" @@ -668,6 +672,9 @@ ActiveRecord::Schema.define(:version => 20140513073801) do t.integer "viewed_count_crawl", :default => 0 t.integer "viewed_count_local", :default => 0 t.string "url" + t.string "username" + t.string "userhomeurl" + t.date "date_collected" end create_table "repositories", :force => true do |t| @@ -736,11 +743,10 @@ ActiveRecord::Schema.define(:version => 20140513073801) do t.string "url" t.string "title" t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.integer "user_id" - t.string "description" end create_table "softapplications", :force => true do |t| @@ -843,8 +849,8 @@ ActiveRecord::Schema.define(:version => 20140513073801) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "technical_title" t.integer "identity" + t.string "technical_title" t.string "student_id" t.string "teacher_realname" t.string "student_realname" diff --git a/test/fixtures/relative_memo_to_open_source_projects.yml b/test/fixtures/relative_memo_to_open_source_projects.yml new file mode 100644 index 000000000..c63aac0b6 --- /dev/null +++ b/test/fixtures/relative_memo_to_open_source_projects.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/unit/relative_memo_to_open_source_project_test.rb b/test/unit/relative_memo_to_open_source_project_test.rb new file mode 100644 index 000000000..f3ba567b0 --- /dev/null +++ b/test/unit/relative_memo_to_open_source_project_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class RelativeMemoToOpenSourceProjectTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 87a6dd4938dc8f6dffd7219827eae566d0e95c2f Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 20 May 2014 10:06:59 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A4=BE=E5=8C=BA=E4=B8=AD=20=E6=AF=8F?= =?UTF-8?q?=E4=B8=AA=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=BB=93=E6=9E=84=EF=BC=8C?= =?UTF-8?q?=20=E4=B8=8D=E5=86=8D=E6=98=AF=E4=B8=80=E5=AF=B9=E4=B8=80?= =?UTF-8?q?=E7=9A=84=E5=8C=B9=E9=85=8D=E5=B8=96=E5=AD=90=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E6=98=AF=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/open_source_project.rb | 17 ++++++++++++----- app/models/relative_memo.rb | 2 ++ .../relative_memo_to_open_source_project.rb | 4 ++++ .../20140401004102_create_relative_memos.rb | 4 ++-- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/models/open_source_project.rb b/app/models/open_source_project.rb index e526dc921..6413a0d9f 100644 --- a/app/models/open_source_project.rb +++ b/app/models/open_source_project.rb @@ -3,8 +3,10 @@ class OpenSourceProject < ActiveRecord::Base include Redmine::SafeAttributes has_many :applies, :class_name => "ApplyProjectMaster", :as => :apply, :dependent => :delete_all - has_many :topics, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :conditions => "#{RelativeMemo.table_name}.parent_id IS NULL", :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy - has_many :relative_memos, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :dependent => :destroy + has_many :relation_topics, :class_name => 'RelativeMemoToOpenSourceProject', :foreign_key => 'osp_id', :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy + # has_many :topics, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :conditions => "#{RelativeMemo.table_name}.parent_id IS NULL", :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy + has_many :topics, :through => :relation_topics, :class_name => 'RelativeMemo' + # has_many :relative_memos, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :dependent => :destroy has_many :tags, :through => :project_tags, :class_name => 'Tag' has_many :project_tags, :class_name => 'ProjectTags' has_many :masters, :class_name => 'ApplyProjectMaster', :as => :apply, :dependent => :delete_all, :conditions => "#{ApplyProjectMaster.table_name}.status = 2" @@ -126,9 +128,14 @@ class OpenSourceProject < ActiveRecord::Base def self.reset_counters!(id) osp_id = id.to_i - update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NULL)," + - " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," + - " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})", + # update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NULL)," + + # " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," + + # " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})", + # ["id = ?", osp_id]) + update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemoToOpenSourceProject.table_name} WHERE osp_id=#{osp_id})", + # + + # " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," + + # " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})", ["id = ?", osp_id]) end end diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb index ba7974da3..9f88c4c86 100644 --- a/app/models/relative_memo.rb +++ b/app/models/relative_memo.rb @@ -7,6 +7,8 @@ class RelativeMemo < ActiveRecord::Base has_many :tags, :through => :project_tags, :class_name => 'Tag' has_many :project_tags, :class_name => 'ProjectTags' + has_many :relation_topics, :class_name => 'RelativeMemoToOpenSourceProject' + has_many :no_uses, :as => :no_use, :dependent => :delete_all acts_as_taggable diff --git a/app/models/relative_memo_to_open_source_project.rb b/app/models/relative_memo_to_open_source_project.rb index 5dd00338c..2586d1c8e 100644 --- a/app/models/relative_memo_to_open_source_project.rb +++ b/app/models/relative_memo_to_open_source_project.rb @@ -1,3 +1,7 @@ class RelativeMemoToOpenSourceProject < ActiveRecord::Base # attr_accessible :title, :body + belongs_to :open_source_project, :foreign_key => "osp_id" + belongs_to :relative_memo, :foreign_key => 'relative_memo_id' + + validates_presence_of :osp_id, :relative_memo_id end diff --git a/db/migrate/20140401004102_create_relative_memos.rb b/db/migrate/20140401004102_create_relative_memos.rb index 6654b8fe5..6f0d776db 100644 --- a/db/migrate/20140401004102_create_relative_memos.rb +++ b/db/migrate/20140401004102_create_relative_memos.rb @@ -1,10 +1,10 @@ class CreateRelativeMemos < ActiveRecord::Migration def change create_table :relative_memos do |t| - t.integer :osp_id, :null => false + t.integer :osp_id, :null => true t.integer :parent_id, null: true t.string :subject, null: false - t.text :content, null: false + t.mediumtext :content, null: false t.integer :author_id t.integer :replies_count, default: 0 t.integer :last_reply_id From aed4b250a051cb8f5b73520885bd70773fa65519 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 20 May 2014 16:10:05 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8E=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/relative_memos_controller.rb | 4 ++-- app/models/relative_memo.rb | 6 +++++- app/models/relative_memo_to_open_source_project.rb | 9 ++++++++- app/views/open_source_projects/_show_topics.html.erb | 9 +++++---- app/views/open_source_projects/show.html.erb | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/controllers/relative_memos_controller.rb b/app/controllers/relative_memos_controller.rb index f8741365b..c862119df 100644 --- a/app/controllers/relative_memos_controller.rb +++ b/app/controllers/relative_memos_controller.rb @@ -37,7 +37,7 @@ class RelativeMemosController < ApplicationController def show pre_count = REPLIES_PER_PAGE - @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示 + # @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示 @memo.update_column(:viewed_count_local, (@memo.viewed_count_local.to_i + 1)) page = params[:page] @@ -142,7 +142,7 @@ class RelativeMemosController < ApplicationController def find_memo return unless find_osp - @memo = @open_source_project.relative_memos.find(params[:id]) + @memo = @open_source_project.topics.find(RelativeMemo.find(params[:id]).root.id) rescue ActiveRecord::RecordNotFound render_404 nil diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb index 9f88c4c86..11766bb05 100644 --- a/app/models/relative_memo.rb +++ b/app/models/relative_memo.rb @@ -12,7 +12,6 @@ class RelativeMemo < ActiveRecord::Base has_many :no_uses, :as => :no_use, :dependent => :delete_all acts_as_taggable - acts_as_attachable validates_presence_of :subject #validates :content, presence: true @@ -82,6 +81,11 @@ class RelativeMemo < ActiveRecord::Base { :include => :no_uses, :conditions => ["#{NoUse.table_name}.user_id = ?", user_id] } } + + # 获取帖子的回复 + def replies + memos = RelativeMemo.where("parent_id = ?", id) + end def no_use_for?(user) self.no_uses.each do |no_use| diff --git a/app/models/relative_memo_to_open_source_project.rb b/app/models/relative_memo_to_open_source_project.rb index 2586d1c8e..cb33de2d6 100644 --- a/app/models/relative_memo_to_open_source_project.rb +++ b/app/models/relative_memo_to_open_source_project.rb @@ -1,7 +1,14 @@ class RelativeMemoToOpenSourceProject < ActiveRecord::Base # attr_accessible :title, :body belongs_to :open_source_project, :foreign_key => "osp_id" - belongs_to :relative_memo, :foreign_key => 'relative_memo_id' + belongs_to :topic, :class_name => 'RelativeMemo', :foreign_key => 'relative_memo_id' + has_many :no_uses, :as => :no_use, :dependent => :delete_all + validates_presence_of :osp_id, :relative_memo_id + + scope :no_use_for, lambda { |user_id| + {:include => :no_uses, + :conditions => ["#{NoUse.table_name}.user_id = ?", user_id] } + } end diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 3ede2730e..5d4f7b3d6 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -13,11 +13,11 @@ - +
    <%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> - + @@ -26,7 +26,7 @@
    <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %>
    回答 - + @@ -43,7 +43,8 @@ - + <% relation_memo = RelativeMemoToOpenSourceProject.where("osp_id = ? and relative_memo_id = ?", open_source_project.id, topic.id).first %> +
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %>
    浏览
    帖子来源：<%= link_to topic.url, topic.url%> <%= no_use_link(topic, User.current) %> <%= no_use_link(relation_memo, User.current) %>
    <%= image_tag( "/images/sidebar/tags.png") %> diff --git a/app/views/open_source_projects/show.html.erb b/app/views/open_source_projects/show.html.erb index 0459e2399..d1751dec8 100644 --- a/app/views/open_source_projects/show.html.erb +++ b/app/views/open_source_projects/show.html.erb @@ -51,4 +51,4 @@ :title => l(:button_delete) ) if @forum.destroyable_by?(User.current) %> -<%= render :partial => 'open_source_projects/show_topics', :locals => {:memos => @memos} %> +<%= render :partial => 'open_source_projects/show_topics', :locals => {:memos => @memos, :open_source_project => @open_source_project} %> From 973a59042ce76901d5d3b07d18a858122dfec258 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 20 May 2014 16:33:50 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=8E=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 8 ++++++++ app/views/relative_memos/show.html.erb | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6b8525a00..cbfdca556 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -456,6 +456,14 @@ module ApplicationHelper def added_time(created) l(:label_added_time, :age => time_tag(created)).html_safe end + + def user_url_and_time(user_name, user_url, created) + unless user_name.nil? + l(:label_added_time_by, :author => link_to(user_name, user_url), :age => time_tag(created)).html_safe + else + l(:label_added_time, :age => time_tag(created)).html_safe + end + end #huang def betweentime(enddate) diff --git a/app/views/relative_memos/show.html.erb b/app/views/relative_memos/show.html.erb index be870b7eb..dad042a45 100644 --- a/app/views/relative_memos/show.html.erb +++ b/app/views/relative_memos/show.html.erb @@ -62,7 +62,7 @@ <% if @memo.author %> <%= authoring @memo.created_at, @memo.author.name %> <% else %> - <%= added_time @memo.created_at %> + <%= user_url_and_time @memo.username, @memo.userhomeurl, @memo.created_at %> <% end %>
    @@ -142,7 +142,7 @@ <% if reply.author %> <%= authoring reply.created_at, reply.author.name %> <% else %> - <%= added_time reply.created_at %> + <%= user_url_and_time reply.username, reply.userhomeurl, reply.created_at %> <% end %>
    From c5dd0317c2d503b75f768e181f5c612c6a72531e Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Wed, 21 May 2014 09:54:05 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=90=8E=E7=9A=84bug=EF=BC=88open=5Fsource=5Fproject=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open_source_projects/_show_memo.html.erb | 8 ++--- .../_show_topics.html.erb | 8 ++--- .../open_source_projects/showmemo.html.erb | 2 +- db/schema.rb | 30 ++++++++++++++----- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 0314bd3dc..8c1cbc819 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -14,11 +14,11 @@     		- +
    <%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> - + @@ -28,7 +28,7 @@
    <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %>
    回帖 - + @@ -38,7 +38,7 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %>
    关注 - + diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 8e958101d..bd57f9742 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -366,11 +366,11 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %>
    浏览 - +
    <%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> - + @@ -380,7 +380,7 @@
    <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %>
    回帖 - + @@ -390,7 +390,7 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %>
    关注 - + diff --git a/app/views/open_source_projects/showmemo.html.erb b/app/views/open_source_projects/showmemo.html.erb index c439a2138..387237113 100644 --- a/app/views/open_source_projects/showmemo.html.erb +++ b/app/views/open_source_projects/showmemo.html.erb @@ -51,5 +51,5 @@ :title => l(:button_delete) ) if @forum.destroyable_by?(User.current) %> -<%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos} %> +<%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos, :open_source_project => @open_source_project} %> \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 94206f0d4..0cb0be8cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140516031200) do +ActiveRecord::Schema.define(:version => 20140519074133) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -23,6 +23,11 @@ ActiveRecord::Schema.define(:version => 20140516031200) do add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" add_index "activities", ["user_id"], :name => "index_activities_on_user_id" + create_table "andoidcontests", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "apply_project_masters", :force => true do |t| t.integer "user_id" t.string "apply_type" @@ -605,6 +610,14 @@ ActiveRecord::Schema.define(:version => 20140516031200) do add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + create_table "projecting_softapplictions", :force => true do |t| + t.integer "user_id" + t.integer "softapplication_id" + t.integer "project_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "projects", :force => true do |t| t.string "name", :default => "", :null => false t.text "description" @@ -620,6 +633,7 @@ ActiveRecord::Schema.define(:version => 20140516031200) do t.boolean "inherit_members", :default => false, :null => false t.integer "project_type" t.boolean "hidden_repo", :default => false, :null => false + t.integer "user_id" t.integer "attachmenttype", :default => 1 end @@ -743,10 +757,11 @@ ActiveRecord::Schema.define(:version => 20140516031200) do t.string "url" t.string "title" t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.integer "user_id" + t.string "description" end create_table "softapplications", :force => true do |t| @@ -763,6 +778,7 @@ ActiveRecord::Schema.define(:version => 20140516031200) do t.integer "is_public" t.string "application_developers" t.string "deposit_project_url" + t.string "deposit_project" end create_table "students_for_courses", :force => true do |t| @@ -849,8 +865,8 @@ ActiveRecord::Schema.define(:version => 20140516031200) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.integer "identity" t.string "technical_title" + t.integer "identity" t.string "student_id" t.string "teacher_realname" t.string "student_realname" @@ -871,10 +887,8 @@ ActiveRecord::Schema.define(:version => 20140516031200) do add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" create_table "user_levels", :force => true do |t| - t.integer "user_id" - t.integer "level" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.integer "user_id" + t.integer "level" end create_table "user_preferences", :force => true do |t| From 290d07ffdd48811e426ad99b9cf4cab5ee88d01e Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Wed, 21 May 2014 10:04:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=B8=96=E5=AD=90bug=EF=BC=88open=5Fsource=5Fproject=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/relative_memos_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/relative_memos_controller.rb b/app/controllers/relative_memos_controller.rb index c862119df..924efe9e7 100644 --- a/app/controllers/relative_memos_controller.rb +++ b/app/controllers/relative_memos_controller.rb @@ -92,13 +92,14 @@ class RelativeMemosController < ApplicationController def create @memo = RelativeMemo.new(params[:relative_memo]) # @memo.url = "http://forge.trustie.net/open_source_projects" - @memo.osp_id = params[:open_source_project_id] + # @memo.osp_id = params[:open_source_project_id] @memo.author_id = User.current.id @memo.save_attachments(params[:attachments] || (params[:relative_memo] && params[:relative_memo][:uploads])) respond_to do |format| if @memo.save + RelativeMemoToOpenSourceProject.create(:osp_id => params[:open_source_project_id], :relative_memo_id => @memo.id) format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" } format.json { render json: @memo, status: :created, location: @memo } else From 45fa8b384a6dba65cf5f56ee4164a5959d424904 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Wed, 21 May 2014 10:24:34 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/open_source_projects/_show_topics.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index bd57f9742..c6df07c8e 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -20,7 +20,7 @@
    -

    项目安全态势

    <%= link_to "More >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    +

    项目安全态势

    <%= link_to "更多 >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
      @@ -211,7 +211,7 @@
    -

    技术创新趋势

    <%= link_to "More >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %> +

    技术创新趋势

    <%= link_to "更多 >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    @@ -353,7 +353,7 @@
    -

    全球热帖

     +

    全球热帖

     <%= link_to "更多>>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %>
    浏览