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 4d377154e..e5d1732e4 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 @@ -
+
将资源发送至
@@ -44,7 +44,7 @@ <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-
取消
+
取消
<% end %> diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb index 376d674cd..2fc515b4a 100644 --- a/app/views/users/_resource_share_popup.html.erb +++ b/app/views/users/_resource_share_popup.html.erb @@ -1,6 +1,6 @@ -
+
将资源发送至
@@ -44,7 +44,7 @@ <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-
取消
+
取消
<% end %> diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb index 93c572fa0..637570bfb 100644 --- a/app/views/users/add_exist_file_to_course.js.erb +++ b/app/views/users/add_exist_file_to_course.js.erb @@ -1,5 +1,5 @@ <% if @flag == true%> alert('发送成功') -closeModal(); +closePopUp(); <% else%> <% end %> \ No newline at end of file diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb index 93c572fa0..637570bfb 100644 --- a/app/views/users/add_exist_file_to_project.js.erb +++ b/app/views/users/add_exist_file_to_project.js.erb @@ -1,5 +1,5 @@ <% if @flag == true%> alert('发送成功') -closeModal(); +closePopUp(); <% else%> <% end %> \ 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 97bde13aa..60ddd6d9c 100644 --- a/app/views/users/search_user_course.js.erb +++ b/app/views/users/search_user_course.js.erb @@ -12,7 +12,7 @@ $("#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').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("popbox").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 37999120a..26a0f265c 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -8,7 +8,7 @@ $("#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').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox") $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c69062b91..901917220 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -30,6 +30,9 @@ { hideModal($(".uploadBoxContainer")); } + function closePopUp(){ + hideModal($(".boxContainer")); + } function check_files(){ return $("#attachments_fields").children().length == 0; diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb index 551c08907..3ebb308b4 100644 --- a/app/views/users/user_resource.js.erb +++ b/app/views/users/user_resource.js.erb @@ -1,3 +1,4 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>'); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); +$("#res_count").html(0); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index c5a5f2f0c..9cd4c31a9 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -342,10 +342,10 @@ a.uploadText {color:#ffffff; font-size:14px;} /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/ /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/ /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/ -.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;} +.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;} .resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;} .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;} -.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;} +.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;} .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;} /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left} @@ -405,13 +405,14 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep /*.resourcesUploadBox:hover {background-color:#0781b4;}*/ /* 个人主页右边部分*/ .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;} +input.homepageSearchIcon:hover {cursor: pointer;} a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;} a.replyGrey {color:#888888; display:inline-block;} a.replyGrey:hover {color:#4b4b4b;} /*上传资源弹窗*/ -.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} +.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} .uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative} .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} @@ -430,6 +431,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} +.boxContainer {height:33px; line-height:33px; position:relative} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;} .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}