From 3de873547955a877b674d48756195d07e3721b29 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 14 Nov 2007 03:58:00 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2973
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/widget/WidgetHandler.class.php             |  2 +-
 modules/page/tpl/js/page_admin.js                  | 14 ++++++++++----
 .../skins/blog_newest_comment/css/cyan.css         | 11 +++++------
 .../skins/blog_newest_comment/css/green.css        | 11 +++++------
 .../skins/blog_newest_comment/css/normal.css       | 11 +++++------
 .../skins/blog_newest_comment/css/purple.css       | 11 +++++------
 .../skins/blog_newest_comment/css/red.css          | 11 +++++------
 .../skins/blog_newest_comment/list.html            |  4 ++--
 8 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 335e17c07..ddc0e2e3a 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -93,7 +93,7 @@
              **/
             // 서비스에 사용하기 위해 위젯 정보를 포함하지 않을 경우
             if(!$include_info) {
-                $output = sprintf('<div style="%s;"><div style="%s">%s</div></div>', $args->style, $inner_style, $html);
+                $output = sprintf('<div style="overflow:hidden;%s;"><div style="%s">%s</div></div>', $args->style, $inner_style, $html);
 
                 // 위젯 sequence가 있고 위젯의 캐싱을 지정하였고 위젯정보를 담지 않도록 하였을 경우 캐시 파일을 저장
                 if($args->widget_sequence && $args->widget_cache) WidgetHandler::writeCache($args->widget_sequence, $output);
diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js
index 3ba7e7afe..31a69e3be 100644
--- a/modules/page/tpl/js/page_admin.js
+++ b/modules/page/tpl/js/page_admin.js
@@ -329,6 +329,12 @@ function doCheckWidgetDrag(e) {
     }
 }
 
+function _getInt(val) {
+    if(!val || val == "null") return 0;
+    if(parseInt(val,10)==NaN) return 0;
+    return parseInt(val,10);
+}
+
 // 위젯 크기 조절 레이어를 보여줌
 var selectedSizeWidget = null;
 function doShowWidgetSizeSetup(px, py, obj) {
@@ -343,10 +349,10 @@ function doShowWidgetSizeSetup(px, py, obj) {
 
     formObj.width.value = obj.style.width;
     formObj.height.value = obj.style.height;
-    formObj.margin_left.value = selectedSizeWidget.getAttribute('widget_margin_left');
-    formObj.margin_right.value = selectedSizeWidget.getAttribute('widget_margin_right');
-    formObj.margin_top.value = selectedSizeWidget.getAttribute('widget_margin_top');
-    formObj.margin_bottom.value = selectedSizeWidget.getAttribute('widget_margin_bottom');
+    formObj.margin_left.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_left'));
+    formObj.margin_right.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_right'));
+    formObj.margin_top.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_top'));
+    formObj.margin_bottom.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_bottom'));
 
     var widget_align = '';
     if(xIE4Up) widget_align = selectedSizeWidget.style.styleFloat;
diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css b/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css
index 1e07cf60a..19477d431 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css
+++ b/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css
@@ -1,6 +1,5 @@
-.newestComment { position:relative; border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
-.newestComment h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
-/*:first-child+html .boxTypeB h2 { height:20px;} */
-.newestComment .commentList { padding:1.2em; overflow:hidden;}
-.newestComment .commentList li { display:block; color:#a4a4a4; margin-right:.1em; white-space:nowrap; overflow:hidden;  list-style:none;}
-.newestComment .commentList li a { color:#a4a4a4; line-height:1.5em; text-decoration:none;}
+.newestComment_cyan { border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
+.newestComment_cyan h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
+.newestComment_cyan .commentList { padding:1.2em; overflow:hidden;}
+.newestComment_cyan .commentList li { display:block; color:#a4a4a4; white-space:nowrap; overflow:hidden;  list-style:none; width:100%;}
+.newestComment_cyan .commentList li a { color:#a4a4a4; line-height:1.5em; text-decoration:none;}
diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/green.css b/widgets/newest_comment/skins/blog_newest_comment/css/green.css
index cda9ed07b..20827ce99 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/css/green.css
+++ b/widgets/newest_comment/skins/blog_newest_comment/css/green.css
@@ -1,6 +1,5 @@
-.newestComment { position:relative; border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
-.newestComment h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
-/*:first-child+html .boxTypeB h2 { height:20px;} */
-.newestComment .commentList { padding:1.2em; overflow:hidden;}
-.newestComment .commentList li { display:block; color:#a4a4a4; margin-right:.1em; white-space:nowrap; overflow:hidden;  list-style:none;}
-.newestComment .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
+.newestComment_green { border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
+.newestComment_green h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
+.newestComment_green .commentList { padding:1.2em; overflow:hidden;}
+.newestComment_green .commentList li { display:block; color:#a4a4a4; white-space:nowrap; overflow:hidden;  list-style:none; width:100%;}
+.newestComment_green .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/normal.css b/widgets/newest_comment/skins/blog_newest_comment/css/normal.css
index 5f41f6140..d016f844f 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/css/normal.css
+++ b/widgets/newest_comment/skins/blog_newest_comment/css/normal.css
@@ -1,6 +1,5 @@
-.newestComment { position:relative; border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
-.newestComment h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
-/*:first-child+html .boxTypeB h2 { height:20px;} */
-.newestComment .commentList { padding:1.2em; overflow:hidden;}
-.newestComment .commentList li { display:block; color:#a4a4a4; margin-right:.1em; white-space:nowrap; overflow:hidden;  list-style:none;}
-.newestComment .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
+.newestComment_normal { border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
+.newestComment_normal h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
+.newestComment_normal ul.commentList { padding:1.2em; overflow:hidden;}
+.newestComment_normal ul.commentList li { display:block; color:#a4a4a4; white-space:nowrap; overflow:hidden;  list-style:none; width:100%;}
+.newestComment_normal ul.commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/purple.css b/widgets/newest_comment/skins/blog_newest_comment/css/purple.css
index 453c6e5dc..7116f3f46 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/css/purple.css
+++ b/widgets/newest_comment/skins/blog_newest_comment/css/purple.css
@@ -1,6 +1,5 @@
-.newestComment { position:relative; border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
-.newestComment h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
-/*:first-child+html .boxTypeB h2 { height:20px;} */
-.newestComment .commentList { padding:1.2em; overflow:hidden;}
-.newestComment .commentList li { display:block; color:#a4a4a4; margin-right:.1em; white-space:nowrap; overflow:hidden; list-style:none; }
-.newestComment .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
+.newestComment_purple { border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
+.newestComment_purple h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
+.newestComment_purple .commentList { padding:1.2em; overflow:hidden;}
+.newestComment_purple .commentList li { display:block; color:#a4a4a4; white-space:nowrap; overflow:hidden; list-style:none; width:100%;}
+.newestComment_purple .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/red.css b/widgets/newest_comment/skins/blog_newest_comment/css/red.css
index 114ae9571..93dd61b09 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/css/red.css
+++ b/widgets/newest_comment/skins/blog_newest_comment/css/red.css
@@ -1,6 +1,5 @@
-.newestComment { position:relative; border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
-.newestComment h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
-/*:first-child+html .boxTypeB h2 { height:20px;} */
-.newestComment .commentList { padding:1.2em; overflow:hidden;}
-.newestComment .commentList li { display:block; color:#a4a4a4; margin-right:.1em; white-space:nowrap; overflow:hidden; list-style:none; }
-.newestComment .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
+.newestComment_red { border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; }
+.newestComment_red h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;}
+.newestComment_red .commentList { padding:1.2em; overflow:hidden;}
+.newestComment_red .commentList li { display:block; color:#a4a4a4; white-space:nowrap; overflow:hidden; list-style:none; width:100%;}
+.newestComment_red .commentList li a { color:#a4a4a4; line-height:1.5em;  text-decoration:none;}
diff --git a/widgets/newest_comment/skins/blog_newest_comment/list.html b/widgets/newest_comment/skins/blog_newest_comment/list.html
index 2d5028a62..15f8e5894 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/list.html
+++ b/widgets/newest_comment/skins/blog_newest_comment/list.html
@@ -1,5 +1,4 @@
 <!-- 설정된 컬러셋의 종류에 따라서 css파일을 import 합니다 -->
-
 <!--@if($colorset=="cyan")-->
     <!--%import("css/cyan.css")-->
 <!--@elseif($colorset=="green")-->
@@ -10,9 +9,10 @@
     <!--%import("css/purple.css")-->
 <!--@else-->
     <!--%import("css/normal.css")-->
+    {@ $colorset = "normal" }
 <!--@end-->
 
-<div class="newestComment">
+<div class="newestComment_{$colorset}">
     <div class="header">
         <!--@if($widget_info->title)-->
             <h2>{$widget_info->title}</h2>