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

1.修改、新建占位页面增加导航栏 

2.作业的作者不能对作业进行评分
This commit is contained in:
sw 2014-06-12 15:05:39 +08:00
parent 025b8971e6
commit 8ed95f132a
3 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/homework_attach/edit.html.erb
View File

@ -8,6 +8,22 @@
} }
</script> </script>
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf">高校课程实践社区</td>
<td style="width: auto; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
</tr>
<tr>
<td style="padding-left: 8px"><a><%= link_to request.host()+"/courses", :controller => 'projects', :action => 'course'%></a></td>
<td><p class="top-content-list-homework"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> >
<span><%= link_to(@homework.bid.courses.first.name.to_s, homework_project_path(@homework.bid.courses.first)) if @homework.bid.courses.first%></span> >
<%=link_to(@homework.bid.name, respond_path(@homework.bid)) %> > <span><%= link_to "修改作业",edit_homework_attach_path(@homework)%></span></p></td>
</tr>
</table>
</div>
<p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_edit_homework)%> </p> <p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_edit_homework)%> </p>
<div class="tabs"> <div class="tabs">
<ul> <ul>

16
app/views/homework_attach/new.html.erb
View File

@ -1,3 +1,19 @@
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf">高校课程实践社区</td>
<td style="width: auto; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
</tr>
<tr>
<td style="padding-left: 8px"><a><%= link_to request.host()+"/courses", :controller => 'projects', :action => 'course'%></a></td>
<td><p class="top-content-list-homework"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> >
<span><%= link_to(@bid.courses.first.name.to_s, homework_project_path(@bid.courses.first)) if @bid.courses.first%></span> >
<%=link_to(@bid.name, respond_path(@bid)) %> > <span><%= link_to "创建作业", new_homework_attach_path(@bid)%></span></p></td>
</tr>
</table>
</div>
<p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=h l(:label_new_homework)%> </p> <p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=h l(:label_new_homework)%> </p>
<div class="box"> <div class="box">
<%= form_for('new_form', :method => :post, <%= form_for('new_form', :method => :post,

65
app/views/homework_attach/show.html.erb
View File

@ -23,16 +23,9 @@
<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all"> <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
发布人员：<%= link_to @homework.user, user_path(@homework.user)%> 发布人员：<%= link_to @homework.user, user_path(@homework.user)%>
</td> </td>
<td> <td style="width: 240px; word-wrap: break-word; word-break: break-all">
参与人员： 所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%>
<% @homework.users.each do |homework_user| %>
<%= link_to homework_user, user_path(homework_user)%>
<% if @homework.users.count > 1 && homework_user != @homework.users.last %>
<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<% end %>
<% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding-left: 40px"> <td style="padding-left: 40px">
@ -44,15 +37,21 @@
<%= l(:label_cant_download) %> <%= l(:label_cant_download) %>
<% end %> <% end %>
</td> </td>
<td style="width: 240px; word-wrap: break-word; word-break: break-all"> <td style="width: 240px; word-wrap: break-word; word-break: break-all">
所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%> 参与人员：
<% @homework.users.each do |homework_user| %>
<%= link_to homework_user, user_path(homework_user)%>
<% if @homework.users.count > 1 && homework_user != @homework.users.last %>
<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<% end %>
<% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style=" padding-left: 40px">平均评分： <td style=" padding-left: 40px">平均评分：
<%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %> <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
</td> </td>
<td>发布时间：<%=format_time @homework.created_at %></td> <td style="width: 240px; word-wrap: break-word; word-break: break-all">发布时间：<%=format_time @homework.created_at %></td>
</tr> </tr>
</table> </table>
</td> </td>
@ -142,32 +141,36 @@
</div> </div>
<div class="underline-contests_one"></div> <div class="underline-contests_one"></div>
<div style="height: 50px">
<div style="font-size: 15px"><strong>作业评论：</strong></div> <% if User.current != @homework.user %>
<% if is_student %> <div style="height: 50px">
<% if @is_evaluation %> <div style="font-size: 15px"><strong>作业评论：</strong></div>
<% if @has_evaluation %> <% if is_student %>
<div style="text-align: center;"> <% if @is_evaluation %>
<%= l(:lable_has_evaluation)%> <% if @has_evaluation %>
</div> <div style="text-align: center;">
<%= l(:lable_has_evaluation)%>
</div>
<% else %>
<%= render :partial => 'evaluation', :locals => {:homework => @homework} %>
<% end %>
<% else %> <% else %>
<%= render :partial => 'evaluation', :locals => {:homework => @homework} %> <div style="text-align: center;">
<%= l(:lable_close_evaluation)%>
</div>
<% end %> <% end %>
<% else %>
<div style="text-align: center;">
<%= l(:lable_close_evaluation)%>
</div>
<% end %> <% end %>
<% end %> </div>
</div> <% end %>
<% if !is_teacher %> <% if !is_teacher %>
<!--提示登录后对应用进行评价--> <!--提示登录后对应用进行评价-->
<div id="leave-message"> <div id="leave-message">
<%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %> <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
</div> </div>
<% end %> <% end %>
<!-- 留言列表区 --> <!-- 留言列表区 -->
<div id="message" style="font-size: 14px;"> <div id="message" style="font-size: 14px;">
<%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %> <%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %>