diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb index 22ca4cac7..0952630da 100644 --- a/app/views/homework_common/_homework_detail_programing_form.html.erb +++ b/app/views/homework_common/_homework_detail_programing_form.html.erb @@ -98,7 +98,7 @@ <% if homework_test.result && !homework_test.result.to_s.empty?%> <% if homework_test.result == 0%> - 成功 + 正确 <% else%> 错误 <% end%> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 8c12d62e0..01cbea1c1 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -6,7 +6,7 @@
<%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %> - <%= "#" + @issue.project_index %> + <%= "#" + @issue.id.to_s %>
diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 30da08614..557025eaa 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -13,8 +13,8 @@ <%= l(:field_effective_date) %> <%= l(:field_description) %> <%= l(:field_status) %> - <%= l(:field_sharing) %> - <%= l(:label_wiki_page) %> + + <% for version in @project.shared_versions.sort %> @@ -25,13 +25,13 @@ <%= format_date(version.effective_date) %> <%=h version.description %> <%= l("version_status_#{version.status}") %> - <%=h format_version_sharing(version.sharing) %> - - <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', - :action => 'show', - :project_id => version.project, + + + <%#= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', +# :action => 'show', +# :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)},:class=>"c_blue02") || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> - + <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:button_edit), edit_version_path(version), :class => 'c_purple' %> diff --git a/app/views/users/user_course_activities.html.erb b/app/views/users/user_course_activities.html.erb index bdebee6a5..eacb620f2 100644 --- a/app/views/users/user_course_activities.html.erb +++ b/app/views/users/user_course_activities.html.erb @@ -10,10 +10,19 @@ <%= rec[:item].user.show_name %> <%= get_activity_opt(rec[:item],rec[:e]) %> - - <%= get_activity_act_showname_htmlclear(rec[:item]) %> - + <% if( rec[:e].is_public == false || rec[:e].is_public == 0 ) %> + + <%= get_activity_act_showname_htmlclear(rec[:item]) %> + + <% else %> + + <%= get_activity_act_showname_htmlclear(rec[:item]) %> + + <% end %> + <%= time_tag(get_activity_act_createtime(rec[:item])).html_safe %>
<% end %> \ No newline at end of file