From 3ac023e7a59dba1e91738297f3e1d4b181f06bd8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 18 Nov 2014 11:18:00 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=A1=86=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=B1=8F=E5=B9=95=E7=BB=9D=E5=AF=B9=E5=AE=9A=E4=BD=8D?=
=?UTF-8?q?=20=E9=97=AE=E9=A2=98=EF=BC=9A=E8=B2=8C=E4=BC=BCIE6=E4=B8=8D?=
=?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/_course_ad.html.erb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb
index f8b4781f8..efac79afc 100644
--- a/app/views/courses/_course_ad.html.erb
+++ b/app/views/courses/_course_ad.html.erb
@@ -33,12 +33,11 @@
var xstep=1; // 移动步长，此参数越小，移动越平滑，最小值为1
var delay_time=60; // 每步的时间间隔，此参数越小，移动速度越快
var YY=0;
- var screen_height = $(window).height(); //浏览器当前窗口文档的高度
- var screen_width = $(window).width(); //浏览器当前窗口文档的宽度
window.setInterval(function(){move();},delay_time);
function move()
{
+ var screen_height = $(window).height(); //浏览器当前窗口文档的高度
var floatpoint_height = $("#floatpoint").height();
YY += xstep;
if(YY <= 0){xstep = 1; YY = 0;} //如果浮动层超出了上界，则设定移动方向为向下；并设定层的位置为正好在上界处
@@ -47,9 +46,9 @@
xstep = -1;
YY=(screen_height-floatpoint_height);
}
- $("#floatpoint").css("top",YY);
+ $("#floatpoint").css("margin-top",YY);
}
- function change_size(){var body_width = $("#top-menu").width(); $("#floatpoint").css("left",screen_width/2+body_width/2+10);}
+ function change_size(){var screen_width = $(window).width();var body_width = $("#top-menu").width(); $("#floatpoint").css("left",screen_width/2+body_width/2+10).css("position", "fixed");}
$(document).ready(function(){change_size();});
- $(window).resize(function(){screen_width = $(window).width();change_size();});
+ $(window).resize(function(){change_size();});
\ No newline at end of file
From d0e549fc851484433c4e67da1d687fb58bd5ad33 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 18 Nov 2014 16:00:04 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_bid_homework_show.html.erb | 29 ++++++++++++++++++----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 73a9bc6bd..166a4b224 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -1,4 +1,23 @@
+
+
<% if bids.blank? %>
<%#= l(:label_uncommit_homework) %>
暂无作业！
@@ -100,11 +119,11 @@
<%= l(:label_commit_limit)%>
<% else %>
- <% if betweentime(bid.deadline) < 3 %>
-
- <%= l(:label_commit_ar) %>
-
- <% end %>
+
+
+
<% end %>
From 6bfbf5bd2bee976219c57d9eb1f369ad2baeaa40 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 18 Nov 2014 16:13:11 +0800
Subject: [PATCH 03/20] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=8F=AF=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=202.=E5=A2=9E=E5=8A=A0=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E5=85=B3=E9=97=AD=E9=98=B6=E6=AE=B5=E5=8F=AF=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_bid_homework_show.html.erb | 8 +++++++-
app/views/homework_attach/_homeworks_list.html.erb | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 166a4b224..cd9b7b037 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -45,7 +45,13 @@
<% if User.current.logged? && is_cur_course_student(@course) %>
<% cur_user_homework = cur_user_homework_for_bid(bid) %>
<% if cur_user_homework!= nil && cur_user_homework.empty? %>
- <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
+ <% if bid.comment_status == 0 || bid.comment_status == 2%>
+ <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
+ <% else %>
+
+ <%= l(:label_commit_homework)%>
+
+ <% end %>
<% else %>
<%= l(:lable_has_commit_homework)%>
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index c778588f7..c40004d02 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -35,13 +35,13 @@
您还没交作业，请创建作业！
- <% if @bid.comment_status == 0 %>
+ <% if @bid.comment_status == 0 || @bid.comment_status == 1%>
<%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
<% else %>
-
+
提交作业
<% end %>
From 6245b6ba33a2651b9ec5e5bc745eef38afa8ea38 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 18 Nov 2014 16:47:04 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E3=80=81=E5=90=AF=E5=8A=A8=E5=8C=BF=E8=AF=84=E3=80=81=E5=85=B3?=
=?UTF-8?q?=E9=97=AD=E5=8C=BF=E8=AF=84=E3=80=81=E6=8F=90=E4=BA=A4=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_bid_homework_show.html.erb | 32 +++++++++++++++++-----
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index cd9b7b037..cc8159821 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -17,6 +17,21 @@
+second+" 秒");
}
+
<% if bids.blank? %>
<%#= l(:label_uncommit_homework) %>
@@ -46,10 +61,12 @@
<% cur_user_homework = cur_user_homework_for_bid(bid) %>
<% if cur_user_homework!= nil && cur_user_homework.empty? %>
<% if bid.comment_status == 0 || bid.comment_status == 2%>
- <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
+
+ <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
+
<% else %>
-
- <%= l(:label_commit_homework)%>
+
+ 提交作业
<% end %>
<% else %>
@@ -59,7 +76,7 @@
<% end %>
<% end %>
<% if (User.current.admin?||User.current.id==bid.author_id) %>
- |
@@ -117,7 +117,7 @@
<%= l(:label_new_activity) %>
- <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+ <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
|
<% end %>
<% else %>
From 91cb6e29d5336587ffaa92cce315df23ab35bc9b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 19 Nov 2014 10:34:36 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E6=98=AF=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?=
=?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=8A=9F=E8=83=BD=E4=BB=A5=E5=8F=8A=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=95=88=E6=9E=9C=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3js=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/bids_controller.rb | 2 +
app/controllers/courses_controller.rb | 1 +
app/views/bids/_homework_form.html.erb | 4 ++
app/views/bids/edit.html.erb | 61 ++++++++++++++-----
app/views/courses/_homework_form.html.erb | 4 ++
app/views/courses/new_homework.html.erb | 50 ++++++++++-----
config/locales/zh.yml | 1 +
...119011439_add_open_anonymous_evaluation.rb | 9 +++
db/schema.rb | 15 ++---
9 files changed, 110 insertions(+), 37 deletions(-)
create mode 100644 db/migrate/20141119011439_add_open_anonymous_evaluation.rb
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 145a73178..c8ce6ec31 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -807,6 +807,7 @@ class BidsController < ApplicationController
@bid.is_evaluation = params[:bid][:is_evaluation]
@bid.proportion = params[:bid][:proportion]
@bid.evaluation_num = params[:bid][:evaluation_num]
+ @bid.open_anonymous_evaluation = params[:bid][:open_anonymous_evaluation]
@bid.reward_type = 3
# @bid.budget = params[:bid][:budget]
@bid.deadline = params[:bid][:deadline]
@@ -863,6 +864,7 @@ class BidsController < ApplicationController
@bid.is_evaluation = params[:bid][:is_evaluation]
@bid.proportion = params[:bid][:proportion]
@bid.evaluation_num = params[:bid][:evaluation_num]
+ @bid.open_anonymous_evaluation = params[:bid][:open_anonymous_evaluation]
@bid.reward_type = 3
@bid.deadline = params[:bid][:deadline]
@bid.budget = 0
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 5381e8757..edfc893d8 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -511,6 +511,7 @@ class CoursesController < ApplicationController
def new_homework
@homework = Bid.new
@homework.safe_attributes = params[:bid]
+ @homework.open_anonymous_evaluation = 1
if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
render :layout => 'base_courses'
else
diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index 448e4144a..cd682deb0 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -44,6 +44,10 @@
<%= f.select :proportion, proportion_option %>
+ <%= f.check_box :open_anonymous_evaluation, :style => "margin-left:10px;" %>
+ 未开启匿评作业将直接进入众评点赞阶段
+
+
<%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%>
匿评分配数量不宜太大，否则会影响开启匿评速度
diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb
index 322b8cdc3..0a2d17e7d 100644
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@@ -43,35 +43,66 @@
{
var evaluation_num = $.trim($("#bid_evaluation_num").val());
var regex = /^\d+$/;
- if(evaluation_num=="")
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
{
- $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
- }
- else if(regex.test(evaluation_num))
- {
- if(evaluation_num > 0)
+ if(evaluation_num=="")
{
- $("#bid_evaluation_num_span").text("填写正确");
- $("#bid_evaluation_num_span").css('color','#008000');
- return true;
+ $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
+ else if(regex.test(evaluation_num))
+ {
+ if(evaluation_num > 0)
+ {
+ $("#bid_evaluation_num_span").text("填写正确");
+ $("#bid_evaluation_num_span").css('color','#008000');
+ return true;
+ }
+ else
+ {
+ $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
$("#bid_evaluation_num_span").css('color','#ff0000');
return false;
}
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
+ return true;
}
}
+ $(function(){
+ $("#bid_open_anonymous_evaluation").click(function(){
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
+ {
+ $("#evaluation_num_p").slideDown();
+ }
+ else
+ {
+ $("#evaluation_num_p").slideUp();
+ }
+ });
+ });
+
+ $(function(){
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
+ {
+ $("#evaluation_num_p").show();
+ }
+ else
+ {
+ $("#evaluation_num_p").hide();
+ }
+ });
+
function submitHomework(id)
{
if(regexDeadLine()&®exName()&®exEvaluationNum())
diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index 9d5ad1155..8ce6be3fe 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -49,6 +49,10 @@
<%= f.select :proportion, proportion_option %>
+ <%= f.check_box :open_anonymous_evaluation, :style => "margin-left:10px;" %>
+ 未开启匿评作业将直接进入众评点赞阶段
+
+
<%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%>
匿评分配数量不宜太大，否则会影响开启匿评速度
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb
index 753aa20c8..7b6784243 100644
--- a/app/views/courses/new_homework.html.erb
+++ b/app/views/courses/new_homework.html.erb
@@ -43,35 +43,55 @@
{
var evaluation_num = $.trim($("#bid_evaluation_num").val());
var regex = /^\d+$/;
- if(evaluation_num=="")
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
{
- $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
- }
- else if(regex.test(evaluation_num))
- {
- if(evaluation_num > 0)
+ if(evaluation_num=="")
+ {
+ $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
+ else if(regex.test(evaluation_num))
{
- $("#bid_evaluation_num_span").text("填写正确");
- $("#bid_evaluation_num_span").css('color','#008000');
- return true;
+ if(evaluation_num > 0)
+ {
+ $("#bid_evaluation_num_span").text("填写正确");
+ $("#bid_evaluation_num_span").css('color','#008000');
+ return true;
+ }
+ else
+ {
+ $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").css('color','#ff0000');
+ return false;
+ }
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
+ $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
$("#bid_evaluation_num_span").css('color','#ff0000');
return false;
}
}
else
{
- $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
- $("#bid_evaluation_num_span").css('color','#ff0000');
- return false;
+ return true;
}
}
+ $(function(){
+ $("#bid_open_anonymous_evaluation").click(function(){
+ if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
+ {
+ $("#evaluation_num_p").slideDown();
+ }
+ else
+ {
+ $("#evaluation_num_p").slideUp();
+ }
+ });
+ });
+
function submitHomework()
{
if(regexDeadLine()&®exName()&®exEvaluationNum())
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a3807dca3..591c1144b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2198,3 +2198,4 @@ zh:
label_submit_comments: 提交评论
field_evaluation_num: 匿评分配数量
label_my_score: 我的评分
+ field_open_anonymous_evaluation: 是否开启匿评
diff --git a/db/migrate/20141119011439_add_open_anonymous_evaluation.rb b/db/migrate/20141119011439_add_open_anonymous_evaluation.rb
new file mode 100644
index 000000000..cea7143c4
--- /dev/null
+++ b/db/migrate/20141119011439_add_open_anonymous_evaluation.rb
@@ -0,0 +1,9 @@
+class AddOpenAnonymousEvaluation < ActiveRecord::Migration
+ def up
+ add_column :bids, :open_anonymous_evaluation, :integer, default: 1
+ end
+
+ def down
+ remove_column :bids, :open_anonymous_evaluation
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f6fc138af..2e664eaa7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20141105012624) do
+ActiveRecord::Schema.define(:version => 20141119011439) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -95,21 +95,22 @@ ActiveRecord::Schema.define(:version => 20141105012624) do
create_table "bids", :force => true do |t|
t.string "name"
- t.string "budget", :null => false
+ t.string "budget", :null => false
t.integer "author_id"
t.date "deadline"
t.text "description"
- t.datetime "created_on", :null => false
- t.datetime "updated_on", :null => false
+ t.datetime "created_on", :null => false
+ t.datetime "updated_on", :null => false
t.integer "commit"
t.integer "reward_type"
t.integer "homework_type"
t.integer "parent_id"
t.string "password"
t.integer "is_evaluation"
- t.integer "proportion", :default => 60
- t.integer "comment_status", :default => 0
- t.integer "evaluation_num", :default => 3
+ t.integer "proportion", :default => 60
+ t.integer "comment_status", :default => 0
+ t.integer "evaluation_num", :default => 3
+ t.integer "open_anonymous_evaluation", :default => 1
end
create_table "boards", :force => true do |t|
From ff185852ebb1ebb800e4abca789a991fabf83606 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 19 Nov 2014 10:53:22 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E5=8C=BF?=
=?UTF-8?q?=E8=AF=84=E6=97=B6=E8=80=81=E5=B8=88=E7=95=8C=E9=9D=A2=E5=8F=96?=
=?UTF-8?q?=E6=B6=88=E5=BC=80=E5=90=AF/=E5=85=B3=E9=97=AD=E5=8C=BF?=
=?UTF-8?q?=E8=AF=84=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_bid_homework_show.html.erb | 4 +++-
app/views/layouts/base_homework.html.erb | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index cc8159821..971b2e3eb 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -76,7 +76,8 @@
<% end %>
<% end %>
<% if (User.current.admin?||User.current.id==bid.author_id) %>
-
From 43f9d82f5e268a263c57acec2f503e476b886ce7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 20 Nov 2014 09:30:04 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E8=80=81=E5=B8=88=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=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
---
app/views/welcome/_course_list.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index b4fa75b0b..8d0d6c40d 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -13,7 +13,7 @@
- <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
+ <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
<%#=course.try(:teacher).try(:name)%>
From 0e409445ccc7e539f5a5c4d094f568c2cd90c7ae Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 20 Nov 2014 10:54:03 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/issues_controller.rb | 4 +++-
app/views/my/blocks/_assiagn_issue.html.erb | 12 +++++++-----
app/views/my/blocks/_issuesreportedbyme.html.erb | 2 +-
app/views/my/blocks/_issueswatched.html.erb | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 97c0ce4f6..d83942605 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -60,7 +60,9 @@ class IssuesController < ApplicationController
sort_update(@query.sortable_columns)
@query.sort_criteria = sort_criteria.to_a
- @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
+ if @issue
+ @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
+ end
if @query.valid?
case params[:format]
diff --git a/app/views/my/blocks/_assiagn_issue.html.erb b/app/views/my/blocks/_assiagn_issue.html.erb
index 6e7df84fd..1cd940eb9 100644
--- a/app/views/my/blocks/_assiagn_issue.html.erb
+++ b/app/views/my/blocks/_assiagn_issue.html.erb
@@ -11,11 +11,13 @@
-->
-<%= link_to l(:label_issue_view_all), :controller => 'issues',
- :action => 'index',
- :set_filter => 1,
- :assigned_to_id => 'me',
- :sort => 'priority:desc,updated_on:desc' %>
+
+ <%#= link_to l(:label_issue_view_all), :controller => 'issues',
+ :action => 'index',
+ :set_filter => 1,
+ :assigned_to_id => 'me',
+ :sort => 'priority:desc,updated_on:desc' %>
+
<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb
index 06bbda7f8..de5e20229 100644
--- a/app/views/my/blocks/_issuesreportedbyme.html.erb
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb
@@ -3,7 +3,7 @@
<% reported_issues = issuesreportedbyme_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
<% if reported_issues.length > 0 %>
-<%= link_to l(:label_issue_view_all), :controller => 'issues',
+
<%#= link_to l(:label_issue_view_all), :controller => 'issues',
:action => 'index',
:set_filter => 1,
:status_id => '*',
diff --git a/app/views/my/blocks/_issueswatched.html.erb b/app/views/my/blocks/_issueswatched.html.erb
index 510920a08..906a47b12 100644
--- a/app/views/my/blocks/_issueswatched.html.erb
+++ b/app/views/my/blocks/_issueswatched.html.erb
@@ -3,7 +3,7 @@
<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
<% if watched_issues.length > 0 %>
-
<%= link_to l(:label_issue_view_all), :controller => 'issues',
+
<%#= link_to l(:label_issue_view_all), :controller => 'issues',
:action => 'index',
:set_filter => 1,
:watcher_id => 'me',
From eb15db64ee27018b2b1c3f0310f6a04245fc6c34 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 20 Nov 2014 11:16:58 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=BD=93=E7=BC=BA=E9=99=B7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=BC=BA=E9=99=B7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=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
---
app/controllers/issues_controller.rb | 6 ++----
app/views/layouts/base_projects.html.erb | 2 +-
public/stylesheets/application.css | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index d83942605..9e9a34d55 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -59,10 +59,8 @@ class IssuesController < ApplicationController
sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
sort_update(@query.sortable_columns)
@query.sort_criteria = sort_criteria.to_a
-
- if @issue
- @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
- end
+
+ @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
if @query.valid?
case params[:format]
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index f656f5263..a8c3174f5 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -133,7 +133,7 @@
- <%= render_main_menu(@project) %>
+ <%= render_main_menu(@project) %>
<%= render_flash_messages %>
<%= yield %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b0d427018..0260cd8a9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2179,7 +2179,7 @@ button.tab-right {
padding-bottom: 2px;
text-align: center;
border: 1px solid #15BCCF;
- /*border-bottom: 0px solid #15BCCF;*/
+ border-bottom: 0px solid #15BCCF;
color:#606060;
font-weight:bold;
From 0b5ee5dc4b433ad5d98391b0c763c767853b277e Mon Sep 17 00:00:00 2001
From: zhuhao
Date: Thu, 20 Nov 2014 11:38:39 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88=E5=8F=91=E5=B8=83=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=A1=B5=EF=BC=8C=E6=96=B0=E5=BB=BA=E7=BC=BA?=
=?UTF-8?q?=E9=99=B7=E9=A1=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/new.html.erb | 6 +++---
app/views/tags/_tag.html.erb | 5 +++--
public/stylesheets/application.css | 28 +++++++++++++++++++++++++---
public/stylesheets/nyan.css | 19 ++++++++++---------
4 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 4b0140b1c..efa3adc2e 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -41,9 +41,9 @@
<% end %>
- <%= submit_tag l(:button_create) %>
- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
- <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
+ <%= submit_tag l(:button_create), :class => "ButtonAddTags"%>
+ <%= submit_tag l(:button_create_and_continue), :class => 'ButtonAddTags' %>
+ <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "ButtonColor"}%>
<%= javascript_tag "$('#issue_subject').focus();" %>
<% end %>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 4d3414a1f..63592d91a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -76,8 +76,9 @@
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
- <%= f.submit l(:button_project_tags_add),:class => "small" %>
- <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+ <%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
+ <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%>
+
<% end %>
<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ad947dcde..c3a72d627 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1277,7 +1277,7 @@ input#openid_url { background: url(../images/openid-bg.gif) no-repeat; backgroun
.clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
/***** Links *****/
-a, a:link, a:visited{ color: #169; text-decoration: none; }
+a, a:link, a:visited{ color: #169 ; text-decoration: none; }
a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
a img{ border: 0; }
@@ -1580,13 +1580,15 @@ form {display: inline;}
/*added by bai*/
input[type="submit"].bid_btn {
padding-bottom: 5px;
- width: 55px;
+ width: 50px;
height: 25px;
+ text-align: center;
font-family: '微软雅黑', Arial, Helvetica, sans-serif;
font-size: 12px;
color: #fff;
- padding: 0px;
+ padding: 8px;
background: #15bccf;
+ text-align: center;
border-radius: 4px;
border: 1px solid #15bccf;
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
@@ -1594,6 +1596,25 @@ input[type="submit"].bid_btn {
cursor: pointer;
}
+input[type="submit"].ButtonAddTags {
+ color: #fffbff ;
+ padding-bottom: 5px;
+ width:auto ;
+ height: 25px ;
+ font-family: '微软雅黑',Arial,Helvetica,sans-serif ;
+ font-size: 15px ;
+ font-weight: normal;
+ text-align: center ;
+ margin:0 auto;
+ border-radius: 0px !important;
+ background: #15bccf;
+ border: 0px solid #15bccf !important;
+ position: relative;
+ top:3px;
+
+
+}
+
input[type="button"].bid_btn {
/*padding-bottom: 5px;*/
width: 55px;
@@ -1603,6 +1624,7 @@ input[type="button"].bid_btn {
color: #fff;
padding: 0px;
background: #15bccf;
+ text-align: center;
border-radius: 4px;
border: 1px solid #15bccf;
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 27e8a367e..00b322c2d 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -475,19 +475,21 @@ body {
top: 1px;
}
input[class~='ButtonClolr'],.ButtonColor{
+
color: #fffbff !important;
padding-bottom: 5px;
- width: 40px;
- height: 20px;
+ width: auto;
+ height: 24px ;
font-family: '微软雅黑',Arial,Helvetica,sans-serif;
font-size: 15px;
-
+ text-align: center;
padding: 0px;
- background: #15bccf;
- border: 1px solid #15bccf;
-
+ background: #15bccf !important;
+ border: 0px solid #15bccf ;
+ display:inline-block
}
+
input[class~='whiteButton'], .whiteButton {
-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
-webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
@@ -541,7 +543,6 @@ input[class~='m3p10'], .m3p10 {
padding: 3px 10px;
height: 20px;
display: inline-block;
- text-align: center;
color: #ffffff;
}
@@ -648,14 +649,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
}
.tools a:visited {
- color: #116699;
+ color: #fffbff;
text-decoration: none;
padding: 3px 5px 0px 5px;
width: 100px;
}
.tools a:hover {
- color: white;
+ color: #fffbff;
padding: 3px 3px 0px 20px;
width: 88px;
text-decoration: none;
From aef1cb31fa3471f2f36ecb2d49f4e26e96a0accc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 20 Nov 2014 15:55:43 +0800
Subject: [PATCH 19/20] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E5=B8=96=E5=AD=90?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=85=E5=8F=AF=E4=BF=AE=E6=94=B9=E3=80=81?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B8=96=E5=AD=90=202.=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?=
=?UTF-8?q?=E6=97=B6=E4=B8=BB=E9=A2=98=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6?=
=?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/forum.rb | 2 +-
app/models/memo.rb | 4 ++--
app/views/forums/_form.html.erb | 6 +++--
app/views/forums/index.html.erb | 24 ++++++++++++++------
app/views/forums/show.html.erb | 21 +++++++++++++-----
app/views/memos/edit.html.erb | 39 ++++++++++++++++++++++-----------
6 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/app/models/forum.rb b/app/models/forum.rb
index e0592723e..61ba528a0 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -30,7 +30,7 @@ class Forum < ActiveRecord::Base
def destroyable_by? user
# user && user.logged? && Forum.find(self.forum_id).creator_id == user.id || user.admin?
- user.admin?
+ self.creator == user || user.admin?
end
# Updates topic_count, memo_count and last_memo_id attributes for +board_id+
diff --git a/app/models/memo.rb b/app/models/memo.rb
index b02564834..847795b4f 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -88,11 +88,11 @@ class Memo < ActiveRecord::Base
def editable_by? user
# user && user.logged? || (self.author == usr && usr.allowed_to?(:edit_own_messages, project))
- user.admin?
+ (user && self.author == user) || user.admin?
end
def destroyable_by? user
- (user && user.logged? && (Forum.find(self.forum_id).creator_id == user.id) ) || user.admin?
+ (user && self.author == user) || user.admin?
#self.author == user || user.admin?
end
diff --git a/app/views/forums/_form.html.erb b/app/views/forums/_form.html.erb
index 9b3519b05..ac9c298ff 100644
--- a/app/views/forums/_form.html.erb
+++ b/app/views/forums/_form.html.erb
@@ -15,7 +15,7 @@
<% end %>
- <%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share' %>
+ <%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%>
<% if User.current.logged? && User.current.admin? %>
@@ -36,7 +36,9 @@
-
(<%= l(:label_forums_max_length) %>)
+
+ (<%= l(:label_forums_max_length) %>)
+
<%= submit_tag l(:button_submit) %>
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 31d00891e..18ac7f752 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -7,12 +7,15 @@
| 公共贴吧 |
- <%= l(:label_user_location) %> : |
+
+
+ <%= l(:label_user_location) %> :
+
+ |
- <% if User.current.logged? %>
- <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
- <% end %>
-
+ <% if User.current.logged? %>
+ <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
+ <% end %>
|
@@ -24,8 +27,15 @@
|
- | <%= link_to request.host()+"/forums", forums_path %> |
- <%= link_to l(:field_homepage), home_path %> > <%= link_to "公共贴吧", forums_path %> |
+
+
+ <%= link_to request.host()+"/forums", forums_path %>
+
+ |
+
+ <%= link_to l(:field_homepage), home_path %> >
+ <%= link_to "公共贴吧", forums_path %>
+ |
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 642cf5b15..85fa8093a 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,16 +1,25 @@
-
<%=l(:label_memo_new)%>
+
+ <%=l(:label_memo_new)%>
+
<% if User.current.logged? %>
<%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f| %>
-
<%= f.text_field :subject, :required => true%>
-
<%= f.text_area :content, :required => true, :id => 'editor02' %>
+
+ <%= f.text_field :subject, :required => true, :maxlength => 50%>
+
+
+ <%= f.text_area :content, :required => true, :id => 'editor02' %>
+
-
(<%= l(:label_memos_max_length) %>)
+
+ (<%= l(:label_memos_max_length) %>)
+
- <%= l(:label_attachment_plural) %>
- <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+ <%= l(:label_attachment_plural) %>
+
+ <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
<%= f.submit :value => l(:label_memo_create) %>
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index ded3a1b12..09e4262fe 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -4,30 +4,43 @@
<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f| %>
<% if @memo.errors.any? %>
-
<%= pluralize(@memo.errors.count, "error") %> prohibited this memo from being saved:
+
+ <%= pluralize(@memo.errors.count, "error") %>
+ prohibited this memo from being saved:
+
<% @memo.errors.full_messages.each do |msg| %>
- - <%= msg %>
+ -
+ <%= msg %>
+
<% end %>
<% end %>
-
<%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying%>
- <% unless @replying %>
- <% if @memo.safe_attribute? 'sticky' %>
- <%= f.check_box :sticky %> <%= label_tag 'memo_sticky', l(:label_board_sticky) %>
- <% end %>
- <% if @memo.safe_attribute? 'lock' %>
- <%= f.check_box :lock %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
- <% end %>
- <% end %>
+ <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying, :maxlength => 50%>
+
+ <% if User.current.admin?%>
+
+ <% unless @replying %>
+ <% if @memo.safe_attribute? 'sticky' %>
+ <%= f.check_box :sticky %>
+ <%= label_tag 'memo_sticky', l(:label_board_sticky) %>
+ <% end %>
+ <% if @memo.safe_attribute? 'lock' %>
+ <%= f.check_box :lock %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+ <%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>
-
<%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>
- <%= l(:label_attachment_plural) %>
+ <%= l(:label_attachment_plural) %>
+
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
From 4ae74b560823b797360d8148da4abb05fe8bece7 Mon Sep 17 00:00:00 2001
From: zhuhao
Date: Thu, 20 Nov 2014 16:19:39 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/application.css | 2 +-
public/stylesheets/nyan.css | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cccc042ce..be26a7fed 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1598,7 +1598,7 @@ input[type="submit"].bid_btn {
input[type="submit"].ButtonAddTags {
color: #fffbff ;
- padding-bottom: 5px;
+ padding-bottom:5px ;
width:auto ;
height: 25px ;
font-family: '微软雅黑',Arial,Helvetica,sans-serif ;
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 00b322c2d..cc5898e0d 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -477,7 +477,7 @@ body {
input[class~='ButtonClolr'],.ButtonColor{
color: #fffbff !important;
- padding-bottom: 5px;
+ padding: 5px;
width: auto;
height: 24px ;
font-family: '微软雅黑',Arial,Helvetica,sans-serif;