From 09991b9cf7df77ff061eb2211898a8015872b92d Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 25 Mar 2015 14:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_file.html.erb | 13 +++++-------- app/views/files/_show_quote_resource.html.erb | 2 +- app/views/files/_upload_show.html.erb | 4 +--- app/views/files/quote_resource_show.js.erb | 3 ++- public/stylesheets/courses.css | 3 +++ 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index ac02342ed..ea499477a 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -9,8 +9,9 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","5").css("left","511"); + $('#ajax-modal').before("") + $('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().addClass("popbox_polls"); } function closeModal() @@ -47,8 +48,8 @@ <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %> <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> <% end %> - <% if is_course_teacher(User.current,@course) %> - 上传资源 + <% if is_course_teacher(User.current,@course) %> + 上传资源 <% end %>
@@ -56,10 +57,6 @@
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments} %>
-
- <%= render :partial => 'upload_show',:locals => {:course => @course}%> -
-
123
diff --git a/app/views/files/_show_quote_resource.html.erb b/app/views/files/_show_quote_resource.html.erb index eb1ed446e..02009e462 100644 --- a/app/views/files/_show_quote_resource.html.erb +++ b/app/views/files/_show_quote_resource.html.erb @@ -14,7 +14,7 @@ id: "relation_file_form" do %> <%= hidden_field_tag(:file_id, file.id) %> <%= content_tag('div', courses_check_box_tags('courses[course][]', User.current.courses,course,file), :id => 'courses')%> - 引  用取  消 + 引  用取  消 <% end -%> <% end %> diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index bc7fc9030..7db9b6b21 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -1,6 +1,4 @@ -
-

<%= l(:label_upload_files)%>

@@ -11,7 +9,7 @@ <%= render :partial => 'attachement_list',:locals => {:course => course} %>
- <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %>
diff --git a/app/views/files/quote_resource_show.js.erb b/app/views/files/quote_resource_show.js.erb index 1d82479c5..fa1f8f4ca 100644 --- a/app/views/files/quote_resource_show.js.erb +++ b/app/views/files/quote_resource_show.js.erb @@ -7,4 +7,5 @@ showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","5").css("left","511"); \ No newline at end of file +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("popbox_polls"); \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 253c6eee0..485d7e85c 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -340,6 +340,9 @@ a:hover.st_add{ color:#ff8e15;} { width: -moz-available; } +.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} +.upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto; margin-top:25px; padding-left:20px; padding-top:5px;} +.upload_box{ width:430px; margin:15px auto;}