From d3f441d4da3d605f3f7f18eb262eb7411b8fa5e9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 28 Aug 2015 09:34:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=8B=96=E5=8A=A8=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._resource_share_for_project_popup.html.erb | 5 +- .../users/_resource_share_popup.html.erb | 51 ++++++++++--------- app/views/users/_upload_resource.html.erb | 7 +-- app/views/users/search_user_course.js.erb | 19 ++++--- app/views/users/search_user_project.js.erb | 19 ++++--- app/views/users/user_resource.html.erb | 38 +++++++------- public/stylesheets/new_user.css | 6 +-- 7 files changed, 82 insertions(+), 63 deletions(-) diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb index 01a2375c1..4d377154e 100644 --- a/app/views/users/_resource_share_for_project_popup.html.erb +++ b/app/views/users/_resource_share_for_project_popup.html.erb @@ -1,6 +1,6 @@ -
+
将资源发送至
@@ -9,8 +9,9 @@
+
-
+
<%= form_tag search_user_project_user_path(user),:method => 'get', :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %> diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb index 7f1c5a005..376d674cd 100644 --- a/app/views/users/_resource_share_popup.html.erb +++ b/app/views/users/_resource_share_popup.html.erb @@ -1,6 +1,6 @@ -
+
将资源发送至
@@ -9,8 +9,9 @@
+
-
+
<%= form_tag search_user_course_user_path(user),:method => 'get', :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %> @@ -22,30 +23,30 @@ <% end %>
<%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %> -
+
- <%= hidden_field_tag(:send_id, send_id) %> - <%= hidden_field_tag(:send_ids, send_ids) %> -
- <% if !courses.empty? %> - <% courses.each do |course| %> -
    -
  • - -
    • -
  • <%= truncate(course.name,:length=>18)%>
    • -
- <% end %> + <%= hidden_field_tag(:send_id, send_id) %> + <%= hidden_field_tag(:send_ids, send_ids) %> +
+ <% if !courses.empty? %> + <% courses.each do |course| %> +
    +
  • + +
    • +
  • <%= truncate(course.name,:length=>18)%>
    • +
+ <% end %> +
-
-
-
- - <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %> -
-
取消
-
-
- <% end %> +
+
+ + <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %> +
+
取消
+
+
+ <% end %>
diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb index 50807b080..d73b2986a 100644 --- a/app/views/users/_upload_resource.html.erb +++ b/app/views/users/_upload_resource.html.erb @@ -1,5 +1,6 @@ -
上传资源 -
+ + 上传资源 +
<%= form_tag(user_resource_create_user_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
@@ -50,4 +51,4 @@
<% end %>
-
\ No newline at end of file + \ No newline at end of file diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb index 91002244a..19ee9de8c 100644 --- a/app/views/users/search_user_course.js.erb +++ b/app/views/users/search_user_course.js.erb @@ -3,9 +3,16 @@ //var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 //var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 //var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 -var popupHeight = $(".resourceSharePopup").outerHeight(true); -$(".resourceSharePopup").css("marginTop",-popupHeight/2); - -$("#upload_box").css('left','').css('top',''); -$("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); -$("#upload_box").css('display','block'); \ No newline at end of file +//var popupHeight = $(".resourceSharePopup").outerHeight(true); +//$(".resourceSharePopup").css("marginTop",-popupHeight/2); +// +//$("#upload_box").css('left','').css('top',''); +//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +//$("#upload_box").css('display','block'); +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +showModal('ajax-modal', '452px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","40%").css("left","46%"); +$('#ajax-modal').parent().addClass("resourceUploadPopup"); +$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); \ No newline at end of file diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb index ee224970f..86ea48e1b 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -3,9 +3,16 @@ //var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 //var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 //var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 -var popupHeight = $(".resourceSharePopup").outerHeight(true); -$(".resourceSharePopup").css("marginTop",-popupHeight/2); - -$("#upload_box").css('left','').css('top',''); -$("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); -$("#upload_box").css('display','block'); \ No newline at end of file +//var popupHeight = $(".resourceSharePopup").outerHeight(true); +//$(".resourceSharePopup").css("marginTop",-popupHeight/2); +// +//$("#upload_box").css('left','').css('top',''); +//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +//$("#upload_box").css('display','block'); +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +showModal('ajax-modal', '452px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","40%").css("left","46%"); +$('#ajax-modal').parent().addClass("resourceUploadPopup"); +$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); \ No newline at end of file diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 35baf4a77..79c002683 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -17,27 +17,29 @@ } function show_upload(){ - var screenWidth = $(window).width(); - var screenHeight = $(window).height(); //当前浏览器窗口的 宽高 - var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 - var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 - var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 - var popupHeight = $(".resourceUploadPopup").outerHeight(true); - $(".resourceUploadPopup").css("marginTop",-popupHeight/2); - - $("#upload_box").css('left',objLeft).css('top',objTop); - $("#upload_box").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>'); - $("#upload_box").css('display','block'); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>'); + showModal('ajax-modal', '452px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","40%").css("left","46%"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); } function closeModal() { - $("#upload_box").css("display","none"); + hideModal($(".uploadBoxContainer")); } - function check_files(){ - return $("#attachments_fields").children().length == 0; - } +// function closeModalShareResouceToCourse(){ +// hideModal($(".uploadBoxContainer")); +// } +// function closeModalShareResouceToProject(){ +// hideModal($(".uploadBoxContainer")); +// } +// function check_files(){ +// return $("#attachments_fields").children().length == 0; +// } function submit_files(){ $("#upload_form").submit(); @@ -109,9 +111,9 @@
- + + +