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

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
sw 2014-08-14 10:54:52 +08:00
parent f99543ab4b 87ada7c0d5
commit 79c6722aad
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/contestnotifications/_form.html.erb
View File

@ -3,7 +3,7 @@
<%= l(:bale_news_notice) %>
</div>
<div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
<p><%= f.text_field :title, :required => true, :size => 60,:maxlength => 60, :style => "width:488px;" %></p>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
</div>

3
app/views/projects/show.html.erb
View File

@ -1,7 +1,8 @@
<% if @events_by_day.size >0 %>
<div class="content-title-top-avtive">
<p class="subtitle">
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
<% # 暂时隐藏时间的显示%>
<%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
</p>
<% @events_by_day.keys.sort.reverse.each do |day| %>

2
config/locales/zh.yml
View File

@ -1977,7 +1977,7 @@ zh:
label_upload_softapplication_packets: 上传应用软件包
label_upload_softapplication_photo: 上传产品截图
label_upload_softapplication_packets_mustpacketed: 作品相关代码及相关说明文件必须打包后以压缩包的形式上传，便于上传和下载 ；
label_upload_softapplication_photo_condition: 作品截图最好0~4张(多余图片不会再展示页面上显示)；格式为gif/jpg/png， 每张小于5M
label_upload_softapplication_photo_condition: 作品截图最好0~4张(多余图片不会在展示页面上显示)；格式为gif/jpg/png/bmp等， 每张小于5M
label_updated_caution: 注意：若编辑参赛作品，则之前上传的软件包和截图都将被删除，请重新上传！
label_softapplication_name: 应用名称
label_work_name: 作品名称

24
public/file_not_found.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>File not found</title>
<style>
body{
@ -24,17 +25,18 @@
</head>
<body>
<div class="container" >
<h1>Sorry, this file can not be downloaded now. </h1>
<h3> <a href="http://forge.trustie.net" style="">Goto Home page</a> </h3>
<!--<h1>Sorry, this file can not be downloaded now. </h1>-->
<h1>对不起，该文件现在不能下载!</h1>
<h3> <a href="http://forge.trustie.net" style="">Goto Home page</a> </h3>
<div class="container" style="">
<div style="position: relative; right:0;text-align: right;">
<h4>Trustie Team.</h4>
<div class="container" style="">
<div style="position: relative; right:0;text-align: right;">
<h4>Trustie Team.</h4>
</div>
</div>
<p class="hidden" >
<a href="javascript:history.back()">Back</a>
</p>
</div>
<p class="hidden" >
<a href="javascript:history.back()">Back</a>
</p>
</div>
</body>
</html>
</body>
</html>