diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js index a9034c62e..b2c5534c5 100644 --- a/addons/autolink/autolink.js +++ b/addons/autolink/autolink.js @@ -24,7 +24,7 @@ var thisPlugin = this; // extract target text nodes - this.extractTargets($('.xe_content')); + this.extractTargets($('.rhymix_content, .xe_content')); $(this.targets).each(function(){ thisPlugin.cast('AUTOLINK', [this]); @@ -67,7 +67,7 @@ }, extractTargets : function(obj) { var thisPlugin = this; - var wrap = $('.xe_content', obj); + var wrap = $('.rhymix_content, .xe_content', obj); if(wrap.length) { this.extractTargets(wrap); return; @@ -97,7 +97,7 @@ xe.registerPlugin(new AutoLink()); - $(document).on('click', '.xe_content a', function() { + $(document).on('click', '.rhymix_content a, .xe_content a', function() { var $this = $(this); var href = $this.attr('href'); if(!href || /^(?:javascript|mailto):|#/.test(href)) { diff --git a/addons/photoswipe/rx_photoswipe.js b/addons/photoswipe/rx_photoswipe.js index cc4891c9d..14ea40563 100644 --- a/addons/photoswipe/rx_photoswipe.js +++ b/addons/photoswipe/rx_photoswipe.js @@ -256,4 +256,4 @@ var initPhotoSwipeFromDOM = function(gallerySelector) { // execute above function -initPhotoSwipeFromDOM('.xe_content'); \ No newline at end of file +initPhotoSwipeFromDOM('.rhymix_content, .xe_content'); \ No newline at end of file diff --git a/addons/resize_image/css/resize_image.mobile.css b/addons/resize_image/css/resize_image.mobile.css index 53d753413..303352e00 100644 --- a/addons/resize_image/css/resize_image.mobile.css +++ b/addons/resize_image/css/resize_image.mobile.css @@ -1 +1 @@ -.xe_content img{max-width:100%;height:auto !important} +.rhymix_content, .xe_content img{max-width:100%;height:auto !important} diff --git a/addons/resize_image/js/resize_image.js b/addons/resize_image/js/resize_image.js index 865b4c0cb..8feeddced 100644 --- a/addons/resize_image/js/resize_image.js +++ b/addons/resize_image/js/resize_image.js @@ -189,7 +189,7 @@ function getScreen() { // 이미지 슬라이드를 보는 함수 function slideshow(event) { - var container = $(this).closest('.xe_content'); + var container = $(this).closest('.rhymix_content, .xe_content'); var imglist = container.find("img[rel=xe_gallery]"); var currentIdx = $.inArray($(this).get(0), imglist.get()); var xScreen = getScreen(); @@ -242,7 +242,7 @@ $(window).load(function(){ }); } - $('.xe_content').each(function() { + $('.rhymix_content, .xe_content').each(function() { var contentWidth = dummy.appendTo(this).width(); dummy.remove(); if(!contentWidth) return; diff --git a/common/js/common.js b/common/js/common.js index 71a132fe4..85a4a1a6e 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -340,7 +340,7 @@ jQuery(function($) { }); /* Editor preview replacement */ - $(".editable_preview").addClass("xe_content").attr("tabindex", 0); + $(".editable_preview").addClass("rhymix_content xe_content").attr("tabindex", 0); $(".editable_preview").on("click", function() { var input = $(this).siblings(".editable_preview_content"); if (input.size()) { diff --git a/modules/board/skins/default/_comment.html b/modules/board/skins/default/_comment.html index 2e8b66347..107ba3f28 100644 --- a/modules/board/skins/default/_comment.html +++ b/modules/board/skins/default/_comment.html @@ -16,11 +16,11 @@

{$comment->getRegdate('Y.m.d H:i')}

-
{$lang->msg_deleted_comment}
+
{$lang->msg_deleted_comment}
-
{$lang->msg_admin_deleted_comment}
+
{$lang->msg_admin_deleted_comment}
-
+

diff --git a/modules/board/skins/default/_trackback.html b/modules/board/skins/default/_trackback.html index 7f88f9da5..fdab3c5c5 100644 --- a/modules/board/skins/default/_trackback.html +++ b/modules/board/skins/default/_trackback.html @@ -10,7 +10,7 @@

{htmlspecialchars($val->blog_name)}

{zdate($val->regdate, "Y.m.d H:i")}

-

{htmlspecialchars($val->title)} {$val->excerpt}

+

{htmlspecialchars($val->title)} {$val->excerpt}

{$lang->cmd_delete}

diff --git a/modules/board/skins/xedition/_comment.html b/modules/board/skins/xedition/_comment.html index e281ff70c..7713f0030 100644 --- a/modules/board/skins/xedition/_comment.html +++ b/modules/board/skins/xedition/_comment.html @@ -16,11 +16,11 @@

{$comment->getRegdate('Y.m.d H:i')}

-
{$lang->msg_deleted_comment}
+
{$lang->msg_deleted_comment}
-
{$lang->msg_admin_deleted_comment}
+
{$lang->msg_admin_deleted_comment}
- +

diff --git a/modules/board/skins/xedition/_trackback.html b/modules/board/skins/xedition/_trackback.html index 7f88f9da5..fdab3c5c5 100644 --- a/modules/board/skins/xedition/_trackback.html +++ b/modules/board/skins/xedition/_trackback.html @@ -10,7 +10,7 @@

{htmlspecialchars($val->blog_name)}

{zdate($val->regdate, "Y.m.d H:i")}

-

{htmlspecialchars($val->title)} {$val->excerpt}

+

{htmlspecialchars($val->title)} {$val->excerpt}

{$lang->cmd_delete}

diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index ca9a85652..54ac8bb4a 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -446,7 +446,7 @@ class commentItem extends BaseObject { $member_srl = 0; } - $content = vsprintf('
%s
', array( + $content = vsprintf('
%s
', array( $this->comment_srl, $member_srl, $this->comment_srl, $member_srl, $additional_class, $content, $this->comment_srl, $member_srl )); } @@ -454,7 +454,7 @@ class commentItem extends BaseObject { if($add_xe_content_class) { - $content = sprintf('
%s
', $additional_class, $content); + $content = sprintf('
%s
', $additional_class, $content); } } diff --git a/modules/communication/m.skins/default/read_message.html b/modules/communication/m.skins/default/read_message.html index 6cc63e32e..c9b487d0b 100644 --- a/modules/communication/m.skins/default/read_message.html +++ b/modules/communication/m.skins/default/read_message.html @@ -4,7 +4,7 @@

{$message->title}

{$message->nick_name} | {zdate($message->regdate, "Y.m.d H:i")}
-
{$message->content|noescape}
+
{$message->content|noescape}