From f3ac5a0a84ee4bcaab85e6816d32ecedc96eb0c1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sun, 2 Nov 2014 17:08:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=202.=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=80=81=E5=B8=88=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=90=AF=E5=8A=A8=E4=BA=92=E8=AF=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=203.=E4=BF=AE=E6=94=B9css.css=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 4 +- app/views/bids/_homework_form.html.erb | 2 +- .../homework_attach/_praise_alert.html.erb | 2 +- app/views/homework_attach/new.html.erb | 125 ++++++++---------- public/images/bid/pic_question.png | Bin 0 -> 502 bytes public/stylesheets/css.css | 14 +- 6 files changed, 68 insertions(+), 79 deletions(-) create mode 100644 public/images/bid/pic_question.png diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 76342862e..21dcdcd0f 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -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, diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb index 3a9158349..063daa12c 100644 --- a/app/views/bids/_homework_form.html.erb +++ b/app/views/bids/_homework_form.html.erb @@ -40,7 +40,7 @@

<%= f.select :is_evaluation, is_evaluation_option %>

-

+

<%= f.select :proportion, proportion_option %>

diff --git a/app/views/homework_attach/_praise_alert.html.erb b/app/views/homework_attach/_praise_alert.html.erb index 477615751..2036df394 100644 --- a/app/views/homework_attach/_praise_alert.html.erb +++ b/app/views/homework_attach/_praise_alert.html.erb @@ -3,7 +3,7 @@ 作业评分弹框 - <%= stylesheet_link_tag 'css', :media => 'all' %> + <%= stylesheet_link_tag 'css'%> diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index ebe261519..a54030902 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -5,10 +5,10 @@ 新建作业 <%= stylesheet_link_tag 'css', :media => 'all' %> @@ -19,93 +19,82 @@

-
+ <%= 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|%>

- - + + <%= f.text_field "name", :required => true, :size => 60, :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称" %>

- - + + <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "w350 bo"} %>

- - + + <%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字" %>

- -     -文件不超过200MB +

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

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

+

-                        - 提交作业重  置 + +                        + + + <%= l(:label_button_ok) %> + + + + +

-
+ <% end %>
-
-
- -
-
-
- 添加成员 -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-

新增成员

-
- -
-
-
diff --git a/public/images/bid/pic_question.png b/public/images/bid/pic_question.png new file mode 100644 index 0000000000000000000000000000000000000000..2e48138424494a54411bcc7d949a337eeccb0623 GIT binary patch literal 502 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-d`Uz>RCwBq(=ljMQ4|K?@4Yt8e4dWA7N&D9ZaQ0Y%FNYSMeFcrF z$YQIev-R`nB^jKGP#WR7#a7K~H?jJ@H;gWashfr9?f))HhMf>^Mim&544n`!irB_f zkDQ;5)hCA9bQgO;x=iEgH=gx>c!b;8T}aRzHBLr%XONs< srUW-|5l^t0#(!ZQ_izRevK9Xf0R94Ck#p1PV*mgE07*qoM6N<$f?KHF{Qv*} literal 0 HcmV?d00001 diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 15310f72f..5f6704bb7 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -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;}