From 4b1212f27952e1bb6307bc093e681bd93904629d Mon Sep 17 00:00:00 2001 From: ganyiang Date: Thu, 29 May 2014 09:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3OSP=E5=9C=A8rubymine=E4=B8=8B?= =?UTF-8?q?=E6=8A=A5=E7=BA=A2=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open_source_projects/_show_bug.html.erb | 2 +- .../open_source_projects/_show_memo.html.erb | 2 +- .../_show_topics.html.erb | 88 +++---------------- app/views/open_source_projects/index.html.erb | 16 ++-- 4 files changed, 19 insertions(+), 89 deletions(-) diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb index 97dae6829..678209813 100644 --- a/app/views/open_source_projects/_show_bug.html.erb +++ b/app/views/open_source_projects/_show_bug.html.erb @@ -2,7 +2,7 @@
- 共有 <%= link_to @topic_count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
<% if memos.any? %> diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 7d723dca9..616ff9bf3 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -2,7 +2,7 @@
- 共有 <%= link_to @topic_count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
<% if memos.any? %> diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index dacc9b013..1a16f5282 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -5,12 +5,13 @@ - + <%= javascript_include_tag "ichart.1.2.min" %> <%= stylesheet_link_tag "sec-analysis.css" %> <%= stylesheet_link_tag "buglist-ichart.css" %> <%= stylesheet_link_tag "buglist.css" %> +
@@ -27,26 +28,6 @@ <% @bugs.each do |bug| %>
  • >[<%= show_description(bug, open_source_project) %>]<%= link_to bug.subject, bug.url %>
    • <% end %> - - - - - - - - - - - - - - - - - - - -
    @@ -61,8 +42,6 @@ // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10); } - - var data = [ { name :'', @@ -127,7 +106,7 @@ parseText:function(tip,name,value,text,i){ return name+"漏洞数:"+value; } - } , + } }, tipMocker:function(tips,i){ @@ -143,18 +122,7 @@ labels[index]+" "+//日期 ((i%12)==0?"1 月":((i%12+1))+"月")+ //时间 "
    "+tips.join("
    "); - }, - - // legend : { - // enable : true, - // row:1,//设置在一行上显示，与column配合使用 - // column : 'max', - // valign:'top', - // sign:'bar', - // background_color:null,//设置透明背景 - // offsetx:-80,//设置x轴偏移，满足位置需要 - // border : true - // }, + }, crosshair:{ enable:true, //十字交叉线 line_color:'#62bce9' @@ -194,8 +162,7 @@ start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', - // label : {color:'#ffffff',fontsize:11}, + scale_color:'#9f9f9f' },{ position:'bottom', @@ -203,31 +170,7 @@ }] } }); - //开始画图 - /** -*自定义组件,画平均线。 -*/ -// line.plugin(new iChart.Custom({ -// drawFn:function(){ -// /** -// *计算平均值的高度(坐标Y值) -// *计算高度还不会！ 会划线了！ -// */ -// // var avg = line.total/5, -// // coo = line.getCoordinate(), -// // x = coo.get('originx'), -// // W = coo.width, -// // S = coo.getScale('left'), -// // H = coo.height, -// // h = (avg - S.start) * H / S.distance, -// // y = line.y + H - h; -// line.target.line(28,97,400,97,2,'#b32c0d') -// .textAlign('start') -// .textBaseline('middle') -// .textFont('600 12px Verdana'); -// } -// })); line.draw(); }); @@ -282,10 +225,7 @@ // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10); } - - - - var data = [ + var data = [ { name : '', value:flow, @@ -297,16 +237,9 @@ //创建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', data: data, @@ -352,7 +285,7 @@ parseText:function(tip,name,value,text,i){ return name+"帖子数:"+value+"万"; } - } , + } }, tipMocker:function(tips,i){ @@ -378,10 +311,9 @@ label:false, //是否显示数值 // hollow_inside:false, smooth : true,//平滑曲线 - point_size:2, // 焦点大小 + point_size:2 // 焦点大小 // point_hollow : true, - - + }, coordinate:{ width:225, // 图表大小 @@ -404,7 +336,7 @@ start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', + scale_color:'#9f9f9f' // label : {color:'#ffffff',fontsize:11}, },{ diff --git a/app/views/open_source_projects/index.html.erb b/app/views/open_source_projects/index.html.erb index e51ef4fc1..45ac4fa95 100644 --- a/app/views/open_source_projects/index.html.erb +++ b/app/views/open_source_projects/index.html.erb @@ -48,7 +48,7 @@ background-position: -266px 3px; } .navigation .icon-search, .navigation .nav-pill-cancle, .navigation .nav-switch-icon, .navigation .nav-topbar .topbar-search .topbar-submit, .navigation .nav-topbar-arror { - background: url(); + /*background: url()*/ } .nav-switch-icon { width: 15px; @@ -129,8 +129,6 @@ li { .nav-search-con{ padding-top: 7px; } - - <%= javascript_include_tag "ichart.1.2.min" %> <%= stylesheet_link_tag "buglist-div-use.css" %> @@ -146,7 +144,7 @@ li {
    -

    软件安全漏洞

    More >>
    +

    软件安全漏洞

    More >>
      @@ -158,7 +156,7 @@ li { - +
    • [SQL注入漏洞]Apache/NGINX 下 PHP-FPM 拒绝服务漏洞
      • @@ -236,7 +234,7 @@ li { parseText:function(tip,name,value,text,i){ return name+"漏洞数:"+value; } - } , + } }, tipMocker:function(tips,i){ var index; @@ -272,7 +270,7 @@ li { label:false, //是否显示数值 // hollow_inside:false, smooth : true,//平滑曲线 - point_size:2, // 焦点大小 + point_size:2 // 焦点大小 // point_hollow : true, @@ -298,7 +296,7 @@ li { start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', + scale_color:'#9f9f9f' // label : {color:'#ffffff',fontsize:11}, },{ @@ -417,7 +415,7 @@ line.target.line(28,97,400,97,2,'#b32c0d')
    -

    +