Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
56700f4d62
|
|
@ -42,7 +42,7 @@
|
|||
<%= l(:label_class_period) %>
|
||||
<span class="required"> * </span>
|
||||
</span>
|
||||
<span class="info" style="width: 10px;">
|
||||
<span class="info" style="width: 10px; margin-left: 2px;">
|
||||
<%= text_field_tag :class_period, @course.class_period, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
|
||||
</span>
|
||||
<span>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
<% if display #如果课程已结束%>
|
||||
<% linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) : finishcourse_course_path(course, format: :js) %>
|
||||
<% desc = course_endTime_timeout?(course) ? '重启' : '关闭' %>
|
||||
<% desc = course_endTime_timeout?(course) ? l(:label_course_reload) : l(:label_course_closed) %>
|
||||
|
||||
<%= link_to "#{desc}", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %>
|
||||
<%= link_to "#{desc}", linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc) %>
|
||||
<% else %>
|
||||
<!-- 关闭课程block -->
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" title="<%= @contest.name%>">
|
||||
<%= link_to @contest.name, show_contest_contest_path(@contest) %>
|
||||
<%= link_to @contest.name, contest_contestnotifications_path(@contest) %>
|
||||
</td>
|
||||
</tr>
|
||||
<% if User.current.login? %>
|
||||
|
|
|
|||
|
|
@ -132,8 +132,9 @@
|
|||
<td class="font_index">
|
||||
<%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %>
|
||||
</td>
|
||||
<!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数 !-->
|
||||
<td class="font_index">
|
||||
<%=link_to "#{@project.issues.count}", project_issues_path(@project) %>
|
||||
<%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="font_aram">
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
|
|||
<p><%= l(:mail_issue_greetings)%></p>
|
||||
</div><!--mail_head end-->
|
||||
<%= yield %>
|
||||
<hr />
|
||||
<span class="footer" style="margin:0; padding:0;"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,29 @@
|
|||
<!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
|
||||
<p>
|
||||
|
||||
<span class="c_blue" style="color:#1b55a7;">
|
||||
<%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
|
||||
</span><%= l(:mail_issue_title_userin)%>
|
||||
<span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%></p>
|
||||
<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
|
||||
<ul style="list-style-type:none; margin:0; padding:0;">
|
||||
<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
|
||||
<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>| </b><%= l(:mail_issue_from_project)%></span></li>
|
||||
<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
|
||||
<li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
|
||||
<li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>| </b><%= l(:mail_issue_from_project)%></span></li>
|
||||
<li style="list-style-type:none; margin:0; padding:0; float: left; "><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
|
||||
<span style="float: left; width: 526px">
|
||||
|
||||
<% if @journal.nil? %>
|
||||
<%= issue.description %>
|
||||
<%= issue.description=='' ? l(:label_none) : issue.description %>
|
||||
<% else %>
|
||||
<%= @journal.notes %>
|
||||
<%= @journal.notes=='' ? l(:label_none) : @journal.notes %>
|
||||
<% end%>
|
||||
</span>
|
||||
</li>
|
||||
<li style="list-style-type:none; margin:0; padding:0;">
|
||||
|
||||
<% unless @issue.attachments.nil? %>
|
||||
<li style="list-style-type:none; margin:0; padding:0;float: left; ">
|
||||
<span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong></span>
|
||||
<% if @issue.attachments.count == 0 %>
|
||||
<%= l(:label_none)%>
|
||||
<% else %>
|
||||
<span style="float: left; width: 526px; margin:0; padding:0;">
|
||||
<% @issue.attachments.each do |attach| %>
|
||||
<p style="float: left; width: 526px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
<div>
|
||||
<%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="cl" style="margin-top: 15px; clear:both; overflow:hidden;"></div>
|
||||
<hr/>
|
||||
|
||||
|
||||
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
|
||||
<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url, :style=>'font-size:12px; font-weight:normal; color:#1b55a7;') %> </div>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
</li>
|
||||
<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
|
||||
<span style="float: left; width: 526px">
|
||||
<%= @news.description %>
|
||||
<%= @comment.comments %>
|
||||
</span>
|
||||
</li>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!-- <h1>New memo</h1> -->
|
||||
<% @replying = !@memo.parent.nil? %>
|
||||
|
||||
<h3><%=l(:label_memo_edit)%></h3>
|
||||
<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f| %>
|
||||
<% if @memo.errors.any? %>
|
||||
|
|
@ -19,7 +20,11 @@
|
|||
<% end %>
|
||||
<div class="actions">
|
||||
<p>
|
||||
<%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying, :maxlength => 50%>
|
||||
<% if @memo.parent.nil? && @memo.children.first.nil? %>
|
||||
<%= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%>
|
||||
<% else %>
|
||||
<%= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%>
|
||||
<% end %>
|
||||
</p>
|
||||
<% if User.current.admin?%>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -82,11 +82,11 @@
|
|||
:html => {:id => 'news-form', :multipart => true} do |f| %>
|
||||
<%= render :partial => 'news/form', :locals => {:f => f} %>
|
||||
<%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit -->
|
||||
<%= link_to l(:button_create), "#", :onclick => 'submitNews();',:onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>
|
||||
<%= link_to l(:button_create), "#", :onclick => 'submitNews();',:onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
|
||||
|
|
||||
<%#= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
|
||||
|
||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
|
||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
|
||||
<% end if @project %>
|
||||
<div id="preview" class="wiki"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ en:
|
|||
mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
|
||||
|
||||
# edit by meng
|
||||
# emailer
|
||||
# emailer translation
|
||||
mail_issue_greetings: "Dear user , Greetings from Trustie"
|
||||
mail_issue_footer: "Unsubscribe this message?"
|
||||
mail_issue_title_userin: "in"
|
||||
|
|
@ -250,9 +250,14 @@ en:
|
|||
mail_issue_reply: "Want reply"
|
||||
#end
|
||||
# modified by meng
|
||||
# file_upload translation
|
||||
label_file_upload: Resource files
|
||||
label_file_upload_error_messages: "Upload error, please check your network environment, and refresh the page to upload."
|
||||
button_confirm: Confirm
|
||||
# shut down and restart course
|
||||
label_course_closed: Close
|
||||
label_course_reopen: Reopen
|
||||
label_course_closed_tips: "Are you sure you want to reopen the course?"
|
||||
# end
|
||||
field_name: Name
|
||||
field_description: Description
|
||||
|
|
@ -541,7 +546,7 @@ en:
|
|||
project_module_calendar: Calendar
|
||||
project_module_gantt: Gantt
|
||||
|
||||
#edit by meng
|
||||
# edit by meng
|
||||
lable_hot_course: Hot projects
|
||||
lable_hot_projects: Active courses
|
||||
lable_user_active: User movements
|
||||
|
|
@ -559,10 +564,10 @@ en:
|
|||
label_project_grade: Score
|
||||
label_user_for_project_grade: Score
|
||||
label_relation_files: Select an existing resource
|
||||
|
||||
# Personal signature tips
|
||||
label_my_brief_introduction: How are feeling today? Leave your footprints ~
|
||||
label_submit: Submit
|
||||
|
||||
# create course and course info
|
||||
label_tags_course_name: Course Title
|
||||
label_new_course_password: Password
|
||||
label_new_course_description: Description
|
||||
|
|
@ -572,39 +577,32 @@ en:
|
|||
label_teacher_list: Teacher list
|
||||
label_student_list: Student list
|
||||
label_export_excel: Export list
|
||||
|
||||
label_course_organizers: Institute
|
||||
label_poll: Questionnaire
|
||||
|
||||
# homework info and anonymous info
|
||||
field_open_anonymous_evaluation: Use anonymous mutual-evaluation
|
||||
field_evaluation_num: Number of anonymous works sent to each student
|
||||
|
||||
label_edit_homework: Update homework
|
||||
label_homework_list: Work list
|
||||
|
||||
label_teacher_score: Teacher's score
|
||||
label_time: Commit time
|
||||
label_student_score: Student's score
|
||||
label_without_score: No evaluated
|
||||
label_homework_description: Description
|
||||
label_responses: Messages
|
||||
|
||||
lable_has_commit_homework: You have submitted your work
|
||||
|
||||
|
||||
label_user_create_project_homework: created the task
|
||||
label_commit_limit: Expired but can submit your work
|
||||
|
||||
# steam the student
|
||||
label_current_group: Current group
|
||||
|
||||
# DTS Test tool
|
||||
project_module_dts: DTS Test tool
|
||||
label_module_share: DTS Test tool
|
||||
field_dts_test: DTS Test tool
|
||||
|
||||
# Feedback module
|
||||
label_technical_support: Support ：
|
||||
label_feedback: Feedback
|
||||
#end
|
||||
|
||||
label_user: User
|
||||
label_user_plural: Users
|
||||
label_user_new: New user
|
||||
|
|
@ -638,7 +636,7 @@ en:
|
|||
label_project_latest: Latest projects
|
||||
label_issue: Issue
|
||||
label_issue_new: New issue
|
||||
label_issue_plural: Issues
|
||||
label_issue_plural: Issues Tracking
|
||||
label_issue_view_all: View all issues
|
||||
label_issues_by: "Issues by %{value}"
|
||||
label_issue_added: Issue added
|
||||
|
|
@ -691,7 +689,10 @@ en:
|
|||
label_my_page_block: My page block
|
||||
label_administration: Administration
|
||||
label_login: Login
|
||||
label_logout: Sign out
|
||||
# edit by meng
|
||||
# Logout
|
||||
label_logout: Logout
|
||||
# end
|
||||
label_help: Help
|
||||
label_reported_issues: Reported issues
|
||||
label_assigned_to_me_issues: Issues assigned to me
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ zh:
|
|||
mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
|
||||
|
||||
# edit by meng
|
||||
# emailer
|
||||
# 邮件中文格式
|
||||
mail_issue_greetings: "亲爱的Trustie用户，您好！"
|
||||
mail_issue_footer: "退订该邮件！"
|
||||
mail_issue_title_userin: "在"
|
||||
|
|
@ -263,11 +263,16 @@ zh:
|
|||
mail_issue_from_project: "项目问题跟踪"
|
||||
mail_issue_attachments: "附件："
|
||||
mail_issue_reply: "我要回复"
|
||||
#end
|
||||
# end
|
||||
# modified by meng
|
||||
# 课程资源上传
|
||||
label_file_upload: 资源文件
|
||||
label_file_upload_error_messages: "上传出现错误，请您检查您的网络环境，并刷新页面重新上传。"
|
||||
button_confirm: 确认
|
||||
# 教师权限课程关闭和重启
|
||||
label_course_closed: 关闭
|
||||
label_course_reload: 重开
|
||||
label_course_closed_tips: "确定要%{desc}课程？"
|
||||
# end
|
||||
field_name: 名称
|
||||
#added by huang
|
||||
|
|
@ -591,7 +596,7 @@ zh:
|
|||
label_project_latest: 最近的项目
|
||||
label_issue: 问题
|
||||
label_issue_new: 新建问题
|
||||
label_issue_plural: 缺陷
|
||||
label_issue_plural: 问题跟踪
|
||||
label_issue_view_all: 查看所有问题
|
||||
label_issues_by: "按 %{value} 分组显示问题"
|
||||
label_issue_added: 问题已添加
|
||||
|
|
@ -1034,7 +1039,7 @@ zh:
|
|||
label_user_activities_other: 该用户暂无任何动态！
|
||||
label_project_overview: "概述"
|
||||
label_project_tool: "项目工具集"
|
||||
label_project_issues: "缺陷"
|
||||
label_project_issues: "问题"
|
||||
label_project_newother: "查看其他评论"
|
||||
label_project_newshare: "分享了"
|
||||
label_project_notice: "发布了通知："
|
||||
|
|
|
|||
Loading…
Reference in New Issue