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

关联项目的样式修改

This commit is contained in:
cxt 2015-12-25 11:00:41 +08:00
parent e86778a9c7
commit ce5f0eb855
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/views/users/_course_homework.html.erb
View File

@ -102,18 +102,22 @@
<div class="homepagePostDeadline"> <div class="homepagePostDeadline">
迟交扣分：<%= activity.late_penalty%>分 迟交扣分：<%= activity.late_penalty%>分
</div> </div>
<div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>"> <% if activity.anonymous_comment == 0%>
匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00 <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>">
</div> 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
</div>
<% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div> <div>
<div class="homepagePostDeadline"> <div class="homepagePostDeadline">
缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品 缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
</div> </div>
<div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>"> <% if activity.anonymous_comment == 0%>
匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59 <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
</div> 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
</div>
<% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div> <div>
@ -130,27 +134,27 @@
<% project = Project.find pro.project_id %> <% project = Project.find pro.project_id %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$("#project_img_<%=project.id %>").mouseover(function(){ $("#project_img_<%=project.id %>_<%=activity.id %>").mouseover(function(){
$("#relatePInfo_<%=project.id %>").css("display","block"); $("#relatePInfo_<%=project.id %>_<%=activity.id %>").css("display","block");
}).mouseout(function(){ }).mouseout(function(){
$("#relatePInfo_<%=project.id %>").css("display","none"); $("#relatePInfo_<%=project.id %>_<%=activity.id %>").css("display","none");
}); });
}); });
</script> </script>
<div class="mr20 mb10 fl w80" style="text-align: center;"> <div class="mr20 mb10 fl w80" style="text-align: center;">
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
<%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %> <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
<% else %> <% else %>
<%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %> <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
<% end %> <% end %>
<p><span class="captainName">TimTang</span><span style="vertical-align: top;">(组长)</span></p> <% time=project.updated_on %>
<p>2个月前</p> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
<div class="relatePInfo" id="relatePInfo_<%=project.id %>"> <p><span class="captainName"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
<p><%=time_from_now time %></p>
<div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
项目名称：<%=project.name %><br /> 项目名称：<%=project.name %><br />
创建者：<%=(User.find project.user_id).show_name %>(组长)<br /> 创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
<% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
更新时间：<%=time_from_now time %> 更新时间：<%=time_from_now time %>
</div> </div>
</div> </div>

36
app/views/users/_user_homework_detail.html.erb
View File

@ -107,18 +107,22 @@
<div class="homepagePostDeadline"> <div class="homepagePostDeadline">
迟交扣分：<%= homework_common.late_penalty%>分 迟交扣分：<%= homework_common.late_penalty%>分
</div> </div>
<div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>"> <% if homework_common.anonymous_comment == 0%>
匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00 <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
</div> 匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
</div>
<% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div> <div>
<div class="homepagePostDeadline"> <div class="homepagePostDeadline">
缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品 缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
</div> </div>
<div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>"> <% if homework_common.anonymous_comment == 0%>
匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59 <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
</div> 匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
</div>
<% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div> <div>
@ -135,24 +139,26 @@
<% project = Project.find pro.project_id %> <% project = Project.find pro.project_id %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$("#project_img_<%=project.id %>").mouseover(function(){ $("#project_img_<%=project.id %>_<%=homework_common.id %>").mouseover(function(){
$("#relatePInfo_<%=project.id %>").css("display","block"); $("#relatePInfo_<%=project.id %>_<%=homework_common.id %>").css("display","block");
}).mouseout(function(){ }).mouseout(function(){
$("#relatePInfo_<%=project.id %>").css("display","none"); $("#relatePInfo_<%=project.id %>_<%=homework_common.id %>").css("display","none");
}) });
}); });
</script> </script>
<div class="mr20 mb10 fl"> <div class="mr20 mb10 fl">
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
<%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %> <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %>
<% else %> <% else %>
<%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %> <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
<% end %> <% end %>
<div class="relatePInfo" id="relatePInfo_<%=project.id %>"> <% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
<p><span class="captainName"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
<p><%=time_from_now time %></p>
<div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
项目名称：<%=project.name %><br /> 项目名称：<%=project.name %><br />
创建者：<%=(User.find project.user_id).show_name %>(组长)<br /> 创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
<% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
更新时间：<%=time_from_now time %> 更新时间：<%=time_from_now time %>
</div> </div>
</div> </div>