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

评论显示

This commit is contained in:
whimlex 2015-04-11 11:52:11 +08:00
parent 23a6408c9f
commit 5936d8d8e9
9 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<div class="project_r_h">
<h2 class="project_h2">问题跟踪</h2>
<h2 class="project_h2"><%= l(:label_issue_tracking) %></h2>
</div>
<%= call_hook(:view_issues_new_top, {:issue => @issue}) %>

2
app/views/projects/_newproject_show.html.erb
View File

@ -36,7 +36,7 @@
：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
<% if e.event_type == "issue" %>
<div class="" style="display:inline-block;position:absolute; right:2%;">
<span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
<span> <%= link_to l(:label_find_all_comments), issue_path(e) if e.journals.count!= 0%> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
</div>
<% end %>
</div>

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

@ -76,7 +76,7 @@
<span class="font_lighter"> <%= l :label_activity_time %>
：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
<div class="" style="display:inline-block;position:absolute; right:2%;">
<span> <%= link_to l(:label_find_all_comments), issue_path(act.id) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => act.journals.count) %></span>
<span> <%= link_to l(:label_find_all_comments), issue_path(act.id) if act.journals.count!= 0%> </span><span class="font_lighter"><%= l(:label_comments_count, :count => act.journals.count) %></span>
</div>
</div>
</div>
@ -151,7 +151,7 @@
：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
<div class="" style="display:inline-block;position:absolute; right:2%;">
<span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if act.comments_count!= 0%>
</span>
<span class="font_lighter">
<%= l(:label_comments_count, :count => act.comments_count) %>

8
app/views/users/show.html.erb
View File

@ -302,7 +302,7 @@
:action => 'revision',
:id => act.repository.project,
:repository_id => act.repository.identifier_param,
:rev => act.identifier} %>
:rev => act.identifier} if e.act.count!= 0%>
</span>
<a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.count) %>
@ -444,7 +444,7 @@
</div>
<div style="display: inline-block; float: right; margin-top: 0px">
<span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0%>
</span>
<a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.comments_count) %>
@ -484,7 +484,7 @@
</div>
<div style="display: inline-block; float: right; margin-top: 0px">
<span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span>
<a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %>
@ -520,7 +520,7 @@
</div>
<div style="display: inline-block; float: right; margin-top: 0px">
<span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span>
<a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %>

8
config/locales/commons/en.yml
View File

@ -190,10 +190,10 @@ en:
label_anonymous: Anonymous #作业和留言 模块
text_are_you_sure: Are you sure? #js 提示
text_are_you_sure_out: Are you sure to quit from this course?
text_are_you_sure_out_group: Are you sure to quit from this group?
text_are_you_sure: "Are you sure?" #js 提示
text_are_you_sure_out: "Are you sure to quit from this course?"
text_are_you_sure_out_group: "Are you sure to quit from this group?"
text_are_you_sure_all: "Are you sure to delete all files?"

2
config/locales/commons/zh.yml
View File

@ -189,6 +189,8 @@ zh:
text_are_you_sure: 您确定要删除吗？ #js 提示
text_are_you_sure_out: 你确定要退出该课程吗？
text_are_you_sure_out_group: 你确定要退出该分班吗？
text_are_you_sure_all: 您确定要删除所有文件吗
label_field_correct: 填写正确
label_title_blank: 标题不能为空

2
config/locales/projects/en.yml
View File

@ -133,7 +133,7 @@ en:
label_max_size: Maximum size
label_optional_description: Description
label_file_count: "Uploaded successfully"
label_file_count: "files uploaded successfully"
#
# 项目托管平台

4
config/locales/projects/zh.yml
View File

@ -139,8 +139,6 @@ zh:
label_optional_description: 可选的描述
label_file_count: "个文件已上传"
text_are_you_sure_all: 您确定要删除所有文件吗
#
# 项目托管平台
@ -261,6 +259,8 @@ zh:
label_post_by: 由
label_post_by_time: 添加于
label_short_reply: "回复"
#
# 项目托管平台
#

4
public/javascripts/attachments.js
View File

@ -26,7 +26,7 @@ function reload(fileSpan) {
function addFile(inputEl, file, eagerUpload) {
if ($('#attachments_fields').children().length < 10) {
deleteallfiles = $(inputEl).data('deleteAllFiles');
var attachmentId = addFile.nextAttachmentId++;
var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
@ -141,7 +141,7 @@ function removeFile() {
//gcm delete all file
function removeAll(){
if(confirm($(inputEl).data('deleteAllFiles'))){
if(confirm(deleteallfiles)){
$(".remove-upload").removeAttr("data-confirm");
$(".remove-upload").click();
}