diff --git a/app/views/attachments/attachment_history_download.js.erb b/app/views/attachments/attachment_history_download.js.erb index 352a2ef93..a20cd8563 100644 --- a/app/views/attachments/attachment_history_download.js.erb +++ b/app/views/attachments/attachment_history_download.js.erb @@ -1,7 +1,10 @@ -$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/attachment_history_download' )%>'); -showModal('ajax-modal', '452px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","40%").css("left","50%"); -$('#ajax-modal').parent().addClass("resourceUploadPopup"); -$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); \ No newline at end of file +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/attachment_history_download' )%>'); +showModal('ajax-modal', '452px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","40%").css("left","50%"); +$('#ajax-modal').parent().addClass("resourceUploadPopup"); +$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); +//与更新版本弹窗js冲突新增样式代码 +$('#ajax-modal').parent().css({"border":"3px solid #269ac9", "padding":"4px"}); +$('#ajax-modal').css("padding","6.6px 13.2px 16px 16px"); \ No newline at end of file diff --git a/app/views/files/file_hidden.js.erb b/app/views/files/file_hidden.js.erb index b95ab5104..ab7333b86 100644 --- a/app/views/files/file_hidden.js.erb +++ b/app/views/files/file_hidden.js.erb @@ -1,6 +1,9 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>'); -showModal('ajax-modal', '311px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); -$('#ajax-modal').parent().addClass("popbox_polls"); \ No newline at end of file +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>'); +showModal('ajax-modal', '311px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); +$('#ajax-modal').parent().addClass("popbox_polls").removeClass("resourceUploadPopup popbox"); +//与更新版本弹窗js冲突新增样式代码 +$('#ajax-modal').parent().css({"border":"3px solid #269ac9", "padding":"4px"}); +$('#ajax-modal').css({"padding":"","min-height":""}); \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 711379b5f..964d0d23e 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -230,6 +230,9 @@ $('#ajax-modal').before(""); $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); $('#ajax-modal').parent().addClass("popbox_polls"); + //与更新版本弹窗js冲突新增样式代码 + $('#ajax-modal').parent().css({"border":"3px solid #269ac9", "padding":"4px"}); + $('#ajax-modal').css("padding",""); } // 鼠标经过的时候显示内容 function message_titile_show(obj,e) diff --git a/app/views/users/import_resources.js.erb b/app/views/users/import_resources.js.erb index b07f534e7..ead387767 100644 --- a/app/views/users/import_resources.js.erb +++ b/app/views/users/import_resources.js.erb @@ -15,4 +15,8 @@ $('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px s <% end %> $('#ajax-modal').parent().addClass("popbox_polls"); +//与更新版本弹窗js冲突新增样式代码 +$('#ajax-modal').parent().css({"border":"3px solid #269ac9", "padding":"4px"}); +$('#ajax-modal').css("padding",""); + diff --git a/public/javascripts/application.js b/public/javascripts/application.js index b0f11fc75..cb7ba4b63 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1550,6 +1550,7 @@ function pop_box_new(value, Width, Height){ showModal('ajax-modal', Width + 'px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"}); + $('#ajax-modal').parent().removeClass("resourceUploadPopup popbox_polls popbox"); $('#ajax-modal').css({"padding":"0","overflow":"hidden"}); $('#ajax-modal').parent().attr("id","popupWrap"); diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css index 20d08e508..a7354f645 100644 --- a/public/stylesheets/css/popup.css +++ b/public/stylesheets/css/popup.css @@ -41,7 +41,6 @@ input.sendSourceText:hover {background-color:#297fb8;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden;} -.popbox{/* 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; */} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed; top:50%; left:50%; margin-left:-200px; z-index:1000;} @@ -74,7 +73,7 @@ div.disable_link {background-color: #c1c1c1 !important;} .homeworkListForm{height: 160px;width: 550px;overflow: scroll;overflow-x: hidden;} /*引用资源库弹窗*/ -.popbox{position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px; -moz-border-radius:5px;} +.popbox{position:fixed !important; left:50%; top:50% ;margin:-100px 0 0 -150px; -moz-border-radius:5px;} .referenceResourcesPopup {width:750px !important; height:500px !important; border:3px solid #269ac9 !important; padding:0 16px 16px 16px !important; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;} .referenceText {font-size:16px; color:#269ac9; line-height:16px; display:inline-block; font-weight:bold;} .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;} @@ -163,7 +162,6 @@ a:hover.CloseBtn{background:url(/images/CloseBtn.png) 0px -24px no-repeat; } .popClose {background:url(/images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:2px; top:3px;} /****评分弹框****/ -/*#popbox{width:488px;height:550px;position:absolute;z-index:100;left:50%;top:40%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }*/ .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(/images/close.png) no-repeat;cursor:pointer;} .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px; } .ping_con{ margin:5px; border-bottom:1px dashed #CCC; padding-bottom:5px;}