Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
c0fc22ea72
|
|
@ -9,7 +9,7 @@
|
|||
<% if options[:length] %>
|
||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
|
||||
<% else %>
|
||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
|
||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true, :length => 32 -%>
|
||||
<% end %>
|
||||
</span>
|
||||
<%if is_float%>
|
||||
|
|
@ -26,9 +26,7 @@
|
|||
<span title="<%= attachment.description%>">
|
||||
<%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
|
||||
</span>
|
||||
<span class="size">(
|
||||
<%= number_to_human_size attachment.filesize %>)
|
||||
</span>
|
||||
<span class="size">(<%= number_to_human_size attachment.filesize , :precision => 0 %>)</span>
|
||||
<% if options[:deletable] %>
|
||||
<% if attachment.container_type == 'HomeworkAttach' %>
|
||||
<%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id},
|
||||
|
|
|
|||
|
|
@ -85,13 +85,13 @@
|
|||
show_btn.css('width', 25);
|
||||
|
||||
}
|
||||
//close???
|
||||
//close
|
||||
closeBtn.bind("click",function(){
|
||||
sideContent.animate({width: '0px'},"fast");
|
||||
show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
|
||||
cookiesave('minStatue','true','','','');
|
||||
});
|
||||
//show???
|
||||
//show
|
||||
show_btn.bind("click",function() {
|
||||
$(this).animate({width: '0px'},"fast");
|
||||
sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
|
||||
|
|
|
|||
|
|
@ -9,38 +9,87 @@
|
|||
.update{ border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;}
|
||||
a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;}
|
||||
a:hover.green_btn{ background:#289c2b;}
|
||||
a.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;}
|
||||
a:hover.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;}
|
||||
a.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;}
|
||||
a:hover.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;}
|
||||
</style>
|
||||
<script type="text/javascript" src="/javascripts/jquery.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
//升级提示关闭
|
||||
function close_window(){
|
||||
$('#light').slideUp(400);
|
||||
cookiesave('closeStatue','true','','','');
|
||||
}
|
||||
if ((navigator.userAgent.indexOf('MSIE 8.0') >= 0) && (navigator.userAgent.indexOf('Opera') < 0))
|
||||
{alert('你是使用IE')}else
|
||||
if (navigator.userAgent.indexOf('Firefox') >= 0)
|
||||
Document.html{
|
||||
div class="update" id="light">
|
||||
<p>您的浏览器版本过低，建议升级您的浏览器。
|
||||
<a href="#" onClick="close_window();" class="close_btn" ></a>
|
||||
</p>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
||||
function cookiesave(n, v, mins, dn, path)
|
||||
{
|
||||
if(n)
|
||||
{
|
||||
|
||||
if(!mins) mins = 24 * 60;
|
||||
if(!path) path = "/";
|
||||
var date = new Date();
|
||||
|
||||
date.setTime(date.getTime() + (mins * 60 * 1000));
|
||||
|
||||
var expires = "; expires=" + date.toGMTString();
|
||||
|
||||
if(dn) dn = "domain=" + dn + "; ";
|
||||
document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
|
||||
|
||||
}
|
||||
{alert('你是使用Firefox')}else
|
||||
if (navigator.userAgent.indexOf('Opera') >= 0){alert('你是使用Opera')}else
|
||||
{alert('你是使用其他的浏览器浏览网页！')}
|
||||
}
|
||||
function cookieget(n)
|
||||
{
|
||||
var name = n + "=";
|
||||
var ca = document.cookie.split(';');
|
||||
for(var i=0;i<ca.length;i++) {
|
||||
var c = ca[i];
|
||||
while (c.charAt(0)==' ') c = c.substring(1,c.length);
|
||||
if (c.indexOf(name) == 0){
|
||||
return c.substring(name.length,c.length);}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
var closeStatue = false;
|
||||
var u = window.navigator.userAgent.toLocaleLowerCase(),
|
||||
msie = /(msie) ([\d.]+)/,
|
||||
chrome = /(chrome)\/([\d.]+)/,
|
||||
firefox = /(firefox)\/([\d.]+)/,
|
||||
safari = /(safari)\/([\d.]+)/,
|
||||
opera = /(opera)\/([\d.]+)/,
|
||||
ie11 = /(trident)\/([\d.]+)/,
|
||||
b = u.match(msie)||u.match(chrome)||u.match(firefox)||u.match(safari)||u.match(opera)||u.match(ie11);
|
||||
var browser = b[1];
|
||||
var version = parseInt(b[2]);
|
||||
if (b == null) {
|
||||
return { browser : "", version : "0" };
|
||||
}
|
||||
//test firefox
|
||||
if (browser == "firefox"&& cookieget('closeStatue') == false) {
|
||||
/* $("#update_info").html("您当前使用的是"+browser+"浏览器。"+"主版本号为："+version); */
|
||||
cookiesave('closeStatue','true','','','');
|
||||
}
|
||||
if (browser == "msie" && version<= 8 && cookieget('closeStatue') == false) {
|
||||
cookiesave('closeStatue','false','','','');
|
||||
|
||||
}
|
||||
// test IE11
|
||||
if (browser == "trident" && version<= 7 && cookieget('closeStatue') == false) {
|
||||
/* return true; */
|
||||
cookiesave('closeStatue','true','','','');
|
||||
}
|
||||
if( cookieget('closeStatue') == 'false' )
|
||||
{
|
||||
$("#update_info").append("<div class='update' id='light'><span style='font-size: 14px;line-height:2.2;' id='browser_info'>您当前使用的是IE8浏览器或IE低版本浏览器，建议升级您的浏览器。</span><a href='#' onClick='close_window();' class='update_close_btn' ></a><div class='cl'></div></div>");
|
||||
}
|
||||
})
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body style=" height:1500px;">
|
||||
<div class="update" id="light">
|
||||
<span style="font-size: 14px;line-height:2.2;">您当前使用的是IE8浏览器，建议升级您的浏览器。
|
||||
<a href="#" onClick="close_window();" class="close_buttton" ></a>
|
||||
</span>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
||||
<div id="update_info"></div>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-
|
||||
|
|
@ -178,7 +178,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td valign="top" colspan="2">
|
||||
<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 7} %>
|
||||
<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 15} %>
|
||||
<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -136,7 +136,11 @@ en:
|
|||
# 项目托管平台
|
||||
#
|
||||
# 问题跟踪
|
||||
label_issues_sum: 'Total'
|
||||
lable_issues_undo: 'Unresolved：'
|
||||
label_successful_create: Successfully created
|
||||
|
||||
|
||||
#
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@ zh:
|
|||
|
||||
label_issue_tracking: 问题跟踪
|
||||
label_release_issue: 发布问题
|
||||
label_issues_sum: 问题总数：
|
||||
lable_issues_undo: 未解决：
|
||||
|
||||
|
||||
project_module_boards: 讨论区
|
||||
project_module_boards_post: 发帖
|
||||
|
|
@ -144,6 +143,9 @@ zh:
|
|||
#
|
||||
# 问题跟踪
|
||||
label_successful_create: 创建成功
|
||||
label_issues_sum: '问题总数'
|
||||
lable_issues_undo: '未解决：'
|
||||
|
||||
#
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ a:hover.more{ color:#64bdd9;}
|
|||
.problem_pic:hover{border:1px solid #64bdd9;}
|
||||
.problem_txt{ width:610px; margin-left:10px; color:#777777;}
|
||||
.problem_name{ color:#ff5722 !important;}
|
||||
.problem_line{margin-top:5px;}
|
||||
.problem_line{margin-top:5px;float:left;}
|
||||
.problem_name:hover{ color:#d33503;}
|
||||
.problem_tit{ color:#0781b4 !important; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.problem_tit:hover{ color:#09658c !important; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue