diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 9ab1d3c50..0cc1cffc9 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -93,7 +93,7 @@ $object_vars = get_object_vars($args); if(count($object_vars)) { foreach($object_vars as $key => $val) { - if(in_array($key, array('body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue; + if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue; $args->{$key} = utf8RawUrlDecode($val); } } @@ -102,12 +102,16 @@ /** * 위젯이 widgetContent/ widgetBox가 아니라면 내용을 구함 **/ + $widget_content = ''; if($widget != 'widgetContent' && $widget != 'widgetBox') { if(!is_dir(sprintf('./widgets/%s/',$widget))) return; // 위젯의 내용을 담을 변수 $widget_content = WidgetHandler::getCache($widget, $args); } + if($widget == 'widgetBox'){ + $widgetbox_content = $args->widgetbox_content; + } /** * 관리자가 지정한 위젯의 style을 구함 @@ -155,6 +159,8 @@ // 위젯 박스일 경우 case 'widgetBox' : $widget_content_header = sprintf('
', $args->id, $style, $inner_style); + $widget_content_body = $widgetbox_content; + break; // 일반 위젯일 경우 @@ -212,12 +218,23 @@ // 위젯 박스일 경우 case 'widgetBox' : + // args 정리 + $attribute = array(); + if($args) { + foreach($args as $key => $val) { + if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue; + if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val); + $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val)); + } + } + $widget_content_header = sprintf( - '
'. + '
'. '
'. '
'. - '
',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,$inner_style); + '
',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style); + $widget_content_body = $widgetbox_content; break; @@ -228,6 +245,7 @@ if($args) { foreach($args as $key => $val) { if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget'))) continue; + if(strlen($val)==0) continue; if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val); $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val)); } @@ -251,11 +269,11 @@ // 위젯 스타일을 컴파일 한다. if($args->widgetstyle){ - $widget_content_body = WidgetHandler::complieWidgetStyle($args->widgetstyle, $widget_content_body, $args); + $widget_content_body = WidgetHandler::complieWidgetStyle($args->widgetstyle, $widget_content_body, $args, $include_info); } $output = $widget_content_header . $widget_content_body . $widget_content_footer; - +//if($widget=='widgetBox')debugPrint($output); // 위젯 결과물 생성 시간을 debug 정보에 추가 if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start; // 결과 return @@ -293,7 +311,7 @@ } - function complieWidgetStyle($widgetStyle,$widget_content_body, $args){ + function complieWidgetStyle($widgetStyle,$widget_content_body, $args, $include_info){ if(!$widgetStyle) return $widget_content_body; $oWidgetModel = &getModel('widget'); @@ -309,7 +327,12 @@ } } Context::set('widgetstyle_extar_var', $widgetstyle_extar_var); - Context::set('widget_content', $widget_content_body); + + if($include_info){ + Context::set('widget_content', '
'.$widget_content_body.'
'); + }else{ + Context::set('widget_content', $widget_content_body); + } // 컴파일 $widgetstyle_path = $oWidgetModel->getWidgetStylePath($widgetStyle); diff --git a/modules/board/skins/xe_board/view_document.html b/modules/board/skins/xe_board/view_document.html index 8795d9c77..5b2b81885 100644 --- a/modules/board/skins/xe_board/view_document.html +++ b/modules/board/skins/xe_board/view_document.html @@ -63,6 +63,7 @@
+ diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index aafd34b5a..bab9fe4f5 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -48,6 +48,7 @@
+
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index 0d0e23fca..815d2e772 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -95,6 +95,7 @@ function getWidgetContent(obj) { break; } }); + return html; } @@ -148,6 +149,31 @@ function getContentWidgetCode(childObj, widget) { // 위젯 박스 코드 구함 function getWidgetBoxCode(childObj, widget) { + + var attrs = ""; + for(var i=0;i0){ + o = jQuery('.widget_inner',childObj); + }else{ + o = jQuery('.nullWidget',childObj); + } + + var body = getWidgetContent(o.get(0)); + return '
'+body+'
'; + +/* var cobj = childObj.firstChild; while(cobj) { if(cobj.className == "widgetBorder" || cobj.className == "widgetBoxBorder") { @@ -155,15 +181,19 @@ function getWidgetBoxCode(childObj, widget) { while(c2obj) { if(c2obj.className == "nullWidget") { var body = getWidgetContent(c2obj); - return '
'+body+'
'; + return '
'+body+'
'; } c2obj = c2obj.nextSibling; } } cobj = cobj.nextSibling; } +*/ } + + + // 일반 위젯 컨텐츠 코드 구함 function getWidgetCode(childObj, widget) { var attrs = ""; @@ -174,7 +204,7 @@ function getWidgetCode(childObj, widget) { var name = childObj.attributes[i].nodeName.toLowerCase(); if(name == "contenteditable" || name == "id" || name=="style" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue; var value = childObj.attributes[i].nodeValue; - if(!value || value == "Array") continue; + if(!value || value == "Array" || value == "null") continue; attrs += name+'="'+escape(value)+'" '; } @@ -398,7 +428,7 @@ function doAddWidgetCode(widget_code) { tmp = widget_code.toLowerCase(); } - checkDocumentWrite = false; + // html 추가 var dummy = xCreateElement('div'); @@ -406,12 +436,21 @@ function doAddWidgetCode(widget_code) { var obj = dummy.childNodes[0]; if(selectedWidget && selectedWidget.getAttribute("widget")) { + var o = jQuery('div.widget_inner',selectedWidget); + var n = jQuery('div.widget_inner',obj); + + if(n.size()==0) n = jQuery('div.nullWidget',obj); + if(o.size()==0) o = jQuery('div.nullWidget',selectedWidget); + + n.html(o.html()); + + selectedWidget.parentNode.insertBefore(obj, selectedWidget); selectedWidget.parentNode.removeChild(selectedWidget); } else { xGetElementById('zonePageContent').appendChild(obj); } - + checkDocumentWrite = false; selectedWidget = null; /* @@ -1086,12 +1125,16 @@ function widgetDrag(tobj, dx, dy) { widgetList = null; // 만약 다른 위젯과 자리를 바꾸지 못하였는데 자기 부모창밖에 있는게 확인이 되면 박스 밖으로 내보낸다. - var l = xPageX(tobj.parentNode); - var t = xPageY(tobj.parentNode); - var ll = parseInt(l,10) + parseInt(xWidth(tobj.parentNode),10); - var tt = parseInt(t,10) + parseInt(xHeight(tobj.parentNode),10); + var p_tobj = jQuery(tobj).parents('div.nullWidget').get(0); + var l = xPageX(p_tobj); + var t = xPageY(p_tobj); + var ll = parseInt(l,10) + parseInt(xWidth(p_tobj),10); + var tt = parseInt(t,10) + parseInt(xHeight(p_tobj),10); if( (tobj.xDPX < l || tobj.xDPX > ll) || (tobj.xDPY < t || tobj.xDPY > tt) ) { - zonePageObj.insertBefore(tobj, tobj.parentNode.parentNode.parentNode); + +// zonePageObj.insertBefore(tobj, tobj.parentNode.parentNode.parentNode); + zonePageObj.insertBefore(tobj, jQuery(tobj).parents('div.widgetOutput[widget=widgetBox]').get(0)); + doFitBorderSize(); return; } @@ -1100,6 +1143,7 @@ function widgetDrag(tobj, dx, dy) { } else { // 이동하려는 위젯이 박스 위젯이 아니라면 박스 위젯들을 구해서 입력 유무를 검사한다 if(tobj.getAttribute("widget")!="widgetBox") { + var boxList = xGetElementsByClassName("nullWidget", zonePageObj); for(var i=0;i= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt) { if(target_obj.className == "nullWidget") { - target_obj.appendChild(tobj); + var wb_ws = jQuery('div.widget_inner',jQuery(target_obj)); + + if(wb_ws.size() == 0){ + target_obj.appendChild(tobj); + }else if(wb_ws.size() > 0){ + wb_ws.get(0).appendChild(tobj); + } // 이동을 멈춤 widgetManualEnd(); diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 0bd4c6328..f6ac1076f 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -153,11 +153,17 @@ // 편집 정보 포함 여부 체크 $this->include_info = $include_info; - // 내용중 위젯을 또다시 구함 (기존 버전에서 페이지 수정해 놓은것과의 호환을 위해서) - $content = preg_replace_callback('!]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content); // 박스 위젯을 다시 구함 - $content = preg_replace_callback('!]*)widget=([^\>]*?)\>
!is', array($this,'transWidgetBox'), $content); +// $content = preg_replace_callback('!]*)widget=([^\>]*?)\>
!is', array($this,'transWidgetBox'), $content); + + // 박스 위젯을 다시 구함 + + $content = preg_replace_callback('!]*)widget=([^\>]*?)\>
(()*)!is', array($this,'transWidgetBox'), $content); + + + // 내용중 위젯을 또다시 구함 (기존 버전에서 페이지 수정해 놓은것과의 호환을 위해서) + $content = preg_replace_callback('!]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content); return $content; } @@ -179,7 +185,6 @@ // 위젯의 이름을 구함 $widget = $vars->widget; unset($vars->widget); - return WidgetHandler::execute($widget, $vars, $this->include_info); } @@ -187,8 +192,7 @@ * @brief 위젯 박스를 실제 php코드로 변경 **/ function transWidgetBox($matches) { - $buff = preg_replace('/
$/i','
',$matches[0]); - + $buff = preg_replace('/
(.*)$/i','
',$matches[0]); $oXmlParser = new XmlParser(); $xml_doc = $oXmlParser->parse($buff); @@ -198,6 +202,7 @@ // 위젯의 이름을 구함 if(!$widget) return $matches[0]; + $vars->widgetbox_content = $matches[3]; return WidgetHandler::execute($widget, $vars, $this->include_info); } diff --git a/widgetstyles/colorbox/css/widgetBoxStyle.css b/widgetstyles/colorbox/css/widgetBoxStyle.css index 698e4f628..59d2f051b 100644 --- a/widgetstyles/colorbox/css/widgetBoxStyle.css +++ b/widgetstyles/colorbox/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/line/css/widgetBoxStyle.css b/widgetstyles/line/css/widgetBoxStyle.css index 8b93ac9d3..b1b5d6a4e 100644 --- a/widgetstyles/line/css/widgetBoxStyle.css +++ b/widgetstyles/line/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/memo/css/widgetBoxStyle.css b/widgetstyles/memo/css/widgetBoxStyle.css index f1fe80c15..7b1a6a540 100644 --- a/widgetstyles/memo/css/widgetBoxStyle.css +++ b/widgetstyles/memo/css/widgetBoxStyle.css @@ -3,7 +3,9 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} + +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/postitWire/css/widgetBoxStyle.css b/widgetstyles/postitWire/css/widgetBoxStyle.css index 79dc82c50..e09b16b07 100644 --- a/widgetstyles/postitWire/css/widgetBoxStyle.css +++ b/widgetstyles/postitWire/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/roundFace/css/widgetBoxStyle.css b/widgetstyles/roundFace/css/widgetBoxStyle.css index 4aeea1f08..c32be07f8 100644 --- a/widgetstyles/roundFace/css/widgetBoxStyle.css +++ b/widgetstyles/roundFace/css/widgetBoxStyle.css @@ -3,12 +3,13 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} .widgetBox .widgetMore img{ border:0;} -.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1;} +.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1; float:left; clear:both; } .widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;} .widgetBox .rcTop .tl{ top:0;} .widgetBox .rcTop .tr{ top:0;} @@ -23,7 +24,7 @@ .widgetBoxEred .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEred.gif) no-repeat; color:#ff3333;} .widgetBoxEred .rcTop, .widgetBoxEred .rcBottom{ height:3px;} -.widgetBoxEred .rcTop{ position:absolute; top:-3px;} +.widgetBoxEred .rcTop{ position:absolute; top:-3px; left:0; } .widgetBoxEred .rcBottom{ position:relative; bottom:-3px;} .widgetBoxEred .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEred.gif); background-repeat:no-repeat;} .widgetBoxEred .rcTop .tl{ background-position:0 0;} @@ -39,7 +40,7 @@ .widgetBoxEgreen .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEgreen.gif) no-repeat; color:#90d133;} .widgetBoxEgreen .rcTop, .widgetBoxEgreen .rcBottom{ height:3px;} -.widgetBoxEgreen .rcTop{ position:absolute; top:-3px;} +.widgetBoxEgreen .rcTop{ position:absolute; top:-3px; left:0; } .widgetBoxEgreen .rcBottom{ position:relative; bottom:-3px;} .widgetBoxEgreen .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEgreen.gif); background-repeat:no-repeat;} .widgetBoxEgreen .rcTop .tl{ background-position:0 0;} @@ -55,7 +56,7 @@ .widgetBoxEblue .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEblue.gif) no-repeat; color:#55ccdd;} .widgetBoxEblue .rcTop, .widgetBoxEblue .rcBottom{ height:3px;} -.widgetBoxEblue .rcTop{ position:absolute; top:-3px;} +.widgetBoxEblue .rcTop{ position:absolute; top:-3px; left:0;} .widgetBoxEblue .rcBottom{ position:relative; bottom:-3px;} .widgetBoxEblue .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEblue.gif); background-repeat:no-repeat;} .widgetBoxEblue .rcTop .tl{ background-position:0 0;} diff --git a/widgetstyles/roundWire/css/widgetBoxStyle.css b/widgetstyles/roundWire/css/widgetBoxStyle.css index 91a2828c5..f7cbe13bf 100644 --- a/widgetstyles/roundWire/css/widgetBoxStyle.css +++ b/widgetstyles/roundWire/css/widgetBoxStyle.css @@ -3,12 +3,13 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} .widgetBox .widgetMore img{ border:0;} -.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1;} +.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1; float:left; clear:both; } .widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;} .widgetBox .rcTop .tl{ top:0;} .widgetBox .rcTop .tr{ top:0;} @@ -21,7 +22,7 @@ .widgetBoxDred .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDred.gif) no-repeat; color:#fff !important;} .widgetBoxDred .rcTop, .widgetBoxDred .rcBottom{ height:8px;} -.widgetBoxDred .rcTop{ position:absolute; top:-8px;} +.widgetBoxDred .rcTop{ position:absolute; top:-8px; left:0;} .widgetBoxDred .rcBottom{ position:relative; bottom:-8px;} .widgetBoxDred .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDred.png); _background-image:url(../img/roundedCornerDred.gif); background-repeat:no-repeat;} .widgetBoxDred .rcTop .tl{ background-position:0 0; left:-5px;} @@ -35,7 +36,7 @@ .widgetBoxDgreen .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDgreen.gif) no-repeat; color:#fff !important;} .widgetBoxDgreen .rcTop, .widgetBoxDgreen .rcBottom{ height:8px;} -.widgetBoxDgreen .rcTop{ position:absolute; top:-8px;} +.widgetBoxDgreen .rcTop{ position:absolute; top:-8px; left:0;} .widgetBoxDgreen .rcBottom{ position:relative; bottom:-8px;} .widgetBoxDgreen .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDgreen.png); _background-image:url(../img/roundedCornerDgreen.gif); background-repeat:no-repeat;} .widgetBoxDgreen .rcTop .tl{ background-position:0 0; left:-5px;} @@ -49,7 +50,7 @@ .widgetBoxDblue .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDblue.gif) no-repeat; color:#fff !important;} .widgetBoxDblue .rcTop, .widgetBoxDblue .rcBottom{ height:8px;} -.widgetBoxDblue .rcTop{ position:absolute; top:-8px;} +.widgetBoxDblue .rcTop{ position:absolute; top:-8px; left:0;} .widgetBoxDblue .rcBottom{ position:relative; bottom:-8px;} .widgetBoxDblue .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDblue.png); _background-image:url(../img/roundedCornerDblue.gif); background-repeat:no-repeat;} .widgetBoxDblue .rcTop .tl{ background-position:0 0; left:-5px;} diff --git a/widgetstyles/simpleRound/css/widgetBoxStyle.css b/widgetstyles/simpleRound/css/widgetBoxStyle.css index 11d11527e..c7acf3d8b 100644 --- a/widgetstyles/simpleRound/css/widgetBoxStyle.css +++ b/widgetstyles/simpleRound/css/widgetBoxStyle.css @@ -3,12 +3,13 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} .widgetBox .widgetMore img{ border:0;} -.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1;} +.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1; *zoom:1; float:left; clear:both; } .widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;} .widgetBox .rcTop .tl{ top:0;} .widgetBox .rcTop .tr{ top:0;} @@ -21,7 +22,7 @@ .widgetBoxC .widgetMore{ top:5px; right:15px;} .widgetBoxC .rcTop, .widgetBoxC .rcBottom{ height:3px;} -.widgetBoxC .rcTop{ position:absolute; top:-3px;} +.widgetBoxC .rcTop{ position:absolute; top:-3px; left:0; } .widgetBoxC .rcBottom{ position:relative; bottom:-3px;} .widgetBoxC .rc { width:50%; height:3px; background-image:url(../img/roundedCornerC.gif); background-repeat:no-repeat;} .widgetBoxC .rcTop .tl{ background-position:0 0; left:0px;} diff --git a/widgetstyles/simpleSquare/css/widgetBoxStyle.css b/widgetstyles/simpleSquare/css/widgetBoxStyle.css index 9220c0893..96227dd61 100644 --- a/widgetstyles/simpleSquare/css/widgetBoxStyle.css +++ b/widgetstyles/simpleSquare/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/simpleTitle/css/widgetBoxStyle.css b/widgetstyles/simpleTitle/css/widgetBoxStyle.css index 9aa329466..8d02428f8 100644 --- a/widgetstyles/simpleTitle/css/widgetBoxStyle.css +++ b/widgetstyles/simpleTitle/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;} diff --git a/widgetstyles/squareWire/css/widgetBoxStyle.css b/widgetstyles/squareWire/css/widgetBoxStyle.css index 0ba421c23..0065b64b7 100644 --- a/widgetstyles/squareWire/css/widgetBoxStyle.css +++ b/widgetstyles/squareWire/css/widgetBoxStyle.css @@ -3,7 +3,8 @@ .widgetBoxContainer{ position:relative;} -.widgetBox{ position:relative; *zoom:1;} +.widgetBox{ position:relative; *zoom:1; } +.widgetBox:after{content:""; display:block; clear:both; } .widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;} .widgetBox .widgetContainer{ position:relative; z-index:10;} .widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;}