hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

label写错纠正，一个写死的主页链接纠正

Browse Source
course_group
z9hang 11 years ago
parent ae40e1341a
commit f13eb73a72
13 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
app/helpers/projects_helper.rb
Unescape View File

@ -176,14 +176,14 @@ module ProjectsHelper
#Modified by young #Modified by young
if (project.try(:project_type) == Project::ProjectType_course ) if (project.try(:project_type) == Project::ProjectType_course )
unless project.is_public == 1 unless project.is_public == 1
s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
else else
s = "".html_safe s = "".html_safe
end end
s += link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe s += link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
else else
unless project.is_public unless project.is_public
s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
else else
s = "".html_safe s = "".html_safe
end end

2
app/views/courses/_course.html.erb
Unescape View File

@ -11,7 +11,7 @@
<p > <p >
<%= content_tag('span',"#{l(:label_bid_show_course_name)}:", :class => "course-font")%> <%= content_tag('span',"#{l(:label_bid_show_course_name)}:", :class => "course-font")%>
<% unless @course.is_public == 1 %> <% unless @course.is_public == 1 %>
<span class='private_project'><%= l(:lable_private) %></span> <span class='private_project'><%= l(:label_private) %></span>
<% end %> <% end %>
<%= content_tag('span', link_to("#{@course.name}", course_path(@course), :class => "info"))%> <%= content_tag('span', link_to("#{@course.name}", course_path(@course), :class => "info"))%>
</p> </p>

2
app/views/files/_course_sort_by_attachtypel.html.erb
Unescape View File

@ -37,7 +37,7 @@
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> --> <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
<td class="filesize"><%= number_to_human_size(file.filesize) %></td> <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
<td class="attach_type"> <td class="attach_type">
<span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %></span> <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %></span>
&nbsp; &nbsp;
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;"> <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
<%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes, <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,

2
app/views/files/_sort_by_attachtypel.html.erb
Unescape View File

@ -37,7 +37,7 @@
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> --> <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
<td class="filesize"><%= number_to_human_size(file.filesize) %></td> <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
<td class="attach_type"> <td class="attach_type">
<span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %></span> <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %></span>
&nbsp; &nbsp;
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;"> <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
<%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes, <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,

2
app/views/forums/_form.html.erb
Unescape View File

@ -21,7 +21,7 @@
<script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script> <script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
<%= f.text_area :description, :required => true, :id => 'editor01' %> <%= f.text_area :description, :required => true, :id => 'editor01' %>
<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01',{height:300});</script> <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01',{height:300});</script>
<p style="color: #ff0000">(<%= l(:lable_forums_max_length) %>)</p> <p style="color: #ff0000">(<%= l(:label_forums_max_length) %>)</p>
</div> </div>
<div class="actions" style=" padding-top: 10px; float:right"> <div class="actions" style=" padding-top: 10px; float:right">
<%= submit_tag l(:button_submit) %> <%= submit_tag l(:button_submit) %>

2
app/views/forums/show.html.erb
Unescape View File

@ -18,7 +18,7 @@
<p><%= f.text_field :subject, :required => true%></p> <p><%= f.text_field :subject, :required => true%></p>
<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p> <p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script> <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
<p style="color: #ff0000">(<%= l(:lable_memos_max_length) %>)</p> <p style="color: #ff0000">(<%= l(:label_memos_max_length) %>)</p>
<p> <p>
<%= l(:label_attachment_plural) %><br /> <%= l(:label_attachment_plural) %><br />

2
app/views/users/_score_new_index.html.erb
Unescape View File

@ -7,7 +7,7 @@
<div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> + <%= format("%.2f" , influence(option_num) ).to_i %> <div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> + <%= format("%.2f" , influence(option_num) ).to_i %>
+ <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div> + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
<% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %> <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %>
<div><%= l(:lable_score_less_than_zero) %></div> <div><%= l(:label_score_less_than_zero) %></div>
<% else %> <% else %>
<div> = <%= format("%.2f" ,option_num.total_score).to_i %></div> <div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>
<% end %> <% end %>

2
app/views/welcome/_course_list.html.erb
Unescape View File

@ -7,7 +7,7 @@
<div class='desc_item'> <div class='desc_item'>
<span class=''> <span class=''>
<% unless course.is_public == 1 %> <% unless course.is_public == 1 %>
<span class="private_project"><%= l(:lable_private) %></span> <span class="private_project"><%= l(:label_private) %></span>
<% end %> <% end %>
<%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %> <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>

4
app/views/welcome/course.html.erb
Unescape View File

@ -92,7 +92,7 @@
<% if User.current.logged? %> <% if User.current.logged? %>
<li> <li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_no_course)} %> <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
</li> </li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %> <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %>
<% else %> <% else %>
@ -115,7 +115,7 @@
<%= render :partial => 'course_list', :locals => {:course_list => school_course} %> <%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
<% if school_course.count < 10 %> <% if school_course.count < 10 %>
<li> <li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_less_course)} %> <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
</li> </li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %> <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %>
<% end %> <% end %>

2
app/views/welcome/index.html.erb
Unescape View File

@ -73,7 +73,7 @@
<!-- 上左下右 --> <!-- 上左下右 -->
<div style="float: left; margin-left: 10px; width: 380px;"> <div style="float: left; margin-left: 10px; width: 380px;">
<% unless project.is_public %> <% unless project.is_public %>
<span class="private_project"><%= l(:lable_private) %></span> <span class="private_project"><%= l(:label_private) %></span>
<% end %> <% end %>
<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
(<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)

13
config/locales/en.yml
Unescape View File

@ -1807,7 +1807,14 @@ en:
label_company_name: Company Name label_company_name: Company Name
notice_account_invalid_creditentials_new: You have not to the mailbox activation notice_account_invalid_creditentials_new: You have not to the mailbox activation
lable_unknow_type: Unknow type label_school_no_course: The school did not offer any courses, you can view other school curriculum
lable_score_less_than_zero: Score less than 0, revised to 0 label_school_less_course: The school offers courses in less, you can view other school curriculum
label_file_not_found: Sorry, the file can't be downloaded now!
label_goto_homepage: Return to the home page
label_trustie_team: The Trustie development team
label_memos_max_length: The content of the post up to 65535 characters in length
label_forums_max_length: Post Bar describing the maximum length of 65535 characters
label_unknow_type: Unknow type
label_score_less_than_zero: Score less than 0, revised to 0
review_assignments: review assignments review_assignments: review assignments
lable_private: private label_private: private

20
config/locales/zh.yml
Unescape View File

@ -2106,16 +2106,16 @@ zh:
modal_valid_passing: 可以使用 modal_valid_passing: 可以使用
label_bug: 漏洞 label_bug: 漏洞
lable_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程 label_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
lable_school_less_course: 该学校开设课程较少，您可以查看其他学校课程 label_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
lable_file_not_found: 对不起，该文件现在不能下载! label_file_not_found: 对不起，该文件现在不能下载!
lable_goto_homepage: 返回主页 label_goto_homepage: 返回主页
lable_trustie_team: Trustie开发团队 label_trustie_team: Trustie开发团队
lable_memos_max_length: 帖子内容最大长度为65535个字符 label_memos_max_length: 帖子内容最大长度为65535个字符
lable_forums_max_length: 贴吧描述最大长度为65535个字符 label_forums_max_length: 贴吧描述最大长度为65535个字符
lable_unknow_type: 未知类型 label_unknow_type: 未知类型
lable_score_less_than_zero: 得分小于0，修正为0 label_score_less_than_zero: 得分小于0，修正为0
review_assignments: 评审任务 review_assignments: 评审任务
lable_private: 私有 label_private: 私有

6
public/file_not_found.html.erb
Unescape View File

@ -26,12 +26,12 @@
<body> <body>
<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><%= l(:lable_file_not_found) %></h1> <h1><%= l(:label_file_not_found) %></h1>
<h3> <a href="http://forge.trustie.net" style=""><%= l(:lable_goto_homepage) %></a> </h3> <h3> <%= link_to l(:label_goto_homepage),{:controller=>'welcome',:action=>'index',:host=>Setting.host_name} %> </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><%= l(:lable_trustie_team) %></h4> <h4><%= l(:label_trustie_team) %></h4>
</div> </div>
</div> </div>
<p class="hidden" > <p class="hidden" >

Write Preview
Loading…
Cancel
Save