Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
This commit is contained in:
commit
e3b0b8e9e1
|
@ -27,25 +27,28 @@
|
||||||
// file.click();
|
// file.click();
|
||||||
// }
|
// }
|
||||||
</script>
|
</script>
|
||||||
<span class="add_attachment">
|
<span class="add_attachment" style="font-weight:normal;">
|
||||||
<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
|
<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
|
||||||
<!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
|
<!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
|
||||||
<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %>
|
<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %>
|
||||||
<%= file_field_tag 'attachments[dummy][file]',
|
<%= file_field_tag 'attachments[dummy][file]',
|
||||||
:id => '_file',
|
:id => '_file',
|
||||||
:class => 'file_selector',
|
:class => 'file_selector',
|
||||||
:multiple => true,
|
:multiple => true,
|
||||||
:onchange => 'addInputFiles(this);',
|
:onchange => 'addInputFiles(this);',
|
||||||
:style => 'display:none',
|
:style => 'display:none',
|
||||||
:data => {
|
:data => {
|
||||||
:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
|
:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
|
||||||
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
|
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
|
||||||
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
|
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
|
||||||
:upload_path => uploads_path(:format => 'js'),
|
:upload_path => uploads_path(:format => 'js'),
|
||||||
:description_placeholder => l(:label_optional_description)
|
:description_placeholder => l(:label_optional_description)
|
||||||
} %>
|
} %>
|
||||||
<span id="upload_file_count"><%= l(:label_no_file_uploaded)%></span>
|
<span id="upload_file_count">
|
||||||
(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
|
<%= l(:label_no_file_uploaded)%>
|
||||||
|
</span>
|
||||||
|
(<%= l(:label_max_size) %>:
|
||||||
|
<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="attachments">
|
<div class="attachments" style="font-weight:normal;">
|
||||||
<% for attachment in attachments %>
|
<% for attachment in attachments %>
|
||||||
<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
|
<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
|
||||||
<span title="<%= attachment.filename%>" id = "attachment_">
|
<span title="<%= attachment.filename%>" id = "attachment_"">
|
||||||
<% if options[:length] %>
|
<% if options[:length] %>
|
||||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
|
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<% when 1 %>
|
<% when 1 %>
|
||||||
<%= link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
|
<%= link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
|
||||||
<% when 2 %>
|
<% when 2 %>
|
||||||
已关闭匿评
|
匿评结束
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
|
|
|
@ -29,7 +29,8 @@
|
||||||
|
|
||||||
window.onready = function()
|
window.onready = function()
|
||||||
{
|
{
|
||||||
<% if !@is_teacher && @homework_list.count > 0%>
|
<% if !@is_teacher && @homework_list.count > 0 && @bid.comment_status == 1%>
|
||||||
|
//登录者不是老师,且作业列表数目不为0,且作业处于开启匿评阶段
|
||||||
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>');
|
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>');
|
||||||
showModal('ajax-modal', '480px');
|
showModal('ajax-modal', '480px');
|
||||||
$('#ajax-modal').css('height','240px');
|
$('#ajax-modal').css('height','240px');
|
||||||
|
|
|
@ -34,9 +34,12 @@
|
||||||
<li id="tb_6" class="normaltab">
|
<li id="tb_6" class="normaltab">
|
||||||
<%= link_to "我的作品", get_my_homework_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
<%= link_to "我的作品", get_my_homework_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
||||||
</li>
|
</li>
|
||||||
<li id="tb_7" class="normaltab">
|
<% if @bid.comment_status == 2 %>
|
||||||
<%= link_to "所有作品", get_homeworks_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
<!-- 匿评结束后才能看到全部作业列表 -->
|
||||||
</li>
|
<li id="tb_7" class="normaltab">
|
||||||
|
<%= link_to "所有作品", get_homeworks_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
<li id="tb_8" class="normaltab">
|
<li id="tb_8" class="normaltab">
|
||||||
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
||||||
(<span id="jours_count" class="c_red f_12">
|
(<span id="jours_count" class="c_red f_12">
|
||||||
|
|
|
@ -61,13 +61,24 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<% elsif is_student_batch_homework%>
|
<% elsif is_student_batch_homework%>
|
||||||
<!-- 学生匿评列表,正常显示 -->
|
<!-- 学生匿评列表 -->
|
||||||
<li class="wping">
|
<% if @bid.comment_status == 1 %>
|
||||||
<%= link_to l(:label_work_rating),homework_attach_path(homework),:remote => true %>
|
<!-- 处于开启匿评阶段,可以正常评分 -->
|
||||||
<% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
|
<li class="wping">
|
||||||
<span class="c_red"> 迟交!</span>
|
<%= link_to l(:label_work_rating),homework_attach_path(homework),:remote => true %>
|
||||||
<% end %>
|
<% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
|
||||||
</li>
|
<span class="c_red"> 迟交!</span>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<% elsif @bid.comment_status == 2%>
|
||||||
|
<!-- 处于匿评已关闭阶段,不容许评分 -->
|
||||||
|
<li class="wping">
|
||||||
|
<a>评分</a>
|
||||||
|
<% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
|
||||||
|
<span class="c_red"> 迟交!</span>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<!-- 学生众评列表,显示为点赞 -->
|
<!-- 学生众评列表,显示为点赞 -->
|
||||||
<li class="wzan" id="homeworl_praise_li_<%= homework.id%>">
|
<li class="wzan" id="homeworl_praise_li_<%= homework.id%>">
|
||||||
|
|
|
@ -1,11 +1,22 @@
|
||||||
|
<script>
|
||||||
|
function submit_homework_user()
|
||||||
|
{
|
||||||
|
$(".edit_user").submit();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
<%= error_messages_for 'member' %>
|
<%= error_messages_for 'member' %>
|
||||||
<div style="float:left; width:60%;padding-left: 10px;padding-right: 10px"
|
<div style="float:left; width:60%;padding-left: 10px;padding-right: 10px"
|
||||||
xmlns="http://www.w3.org/1999/html" id = "homework_of_users">
|
xmlns="http://www.w3.org/1999/html" id = "homework_of_users">
|
||||||
<table class="list members" style="width: 100%">
|
<table class="list members" style="width: 100%">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= l(:label_user) %></th>
|
<th>
|
||||||
<th><%= l(:label_role_plural) %></th>
|
<%= l(:label_user) %>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<%= l(:label_role_plural) %>
|
||||||
|
</th>
|
||||||
<th style="width:10%"></th>
|
<th style="width:10%"></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
@ -19,9 +30,15 @@
|
||||||
<% hoemwork_users.each do |user| %>
|
<% hoemwork_users.each do |user| %>
|
||||||
<tr id="member-<%= user.id %>" class="<%= cycle 'odd', 'even' %> member" style="text-align: center">
|
<tr id="member-<%= user.id %>" class="<%= cycle 'odd', 'even' %> member" style="text-align: center">
|
||||||
<% if homework.user != user %>
|
<% if homework.user != user %>
|
||||||
<td style="width: 40%"><%= link_to_user user %></td>
|
<td style="width: 40%">
|
||||||
<td style="text-align: center;width: 50%"> 参与人员 </td>
|
<%= link_to_user user %>
|
||||||
<td><%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post %></td>
|
</td>
|
||||||
|
<td style="text-align: center;width: 50%">
|
||||||
|
参与人员
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post, :confirm => l(:label_delete_confirm) %>
|
||||||
|
</td>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -31,14 +48,23 @@
|
||||||
|
|
||||||
<div class="splitcontentright" style="width: 37%">
|
<div class="splitcontentright" style="width: 37%">
|
||||||
<%= form_for(hoemwork_users, {:url => add_homework_users_homework_attach_path(homework), :remote => true, :method => :post}) do |f| %>
|
<%= form_for(hoemwork_users, {:url => add_homework_users_homework_attach_path(homework), :remote => true, :method => :post}) do |f| %>
|
||||||
<fieldset>
|
<fieldset style=" border:none; margin-top:10px;">
|
||||||
<legend><%= l(:label_member_new) %></legend>
|
<legend style=" font-weight:bold; color:#15bccf;">
|
||||||
<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
|
<%= l(:label_member_new) %>
|
||||||
|
</legend>
|
||||||
|
<p style="padding-left: 20px;">
|
||||||
|
<%= label_tag "principal_search", l(:label_principal_search) %>
|
||||||
|
<%= text_field_tag 'principal_search', nil ,{:class => "N_search",:style => "width:50%;"}%>
|
||||||
|
</p>
|
||||||
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript get_homework_member_list_homework_attach_index_path(:q => params[:q], :bid_id => params[:id]||homework, :format => 'js') }')" %>
|
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript get_homework_member_list_homework_attach_index_path(:q => params[:q], :bid_id => params[:id]||homework, :format => 'js') }')" %>
|
||||||
<div id="principals_for_new_member">
|
<div id="principals_for_new_member" style="padding-left: 20px;">
|
||||||
<%= render_new_members_for_homework(members) %>
|
<%= render_new_members_for_homework(members) %>
|
||||||
</div>
|
</div>
|
||||||
<p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
|
<p style="padding-left: 20px;">
|
||||||
</fieldset>
|
<a href="#" class="tijiao" id='member-add-submit' onclick="submit_homework_user();">
|
||||||
|
<%= l(:button_add) %>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</fieldset>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -32,9 +32,16 @@
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作业,请创建作业!</li>
|
<li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作业,请创建作业!</li>
|
||||||
<li class="wping">
|
<% if @bid.comment_status == 0 %>
|
||||||
<%= link_to "创建作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
|
<!-- 老师布置的作业在创建和开启匿评这段时间才允许创建作品 -->
|
||||||
</li>
|
<li class="wping">
|
||||||
|
<%= link_to "创建作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
|
||||||
|
</li>
|
||||||
|
<% else %>
|
||||||
|
<li class="wping">
|
||||||
|
<a style="width:80px; margin:20px 0 0 350px;">创建作业</a>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1,75 +1,103 @@
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<title>新建作业</title>
|
||||||
|
<%= stylesheet_link_tag 'css'%>
|
||||||
|
<script type="text/javascript" language="javascript">
|
||||||
|
function switchTab(ProTag){
|
||||||
|
var display_index = 3 - ProTag;
|
||||||
|
$("#tb_" + ProTag).attr("class","hovertab");
|
||||||
|
$("#tb_" + display_index).attr("class","normaltab");
|
||||||
|
$("#content" + ProTag).show();
|
||||||
|
$("#content" + display_index).hide();
|
||||||
|
}
|
||||||
|
function submit_homework_form()
|
||||||
|
{
|
||||||
|
$('#edit_homework_attach_<%= @homework.id%>').submit();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<body>
|
||||||
function switchTab(ProTag) {
|
<div class="container">
|
||||||
var display_index = 3 - ProTag;
|
<div class="Newwork">
|
||||||
$("#tab" + ProTag).attr("class","selected");
|
<div id="tb_" class="tb_">
|
||||||
$("#tab" + display_index).attr("class","");
|
<ul>
|
||||||
$("#content" + ProTag).show();
|
<li id="tb_1" class="hovertab" onclick="switchTab(1);this.blur();return false;" style="width: auto; padding:5px 10px 0;">
|
||||||
$("#content" + display_index).hide();
|
修改作业
|
||||||
}
|
</li>
|
||||||
</script>
|
<li id="tb_2" class="normaltab" onclick="switchTab(2);this.blur();return false;">
|
||||||
|
成员
|
||||||
|
</li>
|
||||||
|
<li class="N_top" style="width: 747px;">
|
||||||
|
<%= link_to(l(:label_project_new), {:controller => 'projects',
|
||||||
|
:action => 'new',
|
||||||
|
:course => 0,
|
||||||
|
:project_type => 0}) if User.current.allowed_to?(:add_project, nil, :global => true) %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
<p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_edit_homework)%> </p>
|
</div>
|
||||||
<div class="tabs">
|
<div id="content1">
|
||||||
<ul>
|
<div class="N_con">
|
||||||
<li>
|
<%= form_for(@homework) do |f|%>
|
||||||
<a id = "tab1" href="#" class = "selected" onclick="switchTab(1);this.blur();return false;">
|
<p>
|
||||||
<%= l(:label_information_plural) %>
|
<label><span class="c_red">*</span> 作品名称 :</label>
|
||||||
</a>
|
<%= f.text_field :name, :required => true, :name => "homework_name", :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称"%>
|
||||||
</li>
|
</p>
|
||||||
<li>
|
<p>
|
||||||
<a id="tab2" href="#" onclick="switchTab(2); this.blur(); return false;">
|
<label> 提交项目
|
||||||
<%= l(:label_member_plural) %>
|
<img src="/images/bid/pic_question.png" width="16" height="16"
|
||||||
</a>
|
title="项目是一种由用户创建的基于网络的协作空间,能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
|
||||||
</li>
|
项目托管平台:http://forge.trustie.ne">:
|
||||||
</ul>
|
</label>
|
||||||
</div>
|
<% if @homework.project.nil? %>
|
||||||
<div class="box" id="content1">
|
<%= f.select :project_id, options_for_select(user_projects_option),{}, {:name => "project_id", :required => true,:class => "w350 bo"}%>
|
||||||
<%= form_for(@homework) do |f|%>
|
<% else %>
|
||||||
<p style=" padding: 3px 0 3px 0;padding-left: 50px; clear:left;">
|
<%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),{},{:name => "project_id", :required => true, :class => "w350 bo"}%>
|
||||||
<strong>标 题 <span style="color: red">*</span>:</strong>
|
<% end %>
|
||||||
<%= f.text_field :name, :required => true, :name => "homework_name", :size => 60, :style => "width:490px;", :maxlength => 254%>
|
</p>
|
||||||
</p>
|
<p>
|
||||||
<p style=" padding: 3px 0 3px 0;padding-left: 50px; clear:left;">
|
<label style="float:left;">
|
||||||
<strong>提交项目 :</strong>
|
<span class="c_red">*</span>
|
||||||
<% if @homework.project.nil? %>
|
作业描述 :
|
||||||
<%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true%>
|
</label>
|
||||||
<% else %>
|
<%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620",
|
||||||
<%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),:name => "project_id", :required => true%>
|
:maxlength => 3000, :placeholder => "最多3000个汉字" %>
|
||||||
|
</p>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<p>
|
||||||
|
<label style="float: left;"> 添加附件 :</label>
|
||||||
|
<%#= render :partial => 'attachments/form' %>
|
||||||
|
<p style=" padding: 3px 0 3px 0;padding-left: 90px;">
|
||||||
|
<% options = {:author => true, :deletable => attach_delete(@homework)} %>
|
||||||
|
<%= render :partial => 'attachments/links',
|
||||||
|
:locals => {:attachments => @homework.attachments, :options => options} %>
|
||||||
|
</p>
|
||||||
|
<p style=" padding: 3px 0 3px 0;padding-left: 90px;">
|
||||||
|
<%= render :partial => 'attachments/form' %>
|
||||||
|
</p>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<span style="float: left;">
|
||||||
|
|
||||||
|
</span>
|
||||||
|
<a href="#" class="tijiao" onclick="submit_homework_form();">
|
||||||
|
<%= l(:label_button_ok) %>
|
||||||
|
</a>
|
||||||
|
<a href="javascript:history.back()" class="tijiao">取 消</a>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
</div><!---创建作业内容结束-->
|
||||||
|
</div>
|
||||||
|
|
||||||
<%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
|
<div id="content2" class="undis">
|
||||||
<p class="font_lighter" style="padding-left:120px;clear:left;">提交项目可以为空</p>
|
<%= render :partial => "homework_member",:locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} %>
|
||||||
</p>
|
</div><!---成员结束-->
|
||||||
<p style=" padding: 3px 0 3px 0;padding-left: 50px; clear:left;">
|
</div>
|
||||||
<strong style="vertical-align: top">描 述 :</strong>
|
</div><!--新建作业结束-->
|
||||||
<span style="margin-left:-10px;padding-right: 20px;">
|
</body>
|
||||||
<%= f.text_area :description, :rows => 8, :name => "homework_description", :class => 'wiki-edit', :maxlength => 3000, :style => "font-size:small;width:490px;margin-left:10px;" %>
|
</html>
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p style="padding-left: 60px">
|
|
||||||
<fieldset style="text-align: left;">
|
|
||||||
<p style="padding-left: 60px">
|
|
||||||
<% options = {:author => true, :deletable => attach_delete(@homework)} %>
|
|
||||||
<%= render :partial => 'attachments/links',
|
|
||||||
:locals => {:attachments => @homework.attachments, :options => options} %>
|
|
||||||
</p>
|
|
||||||
<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 style="padding-left: 60px;padding-top: 10px;">
|
|
||||||
<span >
|
|
||||||
<%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="content2" style="display: none" >
|
|
||||||
<%= render :partial => "homework_member",:locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} %>
|
|
||||||
</div>
|
|
||||||
|
|
|
@ -1,19 +1,10 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<%= stylesheet_link_tag 'css', :media => 'all' %>
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<script type="text/javascript" language="javascript">
|
||||||
<head>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
||||||
<title>新建作业</title>
|
|
||||||
<%= stylesheet_link_tag 'css', :media => 'all' %>
|
|
||||||
<script type="text/javascript" language="javascript">
|
|
||||||
function submit_homework_form()
|
function submit_homework_form()
|
||||||
{
|
{
|
||||||
$('#new_homework_attach').submit();
|
$('#new_homework_attach').submit();
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="Newwork">
|
<div class="Newwork">
|
||||||
<div id="tb_" class="tb_">
|
<div id="tb_" class="tb_">
|
||||||
|
@ -22,23 +13,22 @@
|
||||||
创建作品
|
创建作品
|
||||||
</li>
|
</li>
|
||||||
<li class="N_top" style="width: 835px;">
|
<li class="N_top" style="width: 835px;">
|
||||||
<a href="#" target="_blank" >
|
<%= link_to(l(:label_project_new), {:controller => 'projects',
|
||||||
创建项目
|
:action => 'new',
|
||||||
</a>
|
:course => 0,
|
||||||
|
:project_type => 0}) if User.current.allowed_to?(:add_project, nil, :global => true) %>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="ctt">
|
<div class="dis" id="tbc_01">
|
||||||
<div class="dis" id="tbc_01">
|
<div class="N_con">
|
||||||
<div class="N_con">
|
<%= form_for(HomeworkAttach.new, :method => :post,
|
||||||
<%= form_for(HomeworkAttach.new, :method => :post,
|
:name => 'new_form',
|
||||||
:name => 'new_form',
|
:url => {:controller => 'homework_attach',
|
||||||
:url => {:controller => 'homework_attach',
|
:action => 'create',
|
||||||
:action => 'create',
|
:user_id => User.current.id,
|
||||||
:user_id => User.current.id,
|
:bid_id => @bid
|
||||||
:bid_id => @bid
|
}) do |f|%>
|
||||||
}) do |f|%>
|
|
||||||
<p>
|
<p>
|
||||||
<label>
|
<label>
|
||||||
<span class="c_red">
|
<span class="c_red">
|
||||||
|
@ -51,7 +41,7 @@
|
||||||
<p>
|
<p>
|
||||||
<label> 提交项目
|
<label> 提交项目
|
||||||
<img src="/images/bid/pic_question.png" width="16" height="16"
|
<img src="/images/bid/pic_question.png" width="16" height="16"
|
||||||
title="项目是一种由用户创建的基于网络的协作空间,能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
|
title="项目是一种由用户创建的基于网络的协作空间,能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
|
||||||
项目托管平台:http://forge.trustie.ne">:
|
项目托管平台:http://forge.trustie.ne">:
|
||||||
</label>
|
</label>
|
||||||
<%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "w350 bo"} %>
|
<%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "w350 bo"} %>
|
||||||
|
@ -67,14 +57,11 @@
|
||||||
</p>
|
</p>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<p>
|
<p>
|
||||||
<fieldset style="text-align: left;">
|
<label style="float: left;"> 添加附件 :</label>
|
||||||
<legend>
|
<%#= render :partial => 'attachments/form' %>
|
||||||
<%= l(:label_attachment_plural) %>
|
<p style=" padding: 3px 0 3px 0;padding-left: 90px;">
|
||||||
</legend>
|
<%= render :partial => 'attachments/form' %>
|
||||||
<p style=" padding: 3px 0 3px 0;padding-left: 50px; clear:left;">
|
</p>
|
||||||
<%= render :partial => 'attachments/form' %>
|
|
||||||
</p>
|
|
||||||
</fieldset>
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -84,25 +71,11 @@
|
||||||
<a href="#" class="tijiao" onclick="submit_homework_form();">
|
<a href="#" class="tijiao" onclick="submit_homework_form();">
|
||||||
<%= l(:label_button_ok) %>
|
<%= l(:label_button_ok) %>
|
||||||
</a>
|
</a>
|
||||||
|
<a href="javascript:history.back()" class="tijiao">取 消</a>
|
||||||
<!--<a href="#" target="_blank" class="tijiao">-->
|
|
||||||
<!--重 置-->
|
|
||||||
<!--</a>-->
|
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</p>
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
</div><!---创建作业内容结束-->
|
||||||
</div><!---创建作业内容结束-->
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div><!--新建作业结束-->
|
</div><!--新建作业结束-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ a:hover.ping_sub{ background:#14a8b9;}
|
||||||
|
|
||||||
|
|
||||||
/* 创建作业 */
|
/* 创建作业 */
|
||||||
.Newwork{ width:940px; height:auto; border:1px solid #c3c3c3;}
|
.Newwork{ width:940px; border:1px solid #c3c3c3;}
|
||||||
.N_top{ height:35px; background:#e5e5e5; border:1px solid #fff; width:691px; padding:5px 10px 0 15px;}
|
.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 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_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;}
|
||||||
|
@ -131,6 +131,15 @@ a:hover.ping_sub{ background:#14a8b9;}
|
||||||
.bo{height:26px; border:1px solid #CCC !important; padding: 0 !important;}
|
.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.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;}
|
a:hover.tijiao{ background:#0f99a9 !important;}
|
||||||
|
.members_left{ float:left; width:570px; margin-right:20px;}
|
||||||
|
.members_left{}
|
||||||
|
.members_left ul li{ height:30px; border-bottom:1px solid #CCC; width:570px; padding-top:5px; }
|
||||||
|
.members_left ul li a{ float:left;}
|
||||||
|
.members_left ul li span{ float:left; text-align:center; color:#484747;}
|
||||||
|
.w260{ text-align:center; width:260px;}
|
||||||
|
.f_b{ font-weight: bold;}
|
||||||
|
.members_right label{ margin-left:15px;}
|
||||||
|
.N_search{ height:20px !important; border:1px solid #999 !important;}
|
||||||
|
|
||||||
/* 匿名评分弹框 */
|
/* 匿名评分弹框 */
|
||||||
.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}
|
.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