jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

This commit is contained in:
sw 2015-07-24 09:00:46 +08:00
parent 3f1852985e 7eb25867e9
commit 9d07987826
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/projects/yun_dep.html.erb
View File

@ -5,27 +5,27 @@
<!--JS进度条--> <!--JS进度条-->
<style type="text/css"> <style type="text/css">
#out{} #out{}
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;} #in{}
#font_color{background:yellow;text-align:center;color:white;} #font_color{background:yellow;text-align:center;color:white;}
</style> </style>
<div style="padding-left: 200px;"> <div style="padding-left: 200px;">
<div id='out'> <div id='out'>
<p style="padding-left: 120px;padding-bottom: 10px;font-size: 14px;">云化部署中...</p> <p style="padding-left: 100px;padding-bottom: 10px;font-size: 14px;padding-top: 10px;">云化部署中....</p>
<div style="width:300px;height:20px;background:#EEE;"> <div>
<div id="in" style="width:1%">0%</div> <div id="in" style="width:0%"></div>
<div> <div>
<script type="text/javascript"> <script type="text/javascript">
i=0; i=0;
$(function(){ $(function(){
ba=setInterval("begin()",50);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数 ba=setInterval("begin()",60);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
}); });
function begin() function begin()
{ {
i+=1; i+=1;
if(i<=100) if(i<=100)
{ {
document.getElementById("in").style.width=i+"%"; document.getElementById("in").style.width="";
document.getElementById("in").innerHTML=i+"%";} document.getElementById("in").innerHTML="";}
else else
{ {
clearInterval(ba); clearInterval(ba);

4
app/views/repositories/stats.html.erb
View File

@ -1,7 +1,9 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= l(:label_statistics) %></h2> <h2 class="project_h2"><%= l(:label_statistics) %></h2>
</div> </div>
<p> <div class="riviseRed fl"></div><div class="fl">修订 是版本库的提交次数, 显示为橘红色。</div><br>
<div class="changeBlue fl"></div><div class="fl">变更 是对版本库中文件的修改次数, 显示为蓝色。</div>
<p style="padding-top:35px;">
<%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %> <%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
</p> </p>
<p style="padding-top: 50px;"> <p style="padding-top: 50px;">

19
public/stylesheets/project.css
View File

@ -551,7 +551,24 @@ p.percent {
font-size: 12px; font-size: 12px;
} }
.repositorytitle select{ width: 110px; height: 21px; } .repositorytitle select{ width: 110px; height: 21px; }
.riviseRed {
width:15px;
height:15px;
margin-right: 3px;
background-color:#FF0000;
filter:alpha(opacity=50); /* ie 有效*/
-moz-opacity:0.5; /* Firefox 有效*/
opacity: 0.5; /* 通用，其他浏览器 有效*/
}
.changeBlue {
width:15px;
height:15px;
margin-right: 3px;
background-color:#0000FF;
filter:alpha(opacity=50); /* ie 有效*/
-moz-opacity:0.5; /* Firefox 有效*/
opacity: 0.5; /* 通用，其他浏览器 有效*/
}
/*导出*/ /*导出*/