Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
This commit is contained in:
commit
e0ff4ec949
|
|
@ -209,8 +209,8 @@ class HomeworkAttachController < ApplicationController
|
|||
project_id = 0
|
||||
end
|
||||
sta = 0
|
||||
name = params[:new_form][:name]
|
||||
description = params[:new_form][:description]
|
||||
name = params[:homework_attach][:name]
|
||||
description = params[:homework_attach][:description]
|
||||
options = {
|
||||
:user_id => user_id,
|
||||
:state => sta,
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<p>
|
||||
<%= f.select :is_evaluation, is_evaluation_option %>
|
||||
</p>
|
||||
<p>
|
||||
<p style="display: none;">
|
||||
<%= f.select :proportion, proportion_option %>
|
||||
</p>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>作业评分弹框</title>
|
||||
<%= stylesheet_link_tag 'css', :media => 'all' %>
|
||||
<%= stylesheet_link_tag 'css'%>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<title>新建作业</title>
|
||||
<%= stylesheet_link_tag 'css', :media => 'all' %>
|
||||
<script type="text/javascript" language="javascript">
|
||||
function g(o){return document.getElementById(o);}
|
||||
function HoverLi(n){
|
||||
for(var i=1;i<=2;i++){g('tb_'+i).className='normaltab';g('tbc_0'+i).className='undis';}g('tbc_0'+n).className='dis';g('tb_'+n).className='hovertab';
|
||||
}
|
||||
function submit_homework_form()
|
||||
{
|
||||
$('#new_homework_attach').submit();
|
||||
}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
|
|
@ -19,93 +19,82 @@
|
|||
<div id="tb_" class="tb_">
|
||||
<ul>
|
||||
<li id="tb_1" class="hovertab" onmouseover="x:HoverLi(1);" style="width: auto; padding:5px 10px 0;">
|
||||
课程名称课程名称</li>
|
||||
<li id="tb_2" class="normaltab" onmouseover="i:HoverLi(2);">
|
||||
成员</li>
|
||||
<li class="N_top" ><a href="#" target="_blank" >创建项目</a></li>
|
||||
创建作品
|
||||
</li>
|
||||
<li class="N_top" style="width: 835px;">
|
||||
<a href="#" target="_blank" >
|
||||
创建项目
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<div class="ctt">
|
||||
<div class="dis" id="tbc_01">
|
||||
<div class="N_con">
|
||||
<form>
|
||||
<%= form_for(HomeworkAttach.new, :method => :post,
|
||||
:name => 'new_form',
|
||||
:url => {:controller => 'homework_attach',
|
||||
:action => 'create',
|
||||
:user_id => User.current.id,
|
||||
:bid_id => @bid
|
||||
}) do |f|%>
|
||||
<p>
|
||||
<label><span class="c_red">*</span> 作品名称 ：</label>
|
||||
<input id="" type="text" name="" class="w430 bo" placeholder="作品名称">
|
||||
<label>
|
||||
<span class="c_red">
|
||||
*
|
||||
</span>
|
||||
作品名称 ：
|
||||
</label>
|
||||
<%= f.text_field "name", :required => true, :size => 60, :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称" %>
|
||||
</p>
|
||||
<p>
|
||||
<label> 提交项目<img src="images/pic_question.png" width="16" height="16" Title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。项目托管平台：http://forge.trustie.ne">：</label>
|
||||
<select name="" id="" class="w350 bo">
|
||||
<option value="1">N</option>
|
||||
<option value="2">M</option>
|
||||
|
||||
</select>
|
||||
<label> 提交项目
|
||||
<img src="/images/bid/pic_question.png" width="16" height="16"
|
||||
title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
|
||||
项目托管平台：http://forge.trustie.ne">：
|
||||
</label>
|
||||
<%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "w350 bo"} %>
|
||||
</p>
|
||||
<p>
|
||||
<label style="float:left;"><span class="c_red">*</span> 作业描述 ：</label>
|
||||
<textarea id="" name="" placeholder="最多3000个汉字(或6000个英文字符)" class="w620" ></textarea>
|
||||
<label style="float:left;">
|
||||
<span class="c_red">
|
||||
*
|
||||
</span>
|
||||
作业描述 ：
|
||||
</label>
|
||||
<%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字" %>
|
||||
</p>
|
||||
<div class="cl"></div>
|
||||
<p>
|
||||
<label> 添加附件 ：</label>
|
||||
<input type="button" name="" value="文件浏览" style="width:80px; height:26px; color:#606060;"> <span style="font-weight:normal; color:#999;">-文件不超过200MB</span>
|
||||
<fieldset style="text-align: left;">
|
||||
<legend>
|
||||
<%= l(:label_attachment_plural) %>
|
||||
</legend>
|
||||
<p style=" padding: 3px 0 3px 0;padding-left: 50px; clear:left;">
|
||||
<%= render :partial => 'attachments/form' %>
|
||||
</p>
|
||||
</fieldset>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<span style="float: left;"> </span>
|
||||
<a href="#" target="_blank" class="tijiao">提交作业</a><a href="#" target="_blank" class="tijiao">重 置</a>
|
||||
<span style="float: left;">
|
||||
|
||||
</span>
|
||||
<a href="#" class="tijiao" onclick="submit_homework_form();">
|
||||
<%= l(:label_button_ok) %>
|
||||
</a>
|
||||
|
||||
<!--<a href="#" target="_blank" class="tijiao">-->
|
||||
<!--重 置-->
|
||||
<!--</a>-->
|
||||
<div class="cl"></div>
|
||||
</p>
|
||||
</form>
|
||||
<% end %>
|
||||
|
||||
</div><!---创建作业内容结束-->
|
||||
|
||||
</div>
|
||||
<div class="undis" id="tbc_02">
|
||||
<div class="members_left">
|
||||
<ul style=" border-bottom:none;">
|
||||
<li><span class="w260 f_b" >用户</span><span class="w260 f_b">角色</span><span></span></li>
|
||||
<li ><a href="#" class="w260">gugu01</a><span class="w260">发布人员</span><a href="#">删除</a></li>
|
||||
<li><a href="#" class="w260">gugu01</a><span class="w260">参与人员</span ><a href="#">删除</a></li>
|
||||
<li><a href="#" class="w260">gugu01</a><span class="w260">参与人员</span ><a href="#">删除</a></li>
|
||||
<li><a href="#" class="w260">gugu01</a><span class="w260">参与人员</span ><a href="#">删除</a></li>
|
||||
</ul>
|
||||
</div><!-- 左边-->
|
||||
<div class="members_right">
|
||||
<fieldset style=" border:none; margin-top:10px;">
|
||||
<legend style=" font-weight:bold; color:#15bccf;">添加成员</legend>
|
||||
<p><label for="principal_search">搜索用户或组：</label><input id="principal_search" name="principal_search" type="text" class="N_search" data-value-was=""></p>
|
||||
<div id="principals_for_new_member">
|
||||
<div id="principals">
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="195"> alan</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="231"> zoujiang09</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="241"> FANG_nudt</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="282"> gcm3651</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="307"> fhx569287825</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="500"> windleos</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="502"> acbuwa</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="575"> dislu</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="597"> huai_wang</label><br>
|
||||
<label><input name="membership[user_ids][]" type="checkbox" value="603"> H.Lee</label><br>
|
||||
</div>
|
||||
<div class="pagination_new">
|
||||
<ul class="wlist" style=" float:left;">
|
||||
<li><a href="#">上一页</a></li>
|
||||
<li><a href="#">1</a></li>
|
||||
<li><a href="#">2</a></li>
|
||||
<li><a href="#">...</a></li>
|
||||
<li><a href="#">下一页</a></li>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
<p><a href="#" class="tijiao">新增成员</a></p>
|
||||
</fieldset>
|
||||
|
||||
</div><!-- 右边-->
|
||||
</div><!---成员结束-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 502 B |
|
|
@ -1,5 +1,5 @@
|
|||
/* CSS Document */
|
||||
body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
|
||||
body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
|
||||
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
|
||||
div,img,tr,td,textarea{ border:0;}
|
||||
table,tr,td{border:0; cellspacing:0; cellpadding:0;}
|
||||
|
|
@ -118,19 +118,19 @@ a:hover.ping_sub{ background:#14a8b9;}
|
|||
|
||||
|
||||
/* 创建作业 */
|
||||
.Newwork{ width:918px; height:418px; border:1px solid #c3c3c3;}
|
||||
.N_top{ height:35px; background:#e5e5e5; border:1px solid #fff; width:669px; padding:5px 10px 0 15px;}
|
||||
.Newwork{ width:940px; height:auto; border:1px solid #c3c3c3;}
|
||||
.N_top{ height:35px; background:#e5e5e5; border:1px solid #fff; width:691px; padding:5px 10px 0 15px;}
|
||||
.N_top h2{ color:#616161; font-size:14px; float:left;}
|
||||
.N_top a{ float:right; font-size:14px; color:#15bccf; display:block; background:url(images/pic_ad.png) 0 5px no-repeat; height:20px; width:60px; padding-left:16px;}
|
||||
.N_con{ color:#484747; font-weight:bold; width:720px; margin:15px auto;}
|
||||
.N_con{ color:#484747 !important; font-weight:bold; width: 691px;; margin:15px auto;}
|
||||
.N_con p{ margin-bottom:15px;}
|
||||
|
||||
.w430{ width:430px;}
|
||||
.w350{ width:350px;}
|
||||
.w620{ width:580px; height:160px; border:1px solid #CCC;}
|
||||
.bo{height:26px; border:1px solid #CCC; }
|
||||
a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
|
||||
a:hover.tijiao{ background:#0f99a9;}
|
||||
.bo{height:26px; border:1px solid #CCC !important; padding: 0 !important;}
|
||||
a.tijiao{ height:28px !important; display:block !important; width:80px !important; color:#fff !important; background:#15bccf !important; text-align:center !important; padding-top:4px !important; float:left !important; margin-right:10px !important;}
|
||||
a:hover.tijiao{ background:#0f99a9 !important;}
|
||||
|
||||
/* 匿名评分弹框 */
|
||||
.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue