Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

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("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>")
-        $('#ajax-modal').parent().css("top","5").css("left","511");
+        $('#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) %>  <!-- show_window('light','fade','20%','35%')-->
-          <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_window('light','fade','20%','35%');">上传资源</a>
+          <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>
       <% end %>
     </div><!---re_top end-->
     <div class="cl"></div>
@@ -56,10 +57,6 @@
     <div class="re_con" id="course_list">
       <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments}  %>
     </div><!---re_con end-->
-    <div id="light" class="white_content">
-      <%= render :partial => 'upload_show',:locals => {:course => @course}%>
-    </div>
-    <div id="fade" class="black_overlay">123</div>
 
   </div>
 </div>

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')%>
-              <a id="submit_quote" href="javascript:void(0)" class="upload_btn" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="upload_btn upload_btn_grey" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>

app/views/files/_upload_show.html.erb

@@ -1,6 +1,4 @@
 
-  <div ><a href="#" onClick="close_window('light','fade');" class="box_close"></a></div>
-  <div class="cl"></div>
   <div id="popbox_upload" class="box_h3 mb10">
   <div class="upload_con">
     <h2><%= l(:label_upload_files)%></h2>
@@ -11,7 +9,7 @@
           <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="close_window('light','fade');"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>

app/views/files/quote_resource_show.js.erb

@@ -7,4 +7,5 @@
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","5").css("left","511");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");

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;}