Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
4b119e2f00
|
|
@ -18,6 +18,8 @@
|
||||||
<%= yield :header_tags -%>
|
<%= yield :header_tags -%>
|
||||||
</head>
|
</head>
|
||||||
<body class="<%= h body_css_classes %>">
|
<body class="<%= h body_css_classes %>">
|
||||||
|
<% project = @bid.courses.first %>
|
||||||
|
<% course = Course.find_by_extra(project.identifier) %>
|
||||||
<div id="wrapper">
|
<div id="wrapper">
|
||||||
<div id="wrapper2">
|
<div id="wrapper2">
|
||||||
<div id="wrapper3">
|
<div id="wrapper3">
|
||||||
|
|
@ -45,20 +47,30 @@
|
||||||
<div class="main_context">
|
<div class="main_context">
|
||||||
<div class="spaceleft">
|
<div class="spaceleft">
|
||||||
<div>
|
<div>
|
||||||
<table style="width: 232px ; padding-left: 8px; font-size:16px; line-height: 1.5em">
|
<table style="width: 250px ; line-height: 1.5em;font-size: 12px">
|
||||||
<tr valign="top">
|
<tr>
|
||||||
<td style="width: 70px" >课程名：</td>
|
<td style="width: 40px">
|
||||||
<td>
|
<% if get_avatar?(project) %>
|
||||||
<span style=" word-wrap: break-word; word-break: break-all"><strong> <%= link_to @bid.courses.first.name.to_s, homework_project_path(@bid.courses.first) if @bid.courses.first %></strong></span>
|
<%= image_tag(url_to_avatar(project),:style => "width:60px;height:60px" ) %>
|
||||||
</td>
|
<% else %>
|
||||||
</tr>
|
<%= image_tag('../images/avatars/Project/course.jpg', :style => "width:60px;height:60px") %>
|
||||||
<tr style="">
|
<% end %>
|
||||||
<td width="70px">作业名：</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span style="color:#ed8924"><strong><%= h @bid.name %></strong></span>
|
<table>
|
||||||
</td>
|
<tr valign="top">
|
||||||
</tr>
|
<td style="width: 50px;vertical-align: top;" ><strong>课程名：</strong></td>
|
||||||
<!-- <tr>
|
<td style="text-align: left">
|
||||||
|
<span style=" word-wrap: break-word; word-break: break-all"><strong> <%= link_to @bid.courses.first.name.to_s, homework_project_path(@bid.courses.first) if @bid.courses.first %></strong></span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 50px;vertical-align: top;"><strong>作业名：</strong></td>
|
||||||
|
<td style="text-align: left">
|
||||||
|
<span style="color:#ed8924"><strong><%= h @bid.name %></strong></span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<!-- <tr>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
|
<span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
|
||||||
|
|
@ -66,18 +78,61 @@
|
||||||
<% end %> </span>
|
<% end %> </span>
|
||||||
</td>
|
</td>
|
||||||
</tr> -->
|
</tr> -->
|
||||||
</table>
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<div class="user_underline"></div>
|
<div class="user_underline"></div>
|
||||||
<!--count-->
|
<!--count-->
|
||||||
|
|
||||||
|
<div class="inf_user_image">
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" colspan="2" style="font-size: 16px;padding-left: 8px;"><strong><%= l(:label_new_course_description) %> :</strong></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td class="font_lighter_sidebar" colspan="2" style="padding-left: 8px;"><%= project.description %></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="padding-left: 8px;"><%= l(:label_create_time) %> :</td>
|
||||||
|
<td class="font_lighter_sidebar"><%= format_time course.created_at %></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="padding-left: 8px; width:60px">主讲老师 :</td>
|
||||||
|
<td class="font_lighter_sidebar"><%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="padding-left: 8px;"><%= l(:label_class_period) %> :</td>
|
||||||
|
<td class="font_lighter_sidebar"><%= course.class_period.to_s %> <%= l(:label_class_hour) %></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_term) %> :</td>
|
||||||
|
<td class="font_lighter_sidebar"><%= course.time.to_s %> <%= course.term %></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td>
|
||||||
|
<td class="font_lighter_sidebar"><%= @user.user_extensions.occupation %></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="user_underline"></div>
|
||||||
|
|
||||||
<!-- info -->
|
<!-- info -->
|
||||||
<div class="inf_user_image">
|
<div class="inf_user_image">
|
||||||
<table>
|
<table>
|
||||||
|
|
||||||
|
<!--
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
|
<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
-->
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td>
|
<td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue