Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: app/helpers/users_helper.rbszzh
commit
fe2d621dc3
@ -1,77 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h22"><%= l(:label_project_dts_new) %></h2>
|
||||
</div>
|
||||
|
||||
<!--JS进度条-->
|
||||
<style type="text/css">
|
||||
#out{}
|
||||
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
|
||||
#font_color{background:yellow;text-align:center;color:white;}
|
||||
td.redBox {border:1px solid #b0b0b0; width:80px; background-color:#EAEAEA; }
|
||||
td.redBox2 {border:1px solid #b0b0b0; width:120px; }
|
||||
</style>
|
||||
<div style="padding-left: 200px;">
|
||||
<div id='out'>
|
||||
<p style="padding-left: 100px;padding-bottom: 10px;font-size: 14px;">代码上传分析中...</p>
|
||||
<div style="width:300px;height:20px;background:#EEE;">
|
||||
<div id="in" style="width:1%">1%</div>
|
||||
<div>
|
||||
<script type="text/javascript">
|
||||
i=0;
|
||||
$(function(){
|
||||
ba=setInterval("begin()",70);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
|
||||
});
|
||||
function begin()
|
||||
{
|
||||
i+=1;
|
||||
if(i<=100)
|
||||
{
|
||||
document.getElementById("in").style.width=i+"%";
|
||||
document.getElementById("in").innerHTML=i+"%";}
|
||||
else
|
||||
{
|
||||
clearInterval(ba);
|
||||
$("#show_content_div").show();
|
||||
$("#out").hide();
|
||||
// document.getElementById("out").style.display="none";
|
||||
// document.write("<span style='background:yellow;text-align:center;color:white;'>Successs!</span>");
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="show_content_div" style="display: none;padding-top: 0px;">
|
||||
<p class="fr f14 " style="padding-right: 32px;padding-bottom: 10px;">语言：<span style="color: red">Java</span> 总文件数：<span style="color: red">361</span> 代码行数：<span style="color: red">48662</span></p>
|
||||
|
||||
<% @dts.each do |dt| %>
|
||||
<div style="padding-left: 35px;padding-top: 10px;">
|
||||
<table width="600" border="0" style="padding-left: 30px;padding-top: 100px; border-spacing:0; border-collapse:collapse; border: 1px solid #b0b0b0;">
|
||||
<tr>
|
||||
<td align="center" class="redBox">错误变量</td>
|
||||
<td class="redBox2"> <%= dt.Variable %></td>
|
||||
<td align="center" class="redBox">起始行</td>
|
||||
<td class="redBox2"> <%= dt.StartLine %></td>
|
||||
<td align="center" class="redBox">IP行</td>
|
||||
<td class="redBox2"> <%= dt.IPLine %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" class="redBox">缺陷代码</td>
|
||||
<td colspan="5" class="redBox2"> <%= dt.IPLineCode %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" class="redBox">错误描述</td>
|
||||
<td colspan="5" class="redBox2"> <%= dt.Description %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" class="redBox">文件</td>
|
||||
<td colspan="5" class="redBox2"> <%= dt.File %></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
@ -1,3 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h2"><%= l(:label_project_dts) %></h2>
|
||||
</div>
|
||||
@ -1,46 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h22"><%= l(:label_project_soft_file) %></h2>
|
||||
</div>
|
||||
|
||||
<!--JS进度条-->
|
||||
<style type="text/css">
|
||||
#out{}
|
||||
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
|
||||
#font_color{background:yellow;text-align:center;color:white;}
|
||||
</style>
|
||||
<div style="padding-left: 200px;">
|
||||
<div id='out'>
|
||||
<p style="padding-left: 100px;padding-bottom: 10px;font-size: 14px;">软件资源库部署中...</p>
|
||||
<div style="width:300px;height:20px;background:#EEE;">
|
||||
<div id="in" style="width:1%">0%</div>
|
||||
<div>
|
||||
<script type="text/javascript">
|
||||
i=0;
|
||||
$(function(){
|
||||
ba=setInterval("begin()",30);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
|
||||
});
|
||||
function begin()
|
||||
{
|
||||
i+=1;
|
||||
if(i<=100)
|
||||
{
|
||||
document.getElementById("in").style.width=i+"%";
|
||||
document.getElementById("in").innerHTML=i+"%";}
|
||||
else
|
||||
{
|
||||
clearInterval(ba);
|
||||
$("#show_content_div").show();
|
||||
$("#out").hide();
|
||||
// document.getElementById("out").style.display="none";
|
||||
// document.write("<span style='background:yellow;text-align:center;color:white;'>Successs!</span>");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="show_content_div" style="display: none;padding-top: 0px;">
|
||||
<p class="pl10 f14 "><a href="http://rubyblog.forge.trustie.net/myblog">云化部署工具部署完后的网址</a></p>
|
||||
</div>
|
||||
@ -1,46 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h22"><%= l(:label_project_soft_knowledge) %></h2>
|
||||
</div>
|
||||
|
||||
<!--JS进度条-->
|
||||
<style type="text/css">
|
||||
#out{}
|
||||
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
|
||||
#font_color{background:yellow;text-align:center;color:white;}
|
||||
</style>
|
||||
<div style="padding-left: 200px;">
|
||||
<div id='out'>
|
||||
<p style="padding-left: 120px;padding-bottom: 10px;font-size: 14px;">云化部署中...</p>
|
||||
<div style="width:300px;height:20px;background:#EEE;">
|
||||
<div id="in" style="width:1%">0%</div>
|
||||
<div>
|
||||
<script type="text/javascript">
|
||||
i=0;
|
||||
$(function(){
|
||||
ba=setInterval("begin()",30);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
|
||||
});
|
||||
function begin()
|
||||
{
|
||||
i+=1;
|
||||
if(i<=100)
|
||||
{
|
||||
document.getElementById("in").style.width=i+"%";
|
||||
document.getElementById("in").innerHTML=i+"%";}
|
||||
else
|
||||
{
|
||||
clearInterval(ba);
|
||||
$("#show_content_div").show();
|
||||
$("#out").hide();
|
||||
// document.getElementById("out").style.display="none";
|
||||
// document.write("<span style='background:yellow;text-align:center;color:white;'>Successs!</span>");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="show_content_div" style="display: none;padding-top: 0px;">
|
||||
<p class="pl10 f14 "><a href="http://rubyblog.forge.trustie.net/myblog">云化部署工具部署完后的网址</a></p>
|
||||
</div>
|
||||
@ -1,46 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h22"><%= l(:label_project_soft_service) %></h2>
|
||||
</div>
|
||||
|
||||
<!--JS进度条-->
|
||||
<style type="text/css">
|
||||
#out{}
|
||||
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
|
||||
#font_color{background:yellow;text-align:center;color:white;}
|
||||
</style>
|
||||
<div style="padding-left: 200px;">
|
||||
<div id='out'>
|
||||
<p style="padding-left: 120px;padding-bottom: 10px;font-size: 14px;">云化部署中...</p>
|
||||
<div style="width:300px;height:20px;background:#EEE;">
|
||||
<div id="in" style="width:1%">0%</div>
|
||||
<div>
|
||||
<script type="text/javascript">
|
||||
i=0;
|
||||
$(function(){
|
||||
ba=setInterval("begin()",30);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
|
||||
});
|
||||
function begin()
|
||||
{
|
||||
i+=1;
|
||||
if(i<=100)
|
||||
{
|
||||
document.getElementById("in").style.width=i+"%";
|
||||
document.getElementById("in").innerHTML=i+"%";}
|
||||
else
|
||||
{
|
||||
clearInterval(ba);
|
||||
$("#show_content_div").show();
|
||||
$("#out").hide();
|
||||
// document.getElementById("out").style.display="none";
|
||||
// document.write("<span style='background:yellow;text-align:center;color:white;'>Successs!</span>");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="show_content_div" style="display: none;padding-top: 0px;">
|
||||
<p class="pl10 f14 "><a href="http://rubyblog.forge.trustie.net/myblog">云化部署工具部署完后的网址</a></p>
|
||||
</div>
|
||||
@ -1,47 +0,0 @@
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h22"><%= l(:label_project_dts_yun) %></h2>
|
||||
</div>
|
||||
|
||||
<!--JS进度条-->
|
||||
<style type="text/css">
|
||||
#out{}
|
||||
#in{}
|
||||
#font_color{background:yellow;text-align:center;color:white;}
|
||||
</style>
|
||||
<div style="padding-left: 200px;">
|
||||
<div id='out'>
|
||||
<p style="padding-left: 100px;padding-bottom: 10px;font-size: 14px;padding-top: 10px;">云化部署中....</p>
|
||||
<div>
|
||||
<div id="in" style="width:0%"></div>
|
||||
<div>
|
||||
<script type="text/javascript">
|
||||
i=0;
|
||||
$(function(){
|
||||
ba=setInterval("begin()",60);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
|
||||
});
|
||||
function begin()
|
||||
{
|
||||
i+=1;
|
||||
if(i<=100)
|
||||
{
|
||||
document.getElementById("in").style.width="";
|
||||
document.getElementById("in").innerHTML="";}
|
||||
else
|
||||
{
|
||||
clearInterval(ba);
|
||||
$("#show_content_div").show();
|
||||
$("#out").hide();
|
||||
// document.getElementById("out").style.display="none";
|
||||
// document.write("<span style='background:yellow;text-align:center;color:white;'>Successs!</span>");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="show_content_div" style="display: none;padding-top: 0px; ">
|
||||
<p class="pl10 f14 "><span style="color: #7f7f7f;font-size: 14px; ">所部署服务的网址：</span>
|
||||
<span><a href="http://rubyblog.forge.trustie.net/accounts/login" target="_Blank" style="color: #15BCCF;font-size: 14px;">http://rubyblog.forge.trustie.net/accounts/login</a></span></p>
|
||||
</div>
|
||||
Loading…
Reference in new issue