From a24d1493f92bd3a14da7b644d800e670d04f8dbd Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 12 Nov 2014 16:51:07 +0800 Subject: [PATCH 01/21] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=EF=BC=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=8A=A8=E6=80=81tab=E9=A1=B5=E4=B8=8D=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=202.=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A=EF=BC=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9Atab=E9=A1=B5=E4=B8=8D=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/controllers/homework_attach_controller.rb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- lib/redmine/menu_manager.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ee1ca0230..3981c5b6b 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -8,7 +8,7 @@ class CoursesController < ApplicationController menu_item :overview menu_item :feedback, :only => :feedback menu_item :homework, :only => :homework - menu_item :new_homework + menu_item :new_homework, :only => :new_homework menu_item l(:label_sort_by_time), :only => :index menu_item l(:label_sort_by_active), :only => :index diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 2cf2e7895..61760f462 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -106,7 +106,7 @@ class HomeworkAttachController < ApplicationController (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score FROM homework_attaches INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id - WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC") + WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY m_score DESC") @cur_page = params[:page] || 1 @cur_type = 4 @homework_list = paginateHelper all_homework_list,10 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 55c5615fb..1462b4bb6 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -272,7 +272,7 @@ <%= link_to l(:label_course_overview), course_path(@course), :class => link_class(:overview) %>
  • - <%= link_to l(:label_homework), homework_course_path(@course), :class => link_class(:homework), :course_type => 1 %> + <%= link_to l(:label_homework), homework_course_path(@course), :class => link_class([:homework,:new_homework]), :course_type => 1 %>
  • <%= link_to l(:label_course_file), course_files_path(@course), :class => link_class(:files) %> diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb index 0ea1ec79e..8286c1df0 100644 --- a/lib/redmine/menu_manager.rb +++ b/lib/redmine/menu_manager.rb @@ -54,7 +54,7 @@ module Redmine # Returns the menu item name according to the current action def current_menu_item @current_menu_item ||= menu_items[controller_name.to_sym][:actions][action_name.to_sym] || - menu_items[controller_name.to_sym][:default] + menu_items[controller_name.to_sym][:default] end # Redirects user to the menu item of the given project From 56cc2a7ad3cd8c6e3bd75381ea8016a9041def8c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 12 Nov 2014 17:07:27 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=81=E5=B8=88?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A=E6=97=B6=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9Atab=E6=B2=A1=E6=9C=89=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 1 + app/views/layouts/base_courses.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index a8a351eb1..145a73178 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -7,6 +7,7 @@ class BidsController < ApplicationController menu_item :project, :only => [:show_project,:show_results, :new_submit_homework] menu_item :homework_respond, :only => :homework_respond menu_item :homework_statistics, :only => :homework_statistics + menu_item :edit, :only => :edit before_filter :can_show_course,only: [] before_filter :can_show_contest,only: [] diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 1462b4bb6..eef30e55d 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -272,7 +272,7 @@ <%= link_to l(:label_course_overview), course_path(@course), :class => link_class(:overview) %>
  • - <%= link_to l(:label_homework), homework_course_path(@course), :class => link_class([:homework,:new_homework]), :course_type => 1 %> + <%= link_to l(:label_homework), homework_course_path(@course), :class => link_class([:homework,:new_homework,:edit]), :course_type => 1 %>
  • <%= link_to l(:label_course_file), course_files_path(@course), :class => link_class(:files) %> From 23f4d760e62581d7cd8d3192a19adf6e9f8221d8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 13 Nov 2014 09:16:01 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?= =?UTF-8?q?=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E7=AC=AC=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=BA=E5=AD=A6=E7=94=9F=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E5=A7=93=E5=90=8D=5F=E5=AD=A6=E7=94=9F=E5=AD=A6?= =?UTF-8?q?=E5=8F=B7=5F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/zipdown_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index efa171d52..bfd7812df 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -72,7 +72,7 @@ class ZipdownController < ApplicationController homeattach.attachments.each do |attach| homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1) end - zipping("#{Time.now.to_i.to_s}_#{homeattach.user.name}_#{homeattach.user.user_extensions.student_id}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) + zipping("#{homeattach.user.firstname}#{homeattach.user.lastname}_#{homeattach.user.user_extensions.student_id}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) end From fae3de8e0439802f5d9d8446e46d4d23d2f349fa Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 13 Nov 2014 09:24:40 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=90=8E=E5=A7=93=E5=92=8C=E5=90=8D=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/zipdown_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index bfd7812df..d7f9fa0ac 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -72,7 +72,7 @@ class ZipdownController < ApplicationController homeattach.attachments.each do |attach| homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1) end - zipping("#{homeattach.user.firstname}#{homeattach.user.lastname}_#{homeattach.user.user_extensions.student_id}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) + zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{homeattach.user.user_extensions.student_id}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) end From 61c8feac8f6f94ff88ac7652c53a58e4945834d9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 14 Nov 2014 15:04:35 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8E=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 14 +++++++++++++- .../layouts/_bootstrap_base_header.html.erb | 15 +++++++++++---- app/views/layouts/_user_courses_list.html.erb | 4 +--- app/views/layouts/_user_homework_list.html.erb | 12 ++++++++++++ .../stylesheets/application.css | 18 ++++++++++++++++++ 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 app/views/layouts/_user_homework_list.html.erb diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 9418e07cf..c263853a4 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -114,6 +114,18 @@ }); } + function homeworkSlipMenuOver(id) + { + $('.project_sub_menu').hide(); + $('#course_loggedas_li').show(); + $("#homework_loggedas_ul_" + id).show(); + } + + function homeworkSlipMenuOut(id) + { + $("#homework_loggedas_ul_" + id).hide(); + } + $(document).ready(function () { addSlipMenu(); addProjectSlipMenu (); @@ -121,7 +133,7 @@ }); jQuery(document).ready(function($) { - $('.sub_menu').find("a").attr('target', '_blank'); + $('.sub_menu').find("a").attr('target', '_blank'); $('.project_sub_menu').find("a").attr('target', '_blank'); $('.course_sub_menu').find("a").attr('target', '_blank'); }); diff --git a/app/views/layouts/_bootstrap_base_header.html.erb b/app/views/layouts/_bootstrap_base_header.html.erb index 8c2d26c54..a968ace94 100644 --- a/app/views/layouts/_bootstrap_base_header.html.erb +++ b/app/views/layouts/_bootstrap_base_header.html.erb @@ -67,11 +67,18 @@ end <%=User.current%>
    • <%= bootstrap_render_menu :account_menu -%> diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb index cb3871a9e..134774c12 100644 --- a/app/views/layouts/_user_courses_list.html.erb +++ b/app/views/layouts/_user_courses_list.html.erb @@ -4,9 +4,7 @@ diff --git a/app/views/layouts/_user_homework_list.html.erb b/app/views/layouts/_user_homework_list.html.erb new file mode 100644 index 000000000..18480555d --- /dev/null +++ b/app/views/layouts/_user_homework_list.html.erb @@ -0,0 +1,12 @@ +<% if course %> +
  • + <%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %> + +
    • +<% end %> \ No newline at end of file diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 58183ce3d..05d374a5b 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -2219,6 +2219,24 @@ ul.messages-for-user-reply li { margin: 0px; } +#homework_loggedas_li .homework_sub_menu { + box-shadow: 2px 2px 6px #b0b0b0 ; + display: none; + background: #13AEBF 0 0 no-repeat; + left: 115px; + padding-bottom: 5px; + position: absolute; + top: 0px; + font-size: 1.1em; + margin: 0px auto; + padding: 0px 0px; + text-align: left; + z-index: 1; +} +#homework_loggedas_li .homework_sub_menu a{ + margin: 0px; +} + #course_loggedas_li li { border-bottom: 1px solid #129DAD; color: white; From b1e58f3fd5950942c9c53b82b031e9a4bdcdaee6 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Fri, 14 Nov 2014 16:38:14 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course_ad.html.erb | 93 +++++++++++++++++++++++++++ app/views/courses/show.html.erb | 1 + 2 files changed, 94 insertions(+) create mode 100644 app/views/courses/_course_ad.html.erb diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb new file mode 100644 index 000000000..0db7cb4ec --- /dev/null +++ b/app/views/courses/_course_ad.html.erb @@ -0,0 +1,93 @@ + +
    + + + + + + + + + + +
    + 联系我们 +
    + QQ:1234566
    +
    + Email:1234566@qq.com
    +
    +
    + + \ No newline at end of file diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index ee7d995e7..ed83a3085 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,3 +1,4 @@ +<%= render 'course_ad' %> <% if @events_by_day != nil && @events_by_day.size >0 %>

    From ae195326012d1fb5a64cecacf88784d6e1376787 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 14 Nov 2014 17:35:07 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E7=9A=84=E6=B5=AE=E5=8A=A8=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course_ad.html.erb | 25 ++++++++++++++++++------- app/views/courses/show.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 1 + db/schema.rb | 19 ++++++++++++++----- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb index 0db7cb4ec..8df3c3c31 100644 --- a/app/views/courses/_course_ad.html.erb +++ b/app/views/courses/_course_ad.html.erb @@ -20,13 +20,13 @@

    - - - -<% end %> - From 63a141a75a5cbdaa623ea12d0bd302731069e25a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 17 Nov 2014 10:32:33 +0800 Subject: [PATCH 10/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E4=BE=A7=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BAjs=E3=80=81css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 22 +++++++++---------- app/views/layouts/_user_courses_list.html.erb | 4 +++- .../layouts/_user_homework_list.html.erb | 2 +- .../stylesheets/application.css | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index c263853a4..6f87d4171 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -74,13 +74,13 @@ \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d0d71c50d..b0d427018 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -12,7 +12,8 @@ h4 {border-bottom: 1px dotted #bbb;} .course_ad{ position:absolute; visibility:visible; - background:#ffffff + background:#ffffff; + width:14%; } .ad_title{ From 90f5cd2e609c23443573d7e2e77f6623a3d07101 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 18 Nov 2014 10:39:50 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=A9=E6=94=BEhtml?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=E6=82=AC=E6=B5=AE=E6=A1=86=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course_ad.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb index 8318bb5d1..f8b4781f8 100644 --- a/app/views/courses/_course_ad.html.erb +++ b/app/views/courses/_course_ad.html.erb @@ -49,6 +49,7 @@ } $("#floatpoint").css("top",YY); } - //$("#floatpoint").css("left",screen_width/2+body_width/2+5); - $(document).ready(function(){var body_width = $("#top-menu").width(); $("#floatpoint").css("left",screen_width/2+body_width/2+10);}); + function change_size(){var body_width = $("#top-menu").width(); $("#floatpoint").css("left",screen_width/2+body_width/2+10);} + $(document).ready(function(){change_size();}); + $(window).resize(function(){screen_width = $(window).width();change_size();}); \ No newline at end of file From e359b987e5f98561fa92eaf559f5d8d56c6f8860 Mon Sep 17 00:00:00 2001 From: moon Date: Tue, 18 Nov 2014 10:56:56 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=E2=80=9D=E6=9D=83=E9=99=90=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/homework.html.erb | 9 +++++---- config/locales/zh.yml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb index 95e26abd0..68ec0dc2e 100644 --- a/app/views/courses/homework.html.erb +++ b/app/views/courses/homework.html.erb @@ -5,11 +5,12 @@ <%= javascript_include_tag 'attachments' %> -
    - <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%> - <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %> - <% end %> + <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%> + <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %> + <% else %> + <%= l(:label_coursejoin_tip) %> + <% end %>
    <%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 0220a10e5..a3807dca3 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2134,6 +2134,7 @@ zh: label_notification: 通知公告 label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！ label_course_adcolick: 请点击： + label_coursejoin_tip: 提示：加入课程才有权限查看或提交作业，“加入”按钮见课程图标右侧！ #end #end From 126c7f558d9717647ed6bffe7b3bad4a07aed089 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Tue, 18 Nov 2014 17:03:40 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A4=84=E6=8E=A7=E4=BB=B6=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_course_news.html.erb | 4 ++-- public/stylesheets/application.css | 2 +- public/stylesheets/nyan.css | 24 ++++++++++++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb index f66def486..346fff8b4 100644 --- a/app/views/news/_course_news.html.erb +++ b/app/views/news/_course_news.html.erb @@ -74,10 +74,10 @@ <%= labelled_form_for @news, :url => course_news_index_path(@course), :html => {:id => 'news-form', :multipart => true} do |f| %> <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %> - <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %> + <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %> <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> - <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %> + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %> <% end if @course %>
    diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d0d71c50d..710a404dc 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1898,7 +1898,7 @@ input#time_entry_comments { width: 90%;} fieldset.settings label { display: block; } fieldset#notified_events .parent { padding-left: 20px; } -span.required {color: #bb0000;} +span.required {color: #bb0000;margin-right: 4px;} .summary {font-style: italic;} #attachments_fields input.description {margin-left:4px; width:100px; } diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index def79d53b..27e8a367e 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -15,7 +15,7 @@ span[id^=valid_user] { } .red { - color: red; + color: red;margin-left: 10px;margin-right: 10px;text-align: right; } .green { @@ -474,6 +474,19 @@ body { position: relative; top: 1px; } +input[class~='ButtonClolr'],.ButtonColor{ + color: #fffbff !important; + padding-bottom: 5px; + width: 40px; + height: 20px; + font-family: '微软雅黑',Arial,Helvetica,sans-serif; + font-size: 15px; + + padding: 0px; + background: #15bccf; + border: 1px solid #15bccf; + +} input[class~='whiteButton'], .whiteButton { -moz-box-shadow: inset 0px 1px 0px 0px #ffffff; @@ -493,9 +506,9 @@ input[class~='whiteButton'], .whiteButton { border: 1px solid #dcdcdc; display: inline-block; color: #666666; - color: #116699; + color: #fffbff; font-family: arial; - font-size: 15px; + font-size: 20px; font-weight: bold; padding: 6px 24px; /*padding:3px 10px;*/ @@ -513,13 +526,14 @@ input[class~='whiteButton']:hover, .whiteButton:hover { background: linear-gradient(to bottom, #f6f6f6 5%, #ffffff 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#f6f6f6', endColorstr = '#ffffff', GradientType = 0); text-decoration: none; - background-color: #f6f6f6; + background-color: #09bbff; } input[class~='whiteButton']:active, .whiteButton:active { position: relative; top: 1px; text-decoration: none; + color: #ffffff; } input[class~='m3p10'], .m3p10 { @@ -527,6 +541,8 @@ input[class~='m3p10'], .m3p10 { padding: 3px 10px; height: 20px; display: inline-block; + text-align: center; + color: #ffffff; } input[class~='h30'], .h30 {