From 6194be893344bfa1e63e09ee0578d8c447a1e2c3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 28 Sep 2015 17:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E3=80=82js=E4=BF=AE=E6=94=B9=20=E5=9C=A8=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E5=86=85=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=E6=97=B6?=
=?UTF-8?q?=E6=97=A0=E8=AF=BE=E7=A8=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/base_courses.html.erb | 2 +-
app/views/users/_show_user_resource.html.erb | 2 +-
app/views/users/_user_homework_form.html.erb | 13 +-
app/views/users/user_import_resource.js.erb | 4 +-
public/javascripts/course.js | 5 +
public/javascripts/new_user.js | 5 +
public/stylesheets/new_user.css | 17 +--
public/stylesheets/public.css | 143 ++++++-------------
8 files changed, 62 insertions(+), 129 deletions(-)
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index fe0b5ef84..c226599e2 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,7 +17,7 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
- <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2','prettify', 'courses','header'%>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','public', 'leftside','prettify', 'courses','header'%>
<%= javascript_include_tag "course","header","attachments",'prettify' %>
<%= yield :header_tags -%>
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 24d81a787..929cea75b 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -60,7 +60,7 @@
<% end %>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index f4c4c64d4..fe320992a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -36,14 +36,11 @@
-
- <% unless defined?(select_course)%>
-
- <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
-
-
-
- <% end%>
+
+ <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
+
+
+
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index 32a2cd697..0e35acd95 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -3,6 +3,6 @@ showModal('ajax-modal', '730px');
$('#ajax-modal').css('height','500px').css("width","730px");
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("");
-$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+"