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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanxd 2013-10-16 10:59:49 +08:00
parent 69869a05c9 29e2a4c70b
commit 534457547e
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/bids/_list_projects.html.erb
View File

@ -115,9 +115,9 @@
</tr> </tr>
<tr> <tr>
<td valign="top"><a class="font_lighter"> <td valign="top"><span class="font_lighter">
<%= b_project.created_at%> <%= b_project.created_at%>
</a></td> </span></td>
</tr> </tr>
</table> </table>
</td> </td>
@ -126,10 +126,10 @@
<table width="100%"> <table width="100%">
<% if @bid.reward_type == 3 %> <% if @bid.reward_type == 3 %>
<tr> <tr>
<td><%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %></td> <td><%= l(:label_bidding_user_studentcode) %> : <%= User.current.user_extensions.student_id %></td>
</tr> </tr>
<tr> <tr>
<td><%= l(:label_bidding_user_homework) %> <td><%= l(:label_bidding_user_homework) %> :
<%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %> <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %>
</td> </td>
</tr> </tr>

5
app/views/bids/_project_list.html.erb
View File

@ -3,9 +3,8 @@
<% if @bid.reward_type == 3 %> <% if @bid.reward_type == 3 %>
<% if User.current.user_extensions.identity == 1 %> <% if User.current.user_extensions.identity == 1 %>
<div class="font_lighter"> <div class="font_lighter">
<p>贴心小提示：</p> <p><%= l(:label_homework_prompt) %></p>
<P>亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再 <P><%= l(:label_homework_prompt_content) %></P>
回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^</P>
</div> </div>
<% end %> <% end %>
<table width="1000px" border="0" style="padding-left: 15px"> <table width="1000px" border="0" style="padding-left: 15px">

8
app/views/layouts/base_courses.html.erb
View File

@ -99,22 +99,22 @@
<!-- modified by bai 加超链接 --> <!-- modified by bai 加超链接 -->
<tr> <tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_teacher) %></td><td class="font_lighter_sidebar"><%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %></td> <td valign="top" style="padding-left: 8px;"><%= l(:label_main_teacher) %> :</td><td class="font_lighter_sidebar"><%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %></td>
</tr> </tr>
<!-- end --> <!-- end -->
<tr> <tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_term) %></td><td class="font_lighter_sidebar"><%= @course.time %> -- <%= @course.term %></td> <td valign="top" style="padding-left: 8px;"><%= l(:label_main_term) %> :</td><td class="font_lighter_sidebar"><%= @course.time %> -- <%= @course.term %></td>
</tr> </tr>
<!-- end --> <!-- end -->
<% unless @course.teacher.user_extensions.nil?%> <% unless @course.teacher.user_extensions.nil?%>
<tr> <tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= @course.teacher.user_extensions.occupation %></td> <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td><td class="font_lighter_sidebar"><%= @course.teacher.user_extensions.occupation %></td>
</tr> </tr>
<% else %> <% else %>
<tr> <tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= l(:field_course_un) %></td> <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td><td class="font_lighter_sidebar"><%= l(:field_course_un) %></td>
</tr> </tr>
<% end %> <% end %>

16
app/views/layouts/base_homework.html.erb
View File

@ -33,22 +33,20 @@
<div class="main_context"> <div class="main_context">
<div class="spaceleft"> <div class="spaceleft">
<div> <div>
<table style="padding-top: 20px ;width: 232px ; height: 80px;"> <!-- modified by bai --> <table style="width: 232px ; height: 80px;"> <!-- modified by bai -->
<tr> <tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all "><%= "课程作业" %></td> <td style="padding-left: 8px"><%=l(:label_course_view) %></td>
</tr> </tr>
<tr> <tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td> <td class="info_font" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td>
</tr> </tr>
<tr><td style="padding-left: 8px"><a class="fontcolor"><%=link_to l(:label_course_return), project_path(@bid.courses.first) %></a>
<!-- modified by bai --> <span style="padding-left: 8px">
<% if @user != User.current %> <% if @user != User.current %>
<tr> <%= watcher_link(@bid, User.current) %>
<td style="padding-left: 8px"><%= watcher_link(@bid, User.current) %> </td>
</tr>
<% end %> <% end %>
<!-- end --> </span></td>
</tr>
</table> </table>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>

4
config/locales/zh.yml
View File

@ -543,6 +543,8 @@ zh:
label_limit_time: 截止日期 label_limit_time: 截止日期
label_commit_homework: 提交作业 label_commit_homework: 提交作业
label_course_homework: 对应课程 label_course_homework: 对应课程
label_course_return: 返回课程
label_course_view: 作业界面
label_homework_response: 作业咨询 label_homework_response: 作业咨询
label_bidding_homework: 提交作业 label_bidding_homework: 提交作业
@ -1378,6 +1380,8 @@ zh:
label_jion_bidding_homework: 已提交！ label_jion_bidding_homework: 已提交！
label_bidding_user: 应标人： label_bidding_user: 应标人：
label_bidding_user_homework: 作业提交者 label_bidding_user_homework: 作业提交者
label_homework_prompt: 贴心小提示：
label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^
label_bidding_user_studentcode: 学号 label_bidding_user_studentcode: 学号
label_bidding_reason: 应标宣言： label_bidding_reason: 应标宣言：
label_bidding_reason_homewrok: 作业提交说明 label_bidding_reason_homewrok: 作业提交说明