From f0f807b2dea6df60d29f41d864120762ff55167e Mon Sep 17 00:00:00 2001
From: ganyiang <ganyiang@gmail.com>
Date: Thu, 22 May 2014 15:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OSP=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E7=9A=84=E6=80=81=E5=8A=BF=E5=88=86=E6=9E=90=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9B=20=E4=BB=85=E4=BE=9B=E6=BC=94?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_topics.html.erb                     | 91 ++++++++++++++++---
 app/views/open_source_projects/index.html.erb | 39 +++++++-
 2 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index c6df07c8e..b78497011 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -34,7 +34,7 @@
 
       <!--       <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62257" title="BEESCMS 3.4 order_save.php SQL注入漏洞">BEESCMS 3.4 order_save.php SQL注入漏洞</a></li> -->
 
-      <!--       <li ><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM </a></li> -->
+          <li ><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM </a></li>
 
             <li><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62250" title="AlienVault OSSIM SQL注入以及远程代码执行">AlienVault OSSIM SQL注入</a></li>
 
@@ -52,23 +52,32 @@
  <script type="text/javascript">
                         $(function(){
                                 var flow=[];
-                                for(var i=0;i<35;i++){
+                                for(var i=0;i<24+5;i++){
                                         flow.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
                                         // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
                                 }
+
+
                                 
                                 var data = [
                                                 {
-                                                        name : 'commit',
+                                                        name :'',
                                                         value:flow,
                                                         color:'#0d8ecf',
                                                         line_width:2
                                                 }
 
                                          ];
-                         
-                                var labels = ["","2010","2011","2012","2013","2014"];
-                                
+
+                                          //创建x轴标签文本
+                                  var date = new Date()
+
+                                  var labels = [];
+                                 /* labels.push(date.getFullYear()-2);
+                                  labels.push(date.getFullYear()-1);
+                                  labels.push(date.getFullYear());*/
+                                 labels=["2012","","","","","","","","","","","","2013","","","","","","","","","","","","2014","","","",""];
+
                                 var line = new iChart.LineBasic2D({
                                         render : 'canvasDiv',
                                         data: data,
@@ -109,9 +118,30 @@
 										width:2,
 										color:'#3f8695'
 										},  	
-                                        },   
+                                        listeners:{
+                                        //tip:提示框对象、name:数据名称、value:数据值、text:当前文本、i:数据点的索引
+                                        parseText:function(tip,name,value,text,i){
+                                        return name+"漏洞数:"+value;
+                                            }
+                                        } ,
+                                          
+                                  },   
+                                   tipMocker:function(tips,i){
+                                          var index;
+                                          if (Math.floor(i/12)==0) {
+                                              index=0;
+                                          }else if (Math.floor(i/12)==1) {
+                                              index=12;
+                                          }else{
+                                            index=24;
+                                          };
+                                              return "<div style='font-weight:400'>"+
+                                              labels[index]+" "+//日期
+                                              ((i%12)==0?"1 月":((i%12+1))+"月")+  //时间
+                                              "</div>"+tips.join("<br/>");
+                                      }, 
 
-       //                                  legend : {
+                                     // legend : {
 							// 	enable : true,
 							// 	row:1,//设置在一行上显示，与column配合使用
 							// 	column : 'max',
@@ -226,7 +256,7 @@
 
       <!--       <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62257" title="BEESCMS 3.4 order_save.php SQL注入漏洞">BEESCMS 3.4 order_save.php SQL注入漏洞</a></li> -->
 
-      <!--       <li ><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM </a></li> -->
+          <li ><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM </a></li> 
 
             <li><span class="li_time">>[SQL注入漏洞]</span><a href="/vuldb/ssvid-62250" title="AlienVault OSSIM SQL注入以及远程代码执行">AlienVault OSSIM SQL注入</a></li>
 
@@ -243,22 +273,35 @@
 <script type="text/javascript">
                         $(function(){ 
                                 var flow=[];
-                                for(var i=0;i<35;i++){
+                                for(var i=0;i<24+5;i++){
                                         flow.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
                                         // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
+                                        
                                 }
+    
+
                                 
                                 var data = [
                                                 {
-                                                        name : 'commit',
+                                                        name : '',
                                                         value:flow,
                                                         color:'#0d8ecf',
                                                         line_width:2
                                                 }
 
                                          ];
-                         
-                                var labels = ["","2010","2011","2012","2013","2014"];
+
+                                  //创建x轴标签文本
+                                  var date = new Date()
+
+                                  var labels = [];
+                                 /* labels.push(date.getFullYear()-2);
+                                  labels.push(date.getFullYear()-1);
+                                  labels.push(date.getFullYear());
+                                  labels.push(date.getFullYear()+1);*/
+
+                          labels=["2012","","","","","","","","","","","","2013","","","","","","","","","","","","2014","","","",""];
+                               
                                 
                                 var line = new iChart.LineBasic2D({
                                         render : 'canvasDiv2',
@@ -300,7 +343,29 @@
 										width:2,
 										color:'#3f8695'
 										},  	
+                                        listeners:{
+                                        //tip:提示框对象、name:数据名称、value:数据值、text:当前文本、i:数据点的索引
+                                        parseText:function(tip,name,value,text,i){
+                                        return name+"帖子数:"+value+"万";
+                                                }
+                                           } ,
                                         },   
+
+                                      tipMocker:function(tips,i){
+                                          var index;
+                                          if (Math.floor(i/12)==0) {
+                                              index=0;
+                                          }else if (Math.floor(i/12)==1) {
+                    index=12;
+                                          }else{
+                                            index=24;
+                                          };
+                                              return "<div style='font-weight:400'>"+
+                                              labels[index]+" "+//日期
+                                              ((i%12)==0?"1 月":((i%12+1))+"月")+  //时间
+                                              "</div>"+tips.join("<br/>");
+                                              }, 
+
 							  crosshair:{
                                                 enable:true, //十字交叉线
                                                 line_color:'#62bce9'
diff --git a/app/views/open_source_projects/index.html.erb b/app/views/open_source_projects/index.html.erb
index d958165ed..ed17890d9 100644
--- a/app/views/open_source_projects/index.html.erb
+++ b/app/views/open_source_projects/index.html.erb
@@ -178,22 +178,32 @@ li {
  <script type="text/javascript">
                         $(function(){
                                 var flow=[];
-                                for(var i=0;i<35;i++){
+                                for(var i=0;i<24+5;i++){
                                         flow.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
                                         // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
                                 }
                                 
                                 var data = [
                                                 {
-                                                        name : 'commit',
+                                                        name : '',
                                                         value:flow,
                                                         color:'#0d8ecf',
                                                         line_width:2
                                                 }
 
                                          ];
+
+                                                   //创建x轴标签文本
+                                  var date = new Date()
+
+                                  var labels = [];
+                                 /* labels.push(date.getFullYear()-2);
+                                  labels.push(date.getFullYear()-1);
+                                  labels.push(date.getFullYear());*/
+
+                                  labels=["2012","","","","","","","","","","","","2013","","","","","","","","","","","","2014","","","",""];
                          
-                                var labels = ["","2010","2011","2012","2013","2014"];
+                                //var labels = ["","2010","2011","2012","2013","2014"];
                                 
                                 var line = new iChart.LineBasic2D({
                                         render : 'canvasDiv',
@@ -220,8 +230,29 @@ li {
 										radius : 5,
 										width:2,
 										color:'#3f8695'
-										},  	
+										},  
+							listeners:{
+                                        //tip:提示框对象、name:数据名称、value:数据值、text:当前文本、i:数据点的索引
+                                        parseText:function(tip,name,value,text,i){
+                                        return name+"漏洞数:"+value;
+                                            }
+                                        } ,	
                                         },   
+                                        tipMocker:function(tips,i){
+                                        	var index;
+                                        	if (Math.floor(i/12)==0) {
+                                        			index=0;
+                                        	}else if (Math.floor(i/12)==1) {
+										index=12;
+                                        	}else{
+                                        		index=24;
+                                        	};
+                                              return "<div style='font-weight:400'>"+
+                                              labels[index]+" "+//日期
+                                              ((i%12)==0?"1 月":((i%12+1))+"月")+  //时间
+                                              "</div>"+tips.join("<br/>");
+                                              }, 
+
 
                                         legend : {
 								enable : true,