From 8289ca6c8920d6a58ce8779a21902576c2633da0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 31 Jan 2015 11:14:55 +0800 Subject: [PATCH 1/5] 11111 --- app/controllers/zipdown_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index b329e4c27..6c5385115 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -7,6 +7,7 @@ class ZipdownController < ApplicationController SAVE_FOLDER = "#{Rails.root}/files" OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip" + def assort if params[:obj_class] == "Bid" bid = Bid.find params[:obj_id] From d76c0a5365619de89ab9ca3cb2ffaed9e946ea6c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 31 Jan 2015 14:28:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/new.html.erb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index 77077f102..e9d32afd4 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -37,7 +37,7 @@ function submit_homework_form(){if(regexName()&®exDescription()){$('#new_homework_attach').submit();}} -
+
    @@ -82,9 +82,6 @@

    -
    -

    -

    +
      @@ -75,7 +75,6 @@ <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字" %>

      -

      + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %>
      - <%= text_field_tag :q, nil, :placeholder => l(:label_search_information), style:"float:left;" %> <%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %> <%= select_tag(:search_by,options_for_select([[l(:label_select_user_nickname),"0"],[l(:label_select_user_showname),"1"],[l(:label_select_user_email),"2"]]), :onchange => "searchByChange();",:style => "float:right" ) %>
      <%#= hidden_field_tag 'project_type', project_type %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %> -
      +
    <% end %> From 4f82fe2a7b34e136ced36aea572c6140fca6b0a0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 31 Jan 2015 14:47:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index ffb9da644..a64d73832 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -1,6 +1,7 @@ /* CSS Document */ #content{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;} #popbox{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;} +#popbox02{ 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;}