issue 2033 fixed. HTML DTD choosing option is removed. Support only HTML5.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11012 201d5d3c-b55e-5fd7-737f-ddc643e51545
2026-01-12 07:11:42 +09:00 · 2012-08-09 07:36:25 +00:00 · 2012-08-09 07:36:25 +00:00 · b041550c53
commit b041550c53
parent e62403ab10
126 changed files with 240 additions and 281 deletions
--- a/modules/editor/components/image_gallery/tpl/list_gallery.html
+++ b/modules/editor/components/image_gallery/tpl/list_gallery.html
@ -5,7 +5,7 @@
 	<load target="gallery.min.js" />
 	<load target="list_gallery.min.js" />
 <!--@end-->
-<script type="text/javascript">
+<script>
 (function(){

 var gallery = xe.getApp('gallery')[0];
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@ -39,7 +39,7 @@
            <th scope="row">{$lang->gallery_border_color}</th>
            <td>
                <div class="editor_color_box">
-                    <script type="text/javascript">
+                    <script>
                    printColor("border", "{$tpl_path}/images/blank.gif");
                    </script>
                </div>
@ -53,7 +53,7 @@
            <th scope="row">{$lang->gallery_bg_color}</th>
            <td>
                <div class="editor_color_box">
-                    <script type="text/javascript">
+                    <script>
                        printColor("bg", "{$tpl_path}/images/blank.gif");
                    </script>
                </div>
--- a/modules/editor/components/image_gallery/tpl/slide_gallery.html
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.html
@ -8,7 +8,7 @@
 	<load target="slide_gallery.min.js" />
 	<load target="slide_gallery.min.css" />
 <!--@end-->
-<script type="text/javascript">
+<script>
 (function(){

 var gallery = xe.getApp('gallery')[0];
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@ -6,7 +6,7 @@
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->

-<script type="text/javascript">
+<script>
    var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
 </script>

@ -25,7 +25,7 @@

            <input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
            <input type="text" class="inputDate" value="{date('Y-m-d',time()+60*60*24*30)}" readonly="readonly" />
-<script type="text/javascript">
+<script>
 (function($){
    $(function(){
        var option = {
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@ -164,7 +164,7 @@
                $content_font = $editor_config->content_font;
                $content_font_size = $editor_config->content_font_size;
                if($content_font || $content_font_size) {
-                    $buff = '<style type="text/css"> .xe_content { ';
+                    $buff = '<style> .xe_content { ';
                    if($content_font) $buff .= 'font-family:'.$content_font.';';
                    if($content_font_size) $buff .= 'font-size:'.$content_font_size.';';
                    $buff .= ' }</style>';
--- a/modules/editor/skins/dreditor/blank.html
+++ b/modules/editor/skins/dreditor/blank.html
@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="./css/editor.css" />
+<meta charset="utf-8" />
+<link rel="stylesheet" href="./css/editor.css" />
 <title>XpressEngine DrEditor</title>
 </head>
 <body class="xe_content editable">
--- a/modules/editor/skins/dreditor/editor.html
+++ b/modules/editor/skins/dreditor/editor.html
@ -401,7 +401,7 @@
 			<!--@if($allow_fileupload)-->
 			<!--%import("js/uploader.js",optimized=false)-->
 			<!--%import("../../tpl/js/swfupload.js",optimized=false)-->
-			<script type="text/javascript">//<![CDATA[
+			<script>//<![CDATA[
                uploaderSettings=
                    {
 					"editorSequence" : {$editor_sequence},
@ -613,7 +613,7 @@
 					</ul>
 					
 					<!-- JS for Prototype -->
-					<script type="text/javascript">
+					<script>
 					//<![CDATA[
 						jQuery(function($){
 							$('.wToolbar button').slice(0,9).append('<span class="nx"></span>');
@ -658,9 +658,8 @@
 <!-- /에디터 -->

 <!-- 에디터 활성화 -->
-<script type="text/javascript">//<![CDATA[
+<script>//<![CDATA[
 var editor_path = "{$editor_path}";
-
 var auto_saved_msg = "{$lang->msg_auto_saved}";
 var delete_dr_confirm_msg = "{$lang->edit->msg_dr_delete_confirm}";
 var no_selected_object_msg = "{$lang->edit->msg_no_selected_object}";
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@ -18,7 +18,7 @@
        <input type="hidden" id="htm_{$editor_sequence}" value="<!--@if($colorset == "white_text_nohtml" || $colorset == "black_text_nohtml")-->n<!--@end--><!--@if($colorset == "white_texteditor" || $colorset == "white_texteditor")-->br<!--@end-->" />
        <textarea id="editor_{$editor_sequence}" style="height:{$editor_height}px;" rows="8" cols="42" class="iTextArea"></textarea>
    </div>
-    <script type="text/javascript">//<![CDATA[
+    <script>//<![CDATA[
        editorStartTextarea({$editor_sequence}, "{$editor_content_key_name}", "{$editor_primary_key_name}");
    //]]></script>

@ -455,7 +455,7 @@
        </div>
    </div>
    <!-- 에디터 활성화 -->
-    <script type="text/javascript">//<![CDATA[
+    <script>//<![CDATA[
        var editor_path = "{$editor_path}";
        var auto_saved_msg = "{$lang->msg_auto_saved}";
 		var oEditor;
--- a/modules/editor/styles/default/editor.html
+++ b/modules/editor/styles/default/editor.html
@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
+<meta charset="utf-8" />
+<link rel="stylesheet" href="editor.css" />
 <title>XpressEngine</title>
 </head>
 <body class="xe_content editable">
--- a/modules/editor/styles/dreditor/editor.html
+++ b/modules/editor/styles/dreditor/editor.html
@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
+<meta charset="utf-8" />
+<link rel="stylesheet" href="editor.css" />
 <title>XpressEngine</title>
 </head>
 <body class="xe_content editable">
--- a/modules/editor/styles/xeStyle/editor.html
+++ b/modules/editor/styles/xeStyle/editor.html
@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<link rel="stylesheet" type="text/css" href="style.css" />
+<meta charset="utf-8" />
+<link rel="stylesheet" href="editor.css" />
+<link rel="stylesheet" href="style.css" />
 <title>XpressEngine</title>
 </head>
 <body class="xe_content editable">
--- a/modules/editor/styles/xeStyleBlack/editor.html
+++ b/modules/editor/styles/xeStyleBlack/editor.html
@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<link rel="stylesheet" type="text/css" href="style.css" />
+<meta charset="utf-8" />
+<link rel="stylesheet" href="editor.css" />
+<link rel="stylesheet" href="style.css" />
 <title>XpressEngine</title>
 </head>
 <body class="xe_content editable">
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@ -1,5 +1,5 @@
 <load target="js/editor_module_config.js" usecdn="true" />
-<script type="text/javascript">
+<script>
 	jQuery(function($){
 		var fontPreview = $('.fontPreview');
 		var fontRadio = $('.fontSelector>:radio');
--- a/modules/editor/tpl/component_not_founded.html
+++ b/modules/editor/tpl/component_not_founded.html
@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
    alert("{$message}");
    window.close();
 </script>
--- 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 = ''+
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+
-        '<html xmlns="http://www.w3.org/1999/xhtml><head><meta http-equiv="content-type" content="text/html; charset=utf-8"/>'+
-        '<style type="text/css">'+
-        'body {font-size:.75em; line-height:1.6; font-family:Sans-serif; height:'+editor_height+'px; padding:0; margin:0; background-color:transparent; color:'+font_color+';}'+
+        '<!DOCTYPE html>'+
+        '<html><head><meta charset="utf-8"/>'+
+        '<style>'+
+        'body{font-size:.75em;line-height:1.6;font-family:Sans-serif;height:'+editor_height+'px;padding:0;margin:0;background-color:transparent;color:'+font_color+';}'+
        '</style>'+
        '</head><body editor_sequence="'+editor_sequence+'">'+
        content+
--- a/modules/editor/tpl/preview.html
+++ b/modules/editor/tpl/preview.html
@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
    top.xAddEventListener(window, 'load', function() { top.showPreviewContent({$editor_sequence}); } );
 </script>
 {$content}