diff --git a/common/tpl/calendar.php b/common/tpl/calendar.php index b56bb6edb..b368ba51b 100644 --- a/common/tpl/calendar.php +++ b/common/tpl/calendar.php @@ -56,7 +56,7 @@ - + diff --git a/common/tpl/css/popup.css b/common/tpl/css/popup.css deleted file mode 100644 index 3663c8542..000000000 --- a/common/tpl/css/popup.css +++ /dev/null @@ -1,8 +0,0 @@ -@charset "utf-8"; - -body { - margin:0px; - padding:0px; - border-width:0px; - border-style:none; -} diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index f807806b8..dfee21be1 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -66,16 +66,16 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .buttonTypeA { display:block; cursor:pointer; background:url(../images/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;} .buttonTypeA:hover { text-decoration:none;} .buttonTypeA img { vertical-align:middle;} -.buttonTypeA input { border:none; cursor:pointer; background:url(../images/white/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:3px;} -.buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} +.buttonTypeA input { border:none; cursor:pointer; background:url(../images/white/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; } +.buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; left:-1px;} .buttonTypeA .rightCap { width:2px; height:24px; background:url(../images/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;} .buttonTypeA .icon { margin:0 .4em 0 .2em;} .buttonTypeB { display:block; cursor:pointer; background:url(../images/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; font-size:.9em; white-space:nowrap;} .buttonTypeB:hover { text-decoration:none;} .buttonTypeB img { vertical-align:middle;} -.buttonTypeB input { border:none; cursor:pointer; background:url(../images/white/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:4px;} -.buttonTypeB .leftCap { width:2px; height:21px; background:url(../images/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} +.buttonTypeB input { border:none; cursor:pointer; background:url(../images/white/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; } +.buttonTypeB .leftCap { width:2px; height:21px; background:url(../images/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0; left:-1px;} .buttonTypeB .rightCap { width:2px; height:21px; background:url(../images/buttonTypeBRight.gif) no-repeat; margin:0 -1px 0 .4em;} .buttonTypeB .icon { margin:0 .2em;} diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 0eb59608a..a0ecd614c 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -14,14 +14,14 @@ function doDeleteShortCut(selected_module) { // footer를 화면 크기에 맞춰 설정 xAddEventListener(window, 'load', fixAdminLayoutFooter); xAddEventListener(window, 'resize', fixAdminLayoutFooter); -function fixAdminLayoutFooter() { - var headerHeight = xHeight(xGetElementById('header')); - var bodyHeight = xHeight(xGetElementById('cBody')); - var footerHeight = xHeight(xGetElementById('footer')); +function fixAdminLayoutFooter(height) { + var headerHeight = xHeight('header'); + var bodyHeight = xHeight('cBody'); + var footerHeight = xHeight('footer'); var clientHeight = xClientHeight(); var newHeight = clientHeight - footerHeight - headerHeight + 71 + 38; - if(typeof(editor_height)!='undefined') newHeight += editor_height; if(newHeight - +//]]> diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index b532b629b..93e406cb3 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -106,6 +106,8 @@ function editorStart(upload_target_srl, resizable, height) { // 팝업 윈도우일 경우 드래그바 숨김 if(resizable == false) xGetElementById("editor_drag_bar_"+upload_target_srl).style.display = "none"; + + if(typeof(fixAdminLayoutFooter)=='function') fixAdminLayoutFooter(height); } // 여러개의 편집기를 예상하여 전역 배열 변수에 form, iframe의 정보를 넣음 @@ -556,7 +558,7 @@ function editorChangeHeader(obj,srl) { /** * iframe 세로 크기 조절 드래그 관련 **/ -var editorDragObj = {isDrag:false, y:0, obj:null, id:'', det:0} +var editorDragObj = {isDrag:false, y:0, obj:null, id:'', det:0, source_height:0} xAddEventListener(document, 'mousedown', editorDragStart); xAddEventListener(document, 'mouseup', editorDragStop); function editorDragStart(evt) { @@ -571,6 +573,8 @@ function editorDragStart(evt) { editorDragObj.y = e.pageY; editorDragObj.obj = e.target; editorDragObj.id = id.substr('editor_drag_bar_'.length); + var iframe_obj = editorGetIFrame(editorDragObj.id); + editorDragObj.source_height = xHeight(iframe_obj); xAddEventListener(document, 'mousemove', editorDragMove, false); xAddEventListener(editorDragObj.obj, 'mousemove', editorDragMove, false); @@ -596,6 +600,9 @@ function editorDragStop(evt) { xRemoveEventListener(document, 'mousemove', editorDragMove, false); xRemoveEventListener(editorDragObj.obj, 'mousemove', editorDragMove, false); + var iframe_obj = editorGetIFrame(editorDragObj.id); + if(typeof(fixAdminLayoutFooter)=='function') fixAdminLayoutFooter(xHeight(iframe_obj)-editorDragObj.source_height); + editorDragObj.isDrag = false; editorDragObj.y = 0; editorDragObj.obj = null; diff --git a/modules/page/tpl/css/page.css b/modules/page/tpl/css/page.css index 5a20745d1..0d72d3ecb 100644 --- a/modules/page/tpl/css/page.css +++ b/modules/page/tpl/css/page.css @@ -5,6 +5,6 @@ #pageManage .buttonTypeA { display:block; cursor:pointer; background:url(../images/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;} #pageManage .buttonTypeA:hover { text-decoration:none;} #pageManage .buttonTypeA img { vertical-align:middle;} -#pageManage .buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} +#pageManage .buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; left:-1px;} #pageManage .buttonTypeA .rightCap { width:2px; height:24px; background:url(../images/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;} #pageManage .buttonTypeA .icon { margin:0 .2em;} diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index fd09d8416..a3907d5f8 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -72,12 +72,12 @@ - {$editor} + {$editor}
- +