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

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

This commit is contained in:
sw 2014-08-14 14:38:41 +08:00
parent 445d29d036 e18129c935
commit 14a436a310
4 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/issues/index.html.erb
View File

@ -34,6 +34,7 @@
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div> </div>
</fieldset> </fieldset>
<!--
<fieldset class="collapsible collapsed"> <fieldset class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"> <legend onclick="toggleFieldset(this);">
<%= l(:label_options) %> <%= l(:label_options) %>
@ -55,6 +56,7 @@
</table> </table>
</div> </div>
</fieldset> </fieldset>
-->
<div class="buttons hide-when-print"> <div class="buttons hide-when-print">
<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %> <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
<%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %> <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>

4
config/locales/zh.yml
View File

@ -2106,3 +2106,7 @@ zh:
lable_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程 lable_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
lable_school_less_course: 该学校开设课程较少，您可以查看其他学校课程 lable_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
lable_file_not_found: 对不起，该文件现在不能下载!
lable_goto_homepage: 返回主页
lable_trustie_team: Trustie开发团队

4
public/file_not_found.html
View File

@ -27,11 +27,11 @@
<div class="container" > <div class="container" >
<!--<h1>Sorry, this file can not be downloaded now. </h1>--> <!--<h1>Sorry, this file can not be downloaded now. </h1>-->
<h1>对不起，该文件现在不能下载!</h1> <h1>对不起，该文件现在不能下载!</h1>
<h3> <a href="http://forge.trustie.net" style="">Goto Home page</a> </h3> <h3> <a href="http://forge.trustie.net" style="">返回主页</a> </h3>
<div class="container" style=""> <div class="container" style="">
<div style="position: relative; right:0;text-align: right;"> <div style="position: relative; right:0;text-align: right;">
<h4>Trustie Team.</h4> <h4>Trustie开发团队.</h4>
</div> </div>
</div> </div>
<p class="hidden" > <p class="hidden" >

42
public/file_not_found.html.erb Normal file
View File

@ -0,0 +1,42 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>File not found</title>
<style>
body{
font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
color:#303030;
}
div.container{
margin: 0 auto;
width: 80%;
}
h1{
font-size:1.5em;
}
p{
font-size:0.8em;
}
.hidden{
display: none;
}
</style>
</head>
<body>
<div class="container" >
<!--<h1>Sorry, this file can not be downloaded now. </h1>-->
<h1><%= l(:lable_file_not_found) %></h1>
<h3> <a href="http://forge.trustie.net" style=""><%= l(:lable_goto_homepage) %></a> </h3>
<div class="container" style="">
<div style="position: relative; right:0;text-align: right;">
<h4><%= l(:lable_trustie_team) %></h4>
</div>
</div>
<p class="hidden" >
<a href="javascript:history.back()">Back</a>
</p>
</div>
</body>
</html>