diff --git a/common/js/common.js b/common/js/common.js index 5b4402645..6400feaff 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -175,16 +175,24 @@ function resizeImageContents() { parent = parent.parentNode; } if(parent.nodeName != "TD" && parent.nodeName != "DIV") continue; + var parent_width = xWidth(parent); var obj_width = xWidth(obj); - if(parent_width>=obj_width) continue; + var orig_img = new Image(); + orig_img.src = obj.src; + + if(parent_width >= obj_width && orig_img.width == obj_width) continue; obj.style.cursor = "pointer"; - obj.source_width = obj_width; - obj.source_height = xHeight(obj); - xWidth(obj, xWidth(parent)-1); - var per = parent_width/obj_width; - xHeight(obj, xHeight(obj)*per); + + obj.source_width = orig_img.width; + obj.source_height = orig_img.height; + + if(obj_width >= parent_width) { + var per = parent_width/obj_width; + xWidth(obj, xWidth(parent)-1); + xHeight(obj, xHeight(obj)*per); + } xAddEventListener(obj,"click", showOriginalImage); } diff --git a/modules/blog/skins/xe_blog/css/white.css b/modules/blog/skins/xe_blog/css/white.css index e40c73924..72f7eb744 100644 --- a/modules/blog/skins/xe_blog/css/white.css +++ b/modules/blog/skins/xe_blog/css/white.css @@ -132,6 +132,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;} .boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; } +.boardRead .contentBody { width:100%; overflow:hidden; } .boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both;} .boardRead .readBody p { margin:1em 0; line-height:1.5em;} .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; } diff --git a/modules/blog/skins/xe_blog/view_document.html b/modules/blog/skins/xe_blog/view_document.html index 619dd853c..24d3caf02 100644 --- a/modules/blog/skins/xe_blog/view_document.html +++ b/modules/blog/skins/xe_blog/view_document.html @@ -35,7 +35,7 @@ -
{$oDocument->getContent()}
+
{$oDocument->getContent()}
{@ $tag_list = $oDocument->get('tag_list') } diff --git a/modules/board/skins/xe_gallery/css/white.css b/modules/board/skins/xe_gallery/css/white.css index 7d1dd9172..83e37efee 100644 --- a/modules/board/skins/xe_gallery/css/white.css +++ b/modules/board/skins/xe_gallery/css/white.css @@ -152,6 +152,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;} .boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; } +.boardRead .contentBody { width:100%; overflow:hidden; } .boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both;} .boardRead .readBody p { margin:1em 0; line-height:1.5em;} .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; } diff --git a/modules/board/skins/xe_gallery/view_document.html b/modules/board/skins/xe_gallery/view_document.html index f6c5dfd97..8eb7fddbe 100644 --- a/modules/board/skins/xe_gallery/view_document.html +++ b/modules/board/skins/xe_gallery/view_document.html @@ -49,7 +49,7 @@
-
{$oDocument->getContent()}
+
{$oDocument->getContent()}
{@ $tag_list = $oDocument->get('tag_list') } diff --git a/modules/board/skins/xe_list/css/white.css b/modules/board/skins/xe_list/css/white.css index 0fba0f677..211cac887 100644 --- a/modules/board/skins/xe_list/css/white.css +++ b/modules/board/skins/xe_list/css/white.css @@ -152,7 +152,8 @@ Jeong, Chan Myeong 070601~070630 .boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;} .boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; } -.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both;} +.boardRead .contentBody { width:100%; overflow:hidden; } +.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; } .boardRead .readBody p { margin:1em 0; line-height:1.5em;} .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; } .boardRead .readBody .alignRight { float:right; margin:0 0 1em 1em; } diff --git a/modules/board/skins/xe_list/view_document.html b/modules/board/skins/xe_list/view_document.html index f6c5dfd97..8eb7fddbe 100644 --- a/modules/board/skins/xe_list/view_document.html +++ b/modules/board/skins/xe_list/view_document.html @@ -49,7 +49,7 @@
-
{$oDocument->getContent()}
+
{$oDocument->getContent()}
{@ $tag_list = $oDocument->get('tag_list') } diff --git a/modules/board/skins/xe_webzine/css/white.css b/modules/board/skins/xe_webzine/css/white.css index 7d1dd9172..83e37efee 100644 --- a/modules/board/skins/xe_webzine/css/white.css +++ b/modules/board/skins/xe_webzine/css/white.css @@ -152,6 +152,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;} .boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; } +.boardRead .contentBody { width:100%; overflow:hidden; } .boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both;} .boardRead .readBody p { margin:1em 0; line-height:1.5em;} .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; } diff --git a/modules/board/skins/xe_webzine/view_document.html b/modules/board/skins/xe_webzine/view_document.html index f6c5dfd97..8eb7fddbe 100644 --- a/modules/board/skins/xe_webzine/view_document.html +++ b/modules/board/skins/xe_webzine/view_document.html @@ -49,7 +49,7 @@
-
{$oDocument->getContent()}
+
{$oDocument->getContent()}
{@ $tag_list = $oDocument->get('tag_list') }