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

1、作品show界面详细内容填充 

2、更新public.css
3、增加作品附件显示
This commit is contained in:
sw 2015-05-22 14:45:01 +08:00
parent 289fb393bf
commit 95a48b7da0
5 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/student_work_controller.rb
View File

@ -70,6 +70,11 @@ class StudentWorkController < ApplicationController
end
#评分
def add_score
end
private
#获取作业
def find_homework

121
app/views/student_work/_show.html.erb
View File

@ -1,13 +1,41 @@
<div class="show_hwork_arrow"></div>
<div class="show_hwork">
<ul>
<li ><span class="tit_fb">上交时间：</span>2015-05-07</li>
<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>
<li ><span class="tit_fb"> 关联项目：</span><a href="javascript:void(0);" class="c_blue02" >Trustie Forge</a></li>
<li ><span class="tit_fb ">内容：</span><p class="show_hwork_p">我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就所以它的验证号码速度比一般的方式快。</p><div class="cl"></div></li>
<li ><span class="tit_fb"> 附件：</span><a href="javascript:void(0);" class="link_file" >socket实验-123456-王强.zip</a><span class="ml5">(123KB)</span></li>
<li ><span class="tit_fb"> 评价：</span><textarea class="hwork_ping_text "></textarea><div class="cl"></div></li>
<li >
<span class="tit_fb">上交时间：</span>
<%=format_time work.created_at %>
</li>
<!--<li >-->
<!--<span class="tit_fb"> 参与人员：</span>-->
<!--程梦雯&nbsp;&nbsp;王强-->
<!--</li>-->
<% if work.project%>
<li >
<span class="tit_fb"> 关联项目：</span>
<%= link_to( work.project.name, project_path(work.project.id), :class => "c_blue02" )%>
</li>
<% end%>
<li >
<span class="tit_fb ">内容：</span>
<p class="show_hwork_p">
<%= work.description%>
</p>
<div class="cl"></div>
</li>
<li >
<span class="tit_fb"> 附件：</span>
<% if work.attachments.empty?%>
<span style="color: #999999">尚未提交附件</span>
<% else%>
<%= render :partial => 'work_attachments', :locals => {:attachments => work.attachments} %>
<% end%>
</li>
<div class="cl"></div>
<li >
<span class="tit_fb"> 评价：</span>
<textarea class="hwork_ping_text "></textarea>
<div class="cl"></div>
</li>
<li >
<span class="tit_fb mt2"> 评分：</span>
<input type="number" name="score" id="score_<%= work.id%>" value="50" min="0" max="100" size="4" data-units="dollars" />
@ -15,32 +43,24 @@
<div class="cl"></div></li>
<li >
<span class="tit_fb"> 批阅结果：</span>
<input type="submit" name="" value="文件浏览" class="sub_btn">&nbsp;&nbsp;&nbsp;&nbsp;
<span class=" c_grey ">-文件不超过200MB</span>
<div>
<%= render :partial => 'attachments/form' %>
</div>
<a href="javascript:void(0);" class="blue_n_btn fr" >提交</a>
<div class="cl"></div>
</li>
</ul>
<div class="ping_box">
<ul class="ping_box_ul ping_line">
<a href="javascript:void(0);" class="ping_pic fl" ><img src="images/courses/pic_01.jpg" width="34" height="34" /></a>
<a href="javascript:void(0);" class="ping_pic fl" >
<img src="images/courses/pic_01.jpg" width="34" height="34" />
</a>
<div class="ping_box_tit">
<a href="javascript:void(0);" class="c_blue fl" >jacknudt</a><span class="ml5 fl">（教师）</span>
<span class="ml20 fl">评分：</span><a href="javascript:void(0);" class="c_orange fl" >90分</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<a href="javascript:void(0);" class="fr c_purple mr5" >回复</a>
<span class=" fr c_grey mr20">一小时前</span>
<div class="cl mb5"></div>
<p >作品非常好，格式不正确，继续努力！</p>
<a href="javascript:void(0);" class="link_file" >批阅结果-王强.zip</a><span class="ml5">(123KB)</span>
</div>
<div class="cl"></div>
</ul>
<ul class="ping_box_ul ping_line">
<a href="javascript:void(0);" class="ping_pic fl" ><img src="images/courses/pic_01.jpg" width="34" height="34" /></a>
<div class="ping_box_tit">
<a href="javascript:void(0);" class="c_blue fl" >jacknudt</a><span class="ml5 fl">（教辅）</span>
<span class="ml20 fl">评分：</span><a href="javascript:void(0);" class="c_orange fl" >85分</a>
<a href="javascript:void(0);" class="c_blue fl" >jacknudt</a>
<span class="ml5 fl">（教辅）</span>
<span class="ml20 fl">评分：</span>
<a href="javascript:void(0);" class="c_orange fl" >85分</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<a href="javascript:void(0);" class="fr c_purple mr5" >回复</a>
<span class=" fr c_grey mr20">一小时前</span>
@ -49,46 +69,21 @@
<textarea class="ping_text"></textarea>
<a href="javascript:void(0);" class="fr blue_n_btn" >回复</a>
<div class="ping_back mt30">
<a href="javascript:void(0);" class="st_img fl" ><img src="images/courses/pic_01.jpg" width="32" height="32" /></a>
<div class="ping_back_tit">
<a href="javascript:void(0);" class="c_blue fl" >程梦雯</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<span class=" fr c_grey mr10">一小时前</span>
<div class="cl mb5"></div>
<p >谢谢老师！</p>
</div><!---ping_box_tit end--->
<div class="cl"></div>
</div><!---ping_back end--->
</div>
<div class="cl"></div>
</ul>
<ul class="ping_box_ul ">
<a href="javascript:void(0);" class="ping_pic fl" ><img src="images/courses/pic_01.jpg" width="34" height="34" /></a>
<div class="ping_box_tit">
<a href="javascript:void(0);" class="c_blue fl" >jacknudt</a><span class="ml5 fl">（教辅）</span>
<span class="ml20 fl">评分：</span><a href="javascript:void(0);" class="c_orange fl" >85分</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<a href="javascript:void(0);" class="fr c_purple mr5" >回复</a>
<span class=" fr c_grey mr20">一小时前</span>
<div class="cl mb5"></div>
<p >作品非常好，格式不正确，继续努力！</p>
<div class="ping_back ping_line mt10">
<a href="javascript:void(0);" class="st_img fl" ><img src="images/courses/pic_01.jpg" width="32" height="32" /></a>
<div class="ping_back_tit">
<a href="javascript:void(0);" class="c_blue fl" >程梦雯</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<span class=" fr c_grey mr10">一小时前</span>
<div class="cl mb5"></div>
<p >谢谢老师！</p>
</div><!---ping_box_tit end--->
<div class="cl"></div>
</div><!---ping_back end--->
<div class="ping_back mt10">
<a href="javascript:void(0);" class="st_img fl" ><img src="images/courses/pic_01.jpg" width="32" height="32" /></a>
<div class="ping_back_tit">
<a href="javascript:void(0);" class="c_blue fl" >程梦雯</a>
<a href="javascript:void(0);" class="fr c_purple" >删除</a>
<span class=" fr c_grey mr10">一小时前</span>
<div class="cl mb5"></div>
<p >谢谢老师！</p>
</div><!---ping_box_tit end--->
<div class="cl"></div>
</div><!---ping_back end--->
</div><!--ping_box_tit end--->
<div class="cl"></div>
</ul><!--ping_box_ul end--->
</div><!---ping_box end--->
<a href="javascript:void(0);" class="fr c_blue mt5 mb5">收起</a>
<a href="javascript:void(0);" class="fr c_blue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
<div class="cl"></div>
</div><!---show_hwork end--->

5
app/views/student_work/_work_attachments.html.erb Normal file
View File

@ -0,0 +1,5 @@
<% for attachment in attachments %>
<%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
<span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
<div class="cl"></div>
<% end -%>

3
app/views/student_work/index.html.erb
View File

@ -84,9 +84,6 @@
<%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name"%>
</li>
<li class=" hwork_tit">
<!--<a href="javascript:void(0);" class=" " >-->
<!--<%= student_work.name%>-->
<!--</a>-->
<%= link_to student_work.name, student_work_path(student_work),:remote => true%>
</li>
<li class=" hwork_code c_red">

7
public/stylesheets/public.css
View File

@ -34,6 +34,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.fmYh{font-family:"MicroSoft Yahei";}
.font999{ color:#999;}
.fontRed{color:#770000;}
.text_c{ text-align:center;}
/* Float & Clear */
.cl{ clear:both; overflow:hidden; }
@ -77,6 +78,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mt5{ margin-top:5px;}
.mt8{ margin-top:8px;}
.mt10{ margin-top:10px;}
.mt30{ margin-top: 30px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}
.mb20{ margin-bottom:20px;}
@ -133,6 +135,7 @@ a.c_green{ color:#28be6c;}
.b_grey{ background: #F5F5F5;}
.b_dgrey{ background: #CCC;}
.c_orange{color:#e8770d;}
.c_dark{ color:#2d2d2d;}
.c_lorange{ color:#ff9900;}
.c_purple{color: #6883b6;}
.c_blue{ color:#15bccf;}
@ -169,6 +172,9 @@ a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;}
.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
.blue_n_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;}
a.blue_n_btn{background:#64bdd9;color:#fff;font-weight:normal; padding:2px 10px; text-align:center;}
a:hover.blue_n_btn{ background:#329cbd;}
.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
.more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;}
@ -184,6 +190,7 @@ a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
.pic_mes{ display:block; background:url(../images/new_project/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
.pic_img{ display:block; background:url(../images/new_project/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
.pic_del{ display:block; background:url(../images/new_project/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
.pic_del:hover{ background:url(../images/new_project/public_icon.png) -32px -235px no-repeat; }
.pic_stats{display:block; background:url(../images/new_project/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
.pic_files{display:block; background:url(../images/new_project/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
.pic_text{display:block; background:url(../images/new_project/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}