diff --git a/main/img/close.png b/main/img/close.png new file mode 100644 index 0000000000..d247e09189 Binary files /dev/null and b/main/img/close.png differ diff --git a/main/inc/lib/javascript/thickbox.css b/main/inc/lib/javascript/thickbox.css index ca60737460..00b0c8c03f 100755 --- a/main/inc/lib/javascript/thickbox.css +++ b/main/inc/lib/javascript/thickbox.css @@ -31,47 +31,63 @@ } .TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} .TB_overlayBG { - background-color:#ccc; - filter:alpha(opacity=55); - -moz-opacity: 0.55; - opacity: 0.55; + background-color:#fff; + filter:alpha(opacity=45); + -moz-opacity: 0.45; + opacity: 0.45; } * html #TB_overlay { /* ie6 hack */ position: absolute; height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); } #TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#000000; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; + position: fixed; + z-index: 102; + color:#000000; + display:none; + text-align:left; + background-color: #34393A; + + box-shadow:0 0 90px 5px #000; + -moz-box-shadow:0 0 90px 5px #000; + -webkit-box-shadow: 0 0 90px #000; + + top:50%; + left:50%; + + -webkit-border-radius: 8px; + -opera-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + } * html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); + position: absolute; + margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); } #TB_window img#TB_Image { display:block; margin: 15px 0 0 15px; - border-right: 1px solid #ccc; + /* border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; border-top: 1px solid #666; - border-left: 1px solid #666; + border-left: 1px solid #666;*/ } #TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; + height:25px; + padding:7px 30px 10px 25px; + float:left; } #TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; + + + + height: 29px; + padding: 8px 10px 10px 0; + position: absolute; + right: -28px; + top: -28px; + } #TB_closeAjaxWindow{ padding:7px 10px 5px 0; @@ -88,12 +104,13 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d background-color:#e8e8e8; height:27px; } -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; +#TB_ajaxContent { + clear:both; + padding:2px 15px 15px 15px; + overflow:auto; + text-align:left; + line-height:1.4em; + background-color: #ccc; } #TB_ajaxContent.TB_modal{ padding:15px; diff --git a/main/inc/lib/javascript/thickbox.js b/main/inc/lib/javascript/thickbox.js index c7a850d28d..6599b990b5 100755 --- a/main/inc/lib/javascript/thickbox.js +++ b/main/inc/lib/javascript/thickbox.js @@ -12,6 +12,8 @@ var src=src[src.length-1].getAttribute('src'); var src=src.substr(0,src.length-30); var tb_pathToImage = src+"img/loadingAnimation.gif"; +var close_image = src+"img/close.png"; + /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ //on page load call tb_init @@ -39,8 +41,8 @@ function tb_init(domChunk){ }); } -function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link - +function tb_show(caption, url, imageGroup) { + //function called when the user clicks on a thickbox link try { if (typeof document.body.style.maxHeight === "undefined") {//if IE 6 $("body","html").css({height: "100%", width: "100%"}); @@ -136,7 +138,11 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic TB_WIDTH = imageWidth + 30; TB_HEIGHT = imageHeight + 60; - $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
X / Esc
"); + $("#TB_window").append("
"); + + $("#TB_window").append(""+caption+""); + $("#TB_window").append("
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
") + $("#TB_closeWindowButton").click(tb_remove); @@ -204,15 +210,15 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic urlNoQuery = url.split('TB_'); $("#TB_iframeContent").remove(); if(params['modal'] != "true"){//iframe no modal - $("#TB_window").append("
"+caption+"
X / Esc
"); + $("#TB_window").append("
"+caption+"
"); }else{//iframe modal $("#TB_overlay").unbind(); $("#TB_window").append(""); } - }else{// not an iframe, ajax + } else {// not an iframe, ajax if($("#TB_window").css("display") != "block"){ if(params['modal'] != "true"){//ajax no modal - $("#TB_window").append("
"+caption+"
X / Esc
"); + $("#TB_window").append("
"+caption+"
"); }else{//ajax modal $("#TB_overlay").unbind(); $("#TB_window").append("
");