From 78bc458e84607939bbb7657665800f34a616705f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sun, 2 Nov 2014 12:58:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8C=BF=E8=AF=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework.html.erb | 2 +- .../homework_attach/_praise_alert.html.erb | 4 +- app/views/homework_attach/new.html.erb | 162 +++++++++++++----- app/views/homework_attach/show.js.erb | 1 + public/stylesheets/css.css | 10 +- 5 files changed, 124 insertions(+), 55 deletions(-) diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index d6f53aaf2..0b38d07d9 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -32,7 +32,7 @@ <% if !@is_teacher && @homework_list.count > 0%> $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>'); showModal('ajax-modal', '480px'); - $('#ajax-modal').css('height','250px'); + $('#ajax-modal').css('height','240px'); <% end %> } diff --git a/app/views/homework_attach/_praise_alert.html.erb b/app/views/homework_attach/_praise_alert.html.erb index fc20b15b5..477615751 100644 --- a/app/views/homework_attach/_praise_alert.html.erb +++ b/app/views/homework_attach/_praise_alert.html.erb @@ -10,9 +10,9 @@
- + - +

匿名评价

diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index b600e2b26..ebe261519 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -1,51 +1,119 @@ -

- <%=h l(:label_new_homework)%> -

+ + + + + 新建作业 + <%= stylesheet_link_tag 'css', :media => 'all' %> + -
- <%= form_for('new_form', :method => :post, - :url => {:controller => 'homework_attach', - :action => 'create', - :user_id => User.current.id, - :bid_id => @bid - }) do |f|%> -

- 标      题 *： - <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;", :maxlength => 254 %> -

-

- - 提交项目  ： - - <%= f.select :project_id,options_for_select(user_projects_option), {},{:style => "width:490px;"} %> - <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %> -

- 提交项目可以为空 -

-

-

- - 描      述  ： - - - <%= f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => 5000 %> - -

-

-

- - <%= l(:label_attachment_plural) %> - -

- <%= render :partial => 'attachments/form' %> + + + +

+
+
+ + +
+
+
+
+
+

+ +

-
-

+

+ + +

+

+ + +

+
+

+ +     -文件不超过200MB +

+ +

+                        + 提交作业重  置 +

+

+ + +
+ +
+
+
+ +
+
+
+ 添加成员 +

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+

新增成员

+
+ +
+
+ +
+ + + + + + -

- - <%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%> - -

- <% end %> + + diff --git a/app/views/homework_attach/show.js.erb b/app/views/homework_attach/show.js.erb index 9f9b39b89..66ed277f2 100644 --- a/app/views/homework_attach/show.js.erb +++ b/app/views/homework_attach/show.js.erb @@ -1,3 +1,4 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score}) %>'); showModal('ajax-modal', '503px'); $('#ajax-modal').css('height','569px'); + diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index f350089fc..9fbd2ecaf 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -8,10 +8,7 @@ ul,li{ list-style-type:none} a{ text-decoration:none; } a:hover{ text-decoration:underline;} - -.container{ width:940px; margin:0 auto; padding-top:125px;} - - +.container{ width:940px; margin:0 auto; } /* 作业列表 */ .ttl{ } .ctt{height:820px;clear:both; } @@ -120,7 +117,7 @@ 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:891px; padding:5px 10px 0 15px;} +.N_top{ height:35px; background:#e5e5e5; border:1px solid #fff; width:669px; 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;} @@ -140,6 +137,9 @@ a:hover.tijiao{ background:#0f99a9;} .ni_con p{ color:#808181;} .ni_con a:hover{ text-decoration:none;} +/*.ui-widget-header{display: none;}*/ + +