diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html index 8c1292322..103795949 100644 --- a/addons/autolink/autolink.spec.html +++ b/addons/autolink/autolink.spec.html @@ -1,16 +1,16 @@ - - + + - + Autolink Addon Unit Test - - - - - - - - + + + + + +'); + Context::addHtmlHeader(''); Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true); } } diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php index 40ae0ae5a..a3ec60c31 100644 --- a/classes/display/VirtualXMLDisplayHandler.php +++ b/classes/display/VirtualXMLDisplayHandler.php @@ -24,7 +24,7 @@ class VirtualXMLDisplayHandler { if($message != 'fail') $output->message = $message; } - $html = ' - - {Context::getBodyHeader()} - - {$content} - - {Context::getHtmlFooter()} +//]]> + + + +{Context::getBodyHeader()} +{$content} +{Context::getHtmlFooter()} -
+
{@$ssl_actions=Context::getSSLActions()} {@ $js_body_files = Context::getJsFile('body') } - - + diff --git a/common/tpl/mobile_layout.html b/common/tpl/mobile_layout.html index 6eb8c5181..c2ab5b842 100644 --- a/common/tpl/mobile_layout.html +++ b/common/tpl/mobile_layout.html @@ -1,19 +1,15 @@ - - - - - + - - + + {Context::getBrowserTitle()} {@ $css_files = Context::getCssFile() } - + @@ -23,7 +19,7 @@ - + @@ -39,11 +35,9 @@ - + {@ $ssl_actions = Context::getSSLActions() } - + diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index 1a9cecd8c..8536d842f 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -2,7 +2,7 @@
{$content}
- diff --git a/common/tpl/redirect.html b/common/tpl/redirect.html index 087cb18a8..72a28491c 100644 --- a/common/tpl/redirect.html +++ b/common/tpl/redirect.html @@ -1,10 +1,10 @@ - - + + - + - \ No newline at end of file diff --git a/config/func.inc.php b/config/func.inc.php index d9c5b629c..cc985cd6e 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -1126,10 +1126,10 @@ function htmlHeader() { echo << - + + - + HTMLHEADER; @@ -1154,7 +1154,7 @@ HTMLHEADER; function alertScript($msg) { if(!$msg) return; - echo ''; + echo ''; } /** @@ -1164,7 +1164,7 @@ HTMLHEADER; */ function closePopupScript() { - echo ''; + echo ''; } /** @@ -1177,5 +1177,5 @@ HTMLHEADER; { $reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()'; - echo ''; + echo ''; } diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index 763bea7db..82e0a0073 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -2,7 +2,7 @@ - {@$layout_info->colorset = "default"} diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html index 0e15ae57b..c6d105248 100644 --- a/modules/addon/tpl/setup_addon.html +++ b/modules/addon/tpl/setup_addon.html @@ -64,7 +64,7 @@ - diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index d5a403f96..ae0174774 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -20,7 +20,7 @@ - @@ -53,6 +53,6 @@ - diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html index 25ae29d7e..3e8b6f3ac 100644 --- a/modules/counter/tpl/index.html +++ b/modules/counter/tpl/index.html @@ -4,7 +4,7 @@ - @@ -28,7 +28,7 @@ {$lang->cmd_remake_cache} - diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html index eb0c99f6e..828cd57b2 100644 --- a/modules/document/tpl/declared_list.html +++ b/modules/document/tpl/declared_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 2c67e1f86..41a1c1928 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 5adb8b0f2..9cffeb1af 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -8,7 +8,7 @@ {$oDocument->getContent(false, false)} - @@ -53,7 +53,7 @@ {$lang->gallery_bg_color}
-
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.html b/modules/editor/components/image_gallery/tpl/slide_gallery.html index 961abf6b1..7ec58a9d1 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.html +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.html @@ -8,7 +8,7 @@ - @@ -25,7 +25,7 @@ - @@ -455,7 +455,7 @@ - diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 72d8ef4dc..805ef409d 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -128,10 +128,10 @@ function editorStart(editor_sequence, primary_key, content_key, editor_height, f // content 생성 editor_path = editor_path.replace(/^\.\//ig, ''); var contentHtml = ''+ - ''+ - ''+ - ''+ ''+ content+ diff --git a/modules/editor/tpl/preview.html b/modules/editor/tpl/preview.html index 15e26a14f..151b89f55 100644 --- a/modules/editor/tpl/preview.html +++ b/modules/editor/tpl/preview.html @@ -1,4 +1,4 @@ - {$content} diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 8b583bb72..c21fe235a 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/file/tpl/iframe.html b/modules/file/tpl/iframe.html index dadf59bd9..a254c8a48 100644 --- a/modules/file/tpl/iframe.html +++ b/modules/file/tpl/iframe.html @@ -1,4 +1,4 @@ - - + diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index c25e37d26..8479ead36 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -173,7 +173,7 @@ // Videos } elseif(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) { $obj->type = 'multimedia'; - $obj->src = sprintf('', $obj->download_url); + $obj->src = sprintf('', $obj->download_url); // Others } else { $obj->type = 'binary'; diff --git a/modules/integration_search/skins/default/no_keywords.html b/modules/integration_search/skins/default/no_keywords.html index 3ce295a1e..e781bba60 100644 --- a/modules/integration_search/skins/default/no_keywords.html +++ b/modules/integration_search/skins/default/no_keywords.html @@ -2,6 +2,6 @@ {$lang->msg_no_keyword} - diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index f2f74d690..faa6b3e44 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -41,7 +41,7 @@ {$lang->cmd_insert} {$lang->cmd_delete} - diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 5b1acccdd..23954c570 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -425,7 +425,7 @@ } if(count($style)) { - $script = ''; + $script = ''; Context::addHtmlHeader($script); } diff --git a/modules/layout/tpl/after_delete_config_image.html b/modules/layout/tpl/after_delete_config_image.html index ad57ea3b8..a88425dcc 100644 --- a/modules/layout/tpl/after_delete_config_image.html +++ b/modules/layout/tpl/after_delete_config_image.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html index 768124b35..39407ab1b 100644 --- a/modules/layout/tpl/header.html +++ b/modules/layout/tpl/header.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/include.multilang.textarea.html b/modules/layout/tpl/include.multilang.textarea.html index 6ae68c964..5c702be3b 100644 --- a/modules/layout/tpl/include.multilang.textarea.html +++ b/modules/layout/tpl/include.multilang.textarea.html @@ -1,5 +1,5 @@ - diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html index b7a3d2ab1..b9c3ea247 100644 --- a/modules/layout/tpl/layout_all_instance_list.html +++ b/modules/layout/tpl/layout_all_instance_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html index 14a1edeb5..f0fe3de94 100644 --- a/modules/layout/tpl/layout_edit.html +++ b/modules/layout/tpl/layout_edit.html @@ -15,7 +15,7 @@
  • {@$ext=substr(strrchr($file,'.'),1)}
    - diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html index e62bfcd5d..6f6b726fe 100644 --- a/modules/layout/tpl/layout_instance_list.html +++ b/modules/layout/tpl/layout_instance_list.html @@ -1,7 +1,7 @@ - diff --git a/modules/layout/tpl/top_refresh.html b/modules/layout/tpl/top_refresh.html index 76f474d8f..4b5f7f6bc 100644 --- a/modules/layout/tpl/top_refresh.html +++ b/modules/layout/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 2a236eef6..265b4c7d8 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -383,7 +383,7 @@
    - + EOD; }elseif($extendForm->column_type == 'jp_zip'){ $template = ''; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 828f48fc3..570b233e7 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -419,7 +419,7 @@ $extraList = $oMemberModel->getUsedJoinFormList(); $js_code = array(); - $js_code[] = ' - diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index 6159eb6e4..685732c7c 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -1,5 +1,5 @@ -

    {$lang->bundle_grant_setup}

    diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 4f4a81d80..1a3de5166 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -1,7 +1,7 @@ - diff --git a/modules/module/tpl/move_filebox_list.html b/modules/module/tpl/move_filebox_list.html index 97f9a7392..1a99ea511 100644 --- a/modules/module/tpl/move_filebox_list.html +++ b/modules/module/tpl/move_filebox_list.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/modules/module/tpl/top_refresh.html b/modules/module/tpl/top_refresh.html index a739609df..df1b9981d 100644 --- a/modules/module/tpl/top_refresh.html +++ b/modules/module/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 70fe681de..0c75e489a 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -41,7 +41,7 @@
    - diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index 73be8b4dc..344a16d27 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -141,7 +141,7 @@ - diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html index 1687db72c..c55e51425 100644 --- a/modules/poll/skins/default/form.html +++ b/modules/poll/skins/default/form.html @@ -6,7 +6,7 @@ - diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html index 6c67026a6..8eb8787f5 100644 --- a/modules/poll/skins/simple/form.html +++ b/modules/poll/skins/simple/form.html @@ -6,7 +6,7 @@ - diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index 67fb30a3d..448e7c486 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/rss/tpl/top_refresh.html b/modules/rss/tpl/top_refresh.html index b0c389886..88de21065 100644 --- a/modules/rss/tpl/top_refresh.html +++ b/modules/rss/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index e7bde2ae9..4fc4fe263 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,4 +1,4 @@ -
    diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 3690b05fe..3c8cac19e 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html index 913237692..d8967878c 100644 --- a/modules/widget/tpl/add_content_widget.html +++ b/modules/widget/tpl/add_content_widget.html @@ -22,7 +22,7 @@ {$editor}
    - diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index 7a5020993..59c2807b0 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -375,7 +375,7 @@ function doAddWidgetCode(widget_code) { var cssfile = request_uri+'/'+cssfile; if(typeof(document.createStyleSheet)=='undefined') { - var css =''; + var css =''; var dummy = xCreateElement("DIV"); xInnerHtml(dummy , css); document.body.appendChild(dummy); diff --git a/modules/widget/tpl/widget_generate_code.filebox.html b/modules/widget/tpl/widget_generate_code.filebox.html index 5b0f4100a..5140b6f8e 100644 --- a/modules/widget/tpl/widget_generate_code.filebox.html +++ b/modules/widget/tpl/widget_generate_code.filebox.html @@ -1,5 +1,5 @@ - @@ -35,7 +35,7 @@ - @@ -59,7 +59,7 @@ {$lang->cmd_set_multilingual} - @@ -83,7 +83,7 @@ - @@ -112,7 +112,7 @@ - @@ -171,7 +171,7 @@

    - @@ -188,6 +188,6 @@
    • - diff --git a/modules/widget/tpl/widget_generate_code.multilang.textarea.html b/modules/widget/tpl/widget_generate_code.multilang.textarea.html index 6ae68c964..5c702be3b 100644 --- a/modules/widget/tpl/widget_generate_code.multilang.textarea.html +++ b/modules/widget/tpl/widget_generate_code.multilang.textarea.html @@ -1,5 +1,5 @@ - diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index cddf7ad81..d14510ab6 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -4,7 +4,7 @@ -', - '' + '', + '' ), // error case - inline javascript array( diff --git a/tests/common/js/index.html b/tests/common/js/index.html index 31d375efa..f4d691853 100644 --- a/tests/common/js/index.html +++ b/tests/common/js/index.html @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + +

    Common JavaScript Test

    diff --git a/themes/xe_greystone/layouts/xe_greystone/layout.html b/themes/xe_greystone/layouts/xe_greystone/layout.html index 90cd36bcb..f9ff91726 100644 --- a/themes/xe_greystone/layouts/xe_greystone/layout.html +++ b/themes/xe_greystone/layouts/xe_greystone/layout.html @@ -7,8 +7,8 @@ - diff --git a/themes/xe_sapphire/layouts/xe_sapphire/layout.html b/themes/xe_sapphire/layouts/xe_sapphire/layout.html index 51004f5bc..887e82810 100644 --- a/themes/xe_sapphire/layouts/xe_sapphire/layout.html +++ b/themes/xe_sapphire/layouts/xe_sapphire/layout.html @@ -4,8 +4,8 @@ - diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html index e4c5d3b46..eea1c615b 100644 --- a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html +++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html @@ -133,7 +133,7 @@ - diff --git a/themes/xe_solid_enterprise/modules/communication/send_message.html b/themes/xe_solid_enterprise/modules/communication/send_message.html index 3fb39ae22..50f29902e 100644 --- a/themes/xe_solid_enterprise/modules/communication/send_message.html +++ b/themes/xe_solid_enterprise/modules/communication/send_message.html @@ -36,6 +36,6 @@ - diff --git a/themes/xe_solid_enterprise/modules/member/login_form.html b/themes/xe_solid_enterprise/modules/member/login_form.html index d388dc569..5777d25f9 100644 --- a/themes/xe_solid_enterprise/modules/member/login_form.html +++ b/themes/xe_solid_enterprise/modules/member/login_form.html @@ -2,7 +2,7 @@ - diff --git a/themes/xe_solid_enterprise/modules/member/modify_info.html b/themes/xe_solid_enterprise/modules/member/modify_info.html index 1b24657ce..68f801df3 100644 --- a/themes/xe_solid_enterprise/modules/member/modify_info.html +++ b/themes/xe_solid_enterprise/modules/member/modify_info.html @@ -5,7 +5,7 @@

    {$lang->msg_update_member}

    - @@ -70,6 +70,6 @@ - diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html index 8c0651fa3..f66fd7aa0 100644 --- a/widgets/login_info/skins/xe_globalTwo/login_form.html +++ b/widgets/login_info/skins/xe_globalTwo/login_form.html @@ -11,7 +11,7 @@ - @@ -71,6 +71,6 @@ - diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html index fb3b72607..56142e116 100644 --- a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html +++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html @@ -3,7 +3,7 @@ -