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

Merge branch 'szzh' into dev_hjq

Browse Source 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
dev_repository_hjq
huang 10 years ago
parent 729d11ebaf 9fa3d25e3f
commit ca26b0d819
20 changed files with 488 additions and 483 deletions
Show Stats Download Patch File Download Diff File

13
app/controllers/courses_controller.rb
Unescape View File

@ -191,8 +191,9 @@ class CoursesController < ApplicationController
results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q) results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q)
end end
@is_remote = true @is_remote = true
@result_count = results.count #@result_count = results.count
@results = paginateHelper results, 10 #@results = paginateHelper results, 10
@results = results
@search_name = q @search_name = q
end end
@ -315,13 +316,15 @@ class CoursesController < ApplicationController
when '1' when '1'
@subPage_title = l :label_teacher_list @subPage_title = l :label_teacher_list
@all_members = searchTeacherAndAssistant(@course) @all_members = searchTeacherAndAssistant(@course)
@members = paginateHelper @all_members, 10 #@members = paginateHelper @all_members, 10
@members = @all_members
when '2' when '2'
@subPage_title = l :label_student_list @subPage_title = l :label_student_list
page = params[:page].nil? ? 0 : (params['page'].to_i - 1) page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
@all_members = student_homework_score(0,page, 10,"desc") @all_members = student_homework_score(0,page, 10,"desc")
# @all_members = @course.members # @all_members = @course.members
@members = paginateHelper_for_members @all_members, 10 # @members = paginateHelper_for_members @all_members, 10
@members = @all_members
end end
respond_to do |format| respond_to do |format|
if params[:page] if params[:page]
@ -877,7 +880,7 @@ class CoursesController < ApplicationController
students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} ) members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
) )
GROUP BY members.user_id ORDER BY score #{score_sort_by} limit #{start_from}, #{nums}" GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
end end
else else

3
app/views/avatar/_avatar_form.html.erb
Unescape View File

@ -46,7 +46,8 @@
<%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %> <%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;"> <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
<span><%= l(:button_upload_photo) %></span> <span><%= l(:button_upload_photo) %></span>
</a> </a>
<span class="c_orange ml25 f12">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
<!-- :accept => 'image/png,image/gif,image/jpeg', --> <!-- :accept => 'image/png,image/gif,image/jpeg', -->
<span class="add_avatar" style="margin-left: -55px;width: 70px"> <span class="add_avatar" style="margin-left: -55px;width: 70px">
<%= file_field_tag 'avatar[image]', <%= file_field_tag 'avatar[image]',

3
app/views/avatar/_new_avatar_form.html.erb
Unescape View File

@ -2,7 +2,8 @@
<%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%> <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
</a> </a>
<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
<a href="javascript:void(0)" class="upbtn fl">上传图片</a> <a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
<span class="c_orange ml25 mt43 f12 fl ">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
<%= file_field_tag 'avatar[image]', <%= file_field_tag 'avatar[image]',
:id => nil, :id => nil,
:class => 'upload_file ', :class => 'upload_file ',

12
app/views/bids/_alert_anonyoms.html.erb
Unescape View File

@ -39,28 +39,28 @@
<% if @bid.comment_status == 0%> <% if @bid.comment_status == 0%>
<h2>开启匿评功能</h2> <h2>开启匿评功能</h2>
<p> <p>
开启匿评后学生将不能对作业进行 开启匿评后学生将不能对作品进行
<span class="c_blue">修改、删除</span> <span class="c_blue">修改、删除</span>
等操作，目前有 等操作，目前有
<span class="c_pink"><%= totle_size%>个</span> <span class="c_pink"><%= totle_size%>个</span>
学生，共提交了 学生，共提交了
<span class="c_pink"><%= cur_size %></span> <span class="c_pink"><%= cur_size %></span>
份作业，占 份作品，占
<span class="c_pink"><%= percent %>%</span>， <span class="c_pink"><%= percent %>%</span>，
是否确定开启匿评？ 是否确定开启匿评？
</p> </p>
<% elsif @bid.comment_status == 1 %> <% elsif @bid.comment_status == 1 %>
<h2>关闭匿评功能</h2> <h2>关闭匿评功能</h2>
<p> <p>
关闭匿评后学生将不能对作业进行 关闭匿评后学生将不能对作品进行
<span class="c_blue">匿评</span> <span class="c_blue">匿评</span>
,且作业列表将会 ,且作品列表将会
<span class="c_blue">公开</span>， <span class="c_blue">公开</span>，
目前分配了 目前分配了
<span class="c_pink"><%= totle_size%>份</span> <span class="c_pink"><%= totle_size%>份</span>
匿评作业，已评了 匿评作品，已评了
<span class="c_pink"><%= cur_size %></span> <span class="c_pink"><%= cur_size %></span>
份作业，占 份作品，占
<span class="c_pink"><%= percent %>%</span>， <span class="c_pink"><%= percent %>%</span>，
是否确定关闭匿评？ 是否确定关闭匿评？
</p> </p>

2
app/views/bids/_bid_homework_show.html.erb
Unescape View File

@ -10,7 +10,7 @@
var hour=Math.floor((leftsecond-day1*24*60*60)/3600); var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60); var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60); var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
$("#"+divname).html("<span style='color: #acaeb1;'>作业提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>" $("#"+divname).html("<span style='color: #acaeb1;'>作品提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
+day1+"&nbsp;</span><span style='color: #acaeb1;'>天</span><span style='color: red;'>&nbsp;" +day1+"&nbsp;</span><span style='color: #acaeb1;'>天</span><span style='color: red;'>&nbsp;"
+hour+"&nbsp;</span><span style='color: #acaeb1;'>时</span><span style='color: red;'>&nbsp;" +hour+"&nbsp;</span><span style='color: #acaeb1;'>时</span><span style='color: red;'>&nbsp;"
+minute+"&nbsp;</span><span style='color: #acaeb1;'>分</span><span style='color: red;'>&nbsp;" +minute+"&nbsp;</span><span style='color: #acaeb1;'>分</span><span style='color: red;'>&nbsp;"

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

@ -79,16 +79,6 @@
</div> </div>
</div> </div>
<div class="add-info">
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
<%= get_course_term @course %>
</div>
<div class="add-info" style="margin-left: 30px; margin-top: -20px">
<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
</div>
<div class="tags"> <div class="tags">
<div id="tags"> <div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %> <%= image_tag( "/images/sidebar/tags.png") %>

13
app/views/courses/_course_members.html.erb
Unescape View File

@ -1,15 +1,4 @@
<div class="search_course fl">
<%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
<!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
<%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
<a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
<%= l(:label_search)%>
</a>
<br />
<span id="course_member_name_span" style="float: left"></span>
<% end %>
</div>
<div class="cl"></div>
<div class="members_left"> <div class="members_left">
<ul style=" border-bottom:none;"> <ul style=" border-bottom:none;">
<li> <li>

6
app/views/courses/_new_member_list.html.erb
Unescape View File

@ -70,9 +70,9 @@
<% end; reset_cycle %> <% end; reset_cycle %>
</div> </div>
<ul class="wlist"> <!--<ul class="wlist">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%> <% #= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
</ul> </ul>-->
<% else%> <% else%>
<p class="nodata"> <p class="nodata">
<%= l(:label_no_data) %> <%= l(:label_no_data) %>

2
app/views/courses/search_member.js.erb
Unescape View File

@ -1 +1 @@
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');

16
app/views/courses/settings.html.erb
Unescape View File

@ -72,7 +72,21 @@
</div> </div>
<div class="hwork_undis" id="tbc_02"> <div class="hwork_undis" id="tbc_02">
<%= render :partial => "course_members" %> <div class="search_course fl">
<%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
<!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
<%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
<a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
<%= l(:label_search)%>
</a>
<br />
<span id="course_member_name_span" style="float: left"></span>
<% end %>
</div>
<div class="cl"></div>
<div id="course_members_setting">
<%= render :partial => "course_members" %>
</div>
</div><!---成员结束--> </div><!---成员结束-->
</div><!--talknew end--> </div><!--talknew end-->
<div class="cl"></div> <div class="cl"></div>

2
app/views/homework_attach/_homeworks_list.html.erb
Unescape View File

@ -47,7 +47,7 @@
<%= link_to User.current.login, user_path(User.current), :title => User.current.login%> <%= link_to User.current.login, user_path(User.current), :title => User.current.login%>
</span> </span>
</li> </li>
<li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作品，请创建作品</li> <li class="c_red" style="margin:25px 0 0 20px;"> 您还没提交作品，请点击提交作品按钮：）</li>
<li class="wping"> <li class="wping">
<%= link_to "提交作品", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %> <%= link_to "提交作品", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
</li> </li>

2
app/views/members/create.js.erb
Unescape View File

@ -10,7 +10,7 @@
<% if @create_member_error_messages%> <% if @create_member_error_messages%>
alert("<%= @create_member_error_messages%>"); alert("<%= @create_member_error_messages%>");
<% else%> <% else%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
alert("添加成功"); alert("添加成功");
<% end%> <% end%>
hideOnLoad(); hideOnLoad();

2
app/views/members/destroy.js.erb
Unescape View File

@ -2,6 +2,6 @@
$('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>'); $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
// $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>'); // $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>');
<%elsif @course%> <%elsif @course%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
<%end%> <%end%>
hideOnLoad(); hideOnLoad();

2
app/views/members/update.js.erb
Unescape View File

@ -1,7 +1,7 @@
<%if @project%> <%if @project%>
$('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>'); $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
<%elsif @course%> <%elsif @course%>
$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
<%end%> <%end%>
hideOnLoad(); hideOnLoad();

835
app/views/users/show.html.erb
Unescape View File

@ -45,546 +45,547 @@
<% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
<% act = e.act %> <% act = e.act %>
<% unless act.nil? %> <% unless act.nil? %>
<% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;"> <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr> <tr>
<td colspan="2" valign="top" width="50"> <td colspan="2" valign="top" width="50">
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
</td> </td>
<td> <td>
<table width="580" border="0" class="info-break"> <table width="580" border="0" class="info-break">
<% case e.act_type %> <% case e.act_type %>
<% when 'JournalsForMessage' %> <% when 'JournalsForMessage' %>
<tr> <tr>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<% if User.current.login == e.user.try(:login) %> <% if User.current.login == e.user.try(:login) %>
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<% if User.current.language == "zh" %> <% if User.current.language == "zh" %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_have_feedback) %> <%= l(:label_i_have_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
<%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
</span> </span>
<% else %> <% else %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_have_feedback) %> <%= l(:label_i_have_feedback) %>
<%= l(:label_layouts_feedback) + l(:label_of_feedback) %> <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
</span> </span>
<% end %> <% end %>
<% else %> <% else %>
<strong> <strong>
<%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= link_to("#{e.user.name}", user_path(e.user_id)) %>
</strong> </strong>
<% if User.current.language == "zh" %> <% if User.current.language == "zh" %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_have_feedback) %> <%= l(:label_have_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
<%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
</span> </span>
<% else %> <% else %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_have_feedback) %> <%= l(:label_have_feedback) %>
<%= l(:label_layouts_feedback) + l(:label_of_feedback) %> <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
</span> </span>
<% end %> <% end %>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act.notes %> <%= textAreailizable act.notes %>
</p> </p>
<div style="display: inline-block; float: right; margin-top: 0px">
<div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<% puts 11111111111111%> <% puts 11111111111111 %>
<%= user_jour_feed_back_url e %> <%= user_jour_feed_back_url e %>
</span> </span>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Bid' %> <% when 'Bid' %>
<tr> <tr>
<% if act.reward_type == 3 && @show_course == 1%> <% if act.reward_type == 3 && @show_course == 1 %>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
</td> </td>
<% end %> <% end %>
<% else %> <% else %>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
</td> </td>
<% end %> <% end %>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%=textAreailizable act, :description %> <%= textAreailizable act, :description %>
</p></td> </p></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<!--<div style="display: inline-block; float: right; margin-top: 0px">--> <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
<!--<span>--> <!--<span>-->
<!--<%#= link_to l(:label_find_all_comments), respond_path(e.act_id) %>--> <!--<%#= link_to l(:label_find_all_comments), respond_path(e.act_id) %>-->
<!--</span>--> <!--</span>-->
<!--<a class="font_lighter">--> <!--<a class="font_lighter">-->
<!--<%#= l(:label_comments_count, :count => e.act.commit) %>--> <!--<%#= l(:label_comments_count, :count => e.act.commit) %>-->
<!--</a>--> <!--</a>-->
<!--</div>--> <!--</div>-->
</td> </td>
</tr> </tr>
<% when 'Journal' %> <% when 'Journal' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<% if act.notes.nil? %> <% if act.notes.nil? %>
<% desStr = '' %> <% desStr = '' %>
<% else %> <% else %>
<% desStr= textAreailizable(act, :notes) %> <% desStr= textAreailizable(act, :notes) %>
<% end %> <% end %>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= desStr %> <%= desStr %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Changeset' %> <% when 'Changeset' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title(act.title), <%= link_to format_activity_title(act.title),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} %> :rev => act.identifier} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title(act.title), <%= link_to format_activity_title(act.title),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} %> :rev => act.identifier} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act,:long_comments %> <%= textAreailizable act, :long_comments %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= format_time(e.act.committed_on) %> <%= format_time(e.act.committed_on) %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span><%= link_to l(:label_find_all_comments), <span><%= link_to l(:label_find_all_comments),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} if e.act.count!= 0%> :rev => act.identifier} if e.act.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.count) %> <%= l(:label_comments_count, :count => e.act.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% when 'Message' %> <% when 'Message' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
{:controller => 'messages', {:controller => 'messages',
:action => 'show', :action => 'show',
:board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
{:controller => 'messages', {:controller => 'messages',
:action => 'show', :action => 'show',
:board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable(act,:content) %> <%= textAreailizable(act, :content) %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Principal' %> <% when 'Principal' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_user) %> <%= l(:label_new_user) %>
</span> </span>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_user) %> <%= l(:label_new_user) %>
</span> </span>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"></p> <p class="font_description"></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'News' %> <% when 'News' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act,:description %> <%= textAreailizable act, :description %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0%> <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.comments_count) %> <%= l(:label_comments_count, :count => e.act.comments_count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% when 'Issue' %> <% when 'Issue' %>
<% if e.user == User.current %> <% if e.user == User.current %>
<tr> <tr>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
{:controller => 'issues', {:controller => 'issues',
:action => 'show', :action => 'show',
:id => act.id} %> :id => act.id} %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word"> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
{:controller => 'issues', {:controller => 'issues',
:action => 'show', :action => 'show',
:id => act.id} %> :id => act.id} %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word"> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% end %> <% end %>
<% when 'Contest' %> <% when 'Contest' %>
<tr> <tr>
<% if e.user == User.current && @show_contest == 1%> <% if e.user == User.current && @show_contest == 1 %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
</tr> </tr>
<% else %> <% else %>
<% end %><!-- < % #case end %> --> <% end %><!-- < % #case end %> -->
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
<% end %><!-- < % #unless act.nil? end %> --> <% end %><!-- < % #unless act.nil? end %> -->
<% end %><!-- < % #@activity.each do |e| end%> --> <% end %><!-- < % #@activity.each do |e| end%> -->
</div> </div>
<div class="pagination" style="float:left;"> <div class="pagination" style="float:left;">
<ul> <%= pagination_links_full @activity_pages %> </ul> <ul> <%= pagination_links_full @activity_pages %> </ul>

2
config/locales/users/zh.yml
Unescape View File

@ -118,7 +118,7 @@ zh:
label_goto: "前往»" label_goto: "前往»"
label_activity_project: "项目：" label_activity_project: 项目
label_active_call: 需求 label_active_call: 需求
label_active_homework: 作业 label_active_homework: 作业
# 评论在commons模块下 # 评论在commons模块下

38
config/locales/zh.yml
Unescape View File

@ -20,7 +20,7 @@ zh:
notice_file_not_found: 您访问的页面不存在或已被删除。 notice_file_not_found: 您访问的页面不存在或已被删除。
notice_locking_conflict: 数据已被另一位用户更新 notice_locking_conflict: 数据已被另一位用户更新
notice_not_authorized: 对不起，您无权访问此页面。 notice_not_authorized: 对不起，您无权访问此页面。
notice_has_homework: 您已经提交过一份作业 notice_has_homework: 您已经提交过一份作品
notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。 notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。
notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。 notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。
notice_not_authorized_archived_project: 要访问的项目已经归档。 notice_not_authorized_archived_project: 要访问的项目已经归档。
@ -312,13 +312,13 @@ zh:
permission_view_course_messages: 查看留言 permission_view_course_messages: 查看留言
permission_view_real_name: 查看真名 permission_view_real_name: 查看真名
permission_view_students: 查看成员 permission_view_students: 查看成员
permission_export_homeworks: 导出作业 permission_export_homeworks: 导出作品
permission_quote_project: 引用项目 permission_quote_project: 引用项目
permission_is_manager: 作为管理员 permission_is_manager: 作为管理员
permission_as_teacher: 作为教师 permission_as_teacher: 作为教师
permission_as_student: 作为学生 permission_as_student: 作为学生
permission_paret_in_homework: 加入作业 permission_paret_in_homework: 加入作业
permission_view_homework_attaches: 查看作业附件 permission_view_homework_attaches: 查看作品附件
permission_view_course_journals_for_messages: 查看课程留言 permission_view_course_journals_for_messages: 查看课程留言
view_course_journals_for_messages: 课程留言 view_course_journals_for_messages: 课程留言
label_send_course_journals_for_messages: 发布了留言 label_send_course_journals_for_messages: 发布了留言
@ -1138,7 +1138,7 @@ zh:
label_current_contributors: 位当前贡献者 label_current_contributors: 位当前贡献者
label_commit_limit: 已截止，但可补交 label_commit_limit: 已截止，但可补交
label_commit_ar: 作业提交截止时间快到了！ label_commit_ar: 作业提交截止时间快到了！
lable_has_commit_homework: 您已提交过作业 lable_has_commit_homework: 您已提交过作品
#modify by men #modify by men
label_x_current_contributors: label_x_current_contributors:
zero: 位当前贡献者 zero: 位当前贡献者
@ -1150,7 +1150,7 @@ zh:
label_users_on_trustie: 用户 label_users_on_trustie: 用户
label_front: 第一页 label_front: 第一页
label_commit_on: 次提交 label_commit_on: 次提交
label_uncommit_homework: 暂无学生提交作业！ label_uncommit_homework: 暂无学生提交作品！
#modify by men #modify by men
label_x_commit_on: label_x_commit_on:
zero: 次提交 zero: 次提交
@ -1211,7 +1211,7 @@ zh:
label_student_response: 作业答疑 # modified by bai label_student_response: 作业答疑 # modified by bai
label_bidding_project: 参与项目 label_bidding_project: 参与项目
label_homework_project: 已提交作业 #huang label_homework_project: 已提交作品 #huang
button_bidding: 我要参加 button_bidding: 我要参加
field_enterprise: '企业：' field_enterprise: '企业：'
@ -1232,11 +1232,11 @@ zh:
label_wrong_date: 时间格式错误，请输入正确的时间 yyyy-mm-dd label_wrong_date: 时间格式错误，请输入正确的时间 yyyy-mm-dd
label_bidding_succeed: 应标成功 label_bidding_succeed: 应标成功
label_bidding_contest_succeed: 竞赛提交成功 #added by bai label_bidding_contest_succeed: 竞赛提交成功 #added by bai
label_bidding_homework_succeed: 作业提交成功 #added by bai label_bidding_homework_succeed: 作品提交成功 #added by bai
label_bidding_homework_failed: 作业提交失败 #added by bai label_bidding_homework_failed: 作品提交失败 #added by bai
label_bidding_homework_committed: 你已经提交过作业，不能重复提交！ label_bidding_homework_committed: 你已经提交过作品，不能重复提交！
label_bidding_fail: 应标失败，该项目已经应标 label_bidding_fail: 应标失败，该项目已经应标
label_bidding_homework_fail: 作业提交失败，该作业已经被提交！ label_bidding_homework_fail: 作品提交失败，该作品已经被提交！
label_requirement_list: 需求列表 label_requirement_list: 需求列表
@ -1246,9 +1246,9 @@ zh:
other: 应标项目 other: 应标项目
#end #end
label_x_homework_project: #modify by huang label_x_homework_project: #modify by huang
zero: 已提交的作业 zero: 已提交的作品
one: 已提交的作业 one: 已提交的作品
other: 已提交的作业 other: 已提交的作品
#end #end
label_x_responses: #modify by men label_x_responses: #modify by men
zero: 留言 zero: 留言
@ -1400,8 +1400,8 @@ zh:
label_bid_project: 项目 label_bid_project: 项目
label_project_no_follow: 该项目暂未被关注！ label_project_no_follow: 该项目暂未被关注！
label_no_bid_project: 暂无参与项目 label_no_bid_project: 暂无参与项目
label_no_course_project: 暂无已提交的作业！ label_no_course_project: 暂无已提交的作品！
label_course_submit_homework: 提交了作业 label_course_submit_homework: 提交了作品
label_bids_reward_method: 奖励方式 ： label_bids_reward_method: 奖励方式 ：
label_bids_reward_what: 输入奖励内容 label_bids_reward_what: 输入奖励内容
label_call_bonus: 奖金 label_call_bonus: 奖金
@ -1432,7 +1432,7 @@ zh:
label_have_feedback: 有了 label_have_feedback: 有了
label_of_feedback: 的 label_of_feedback: 的
label_welcome_participate: 参与了 label_welcome_participate: 参与了
label_cant_download: 未开启互评功能作业不允许下载 label_cant_download: 未开启互评功能作品不允许下载
lable_close_evaluation: 该作业未开启互评功能 lable_close_evaluation: 该作业未开启互评功能
lable_has_evaluation: 您已进行过评价 lable_has_evaluation: 您已进行过评价
#modify by men #modify by men
@ -1895,7 +1895,7 @@ zh:
label_max_length: 最多250个字 label_max_length: 最多250个字
label_create_person: 创建人员 label_create_person: 创建人员
label_participation_person: 参与人员 label_participation_person: 参与人员
label_homework_without_description: 该作业无任何描述！ label_homework_without_description: 该作品无任何描述！
label_sure_exit_homework: 是否确认退出该作业 label_sure_exit_homework: 是否确认退出该作业
label_teacher_comments: 教师评论 label_teacher_comments: 教师评论
label_anonymous_comments: 匿评 label_anonymous_comments: 匿评
@ -1968,9 +1968,9 @@ zh:
label_totle: 共有 label_totle: 共有
label_homework_count: 个作业 label_homework_count: 个作业
lebel_homework_commit: 已提交的作业 lebel_homework_commit: 已提交的作品
label_open_anonymous_evaluation: 是否匿评 label_open_anonymous_evaluation: 是否匿评
label_evaluation_description: 即每份作业被允许匿评的人数 label_evaluation_description: 即每份作品被允许匿评的人数
label_name_not_null: 名称不能为空 label_name_not_null: 名称不能为空
modal_valid_unpassing: 该分班已经存在 modal_valid_unpassing: 该分班已经存在

2
public/javascripts/course.js
Unescape View File

@ -357,7 +357,7 @@ function show_bid_dead_line(year,month,day,divname)
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分" + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒" + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
+ "</form>" + "</form>"
+ "<p class='fr'>作业提交还剩：</p>"); + "<p class='fr'>作品提交还剩：</p>");
} }
//验证新建作业的名字 //验证新建作业的名字
function regex_bid_name() function regex_bid_name()

4
public/stylesheets/application.css
Unescape View File

@ -30,9 +30,13 @@ ol,ul,li{ list-style-type:none}
a{ text-decoration:none; } a{ text-decoration:none; }
.ml10{ margin-left:10px;} .ml10{ margin-left:10px;}
.ml20{ margin-left:20px;} .ml20{ margin-left:20px;}
.ml25{ margin-left:25px;}
.ml30{ margin-left:30px;}
.mr10{ margin-right:10px;} .mr10{ margin-right:10px;}
.mb5{ margin-bottom:5px;} .mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;} .mb10{ margin-bottom:10px;}
.f12{font-size:12px; font-weight:normal;}
.c_orange{color:#ff5722;}
.fl{ float: left;} .fl{ float: left;}
.fr{ float:right;} .fr{ float:right;}
.project_h4{ font-size:14px; color:#3b3b3b;} .project_h4{ font-size:14px; color:#3b3b3b;}

2
public/stylesheets/public.css
Unescape View File

@ -56,6 +56,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.ml10{ margin-left:10px;} .ml10{ margin-left:10px;}
.ml15{ margin-left:15px;} .ml15{ margin-left:15px;}
.ml20{ margin-left:20px;} .ml20{ margin-left:20px;}
.ml25{ margin-left:25px;}
.ml40{ margin-left:40px;} .ml40{ margin-left:40px;}
.ml45{ margin-left:45px;} .ml45{ margin-left:45px;}
.ml55{ margin-left:55px;} .ml55{ margin-left:55px;}
@ -73,6 +74,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mt5{ margin-top:5px;} .mt5{ margin-top:5px;}
.mt8{ margin-top:8px;} .mt8{ margin-top:8px;}
.mt10{ margin-top:10px;} .mt10{ margin-top:10px;}
.mt43{ margin-top:43px;}
.mb5{ margin-bottom:5px;} .mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;} .mb10{ margin-bottom:10px;}
.pl15{ padding-left:15px;} .pl15{ padding-left:15px;}

Write Preview
Loading…
Cancel
Save