merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -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">

View file

@ -16,3 +16,4 @@
.xe_content blockquote.q6{border:1px dashed #707070}
.xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
.xe_content p{margin:0}

View file

@ -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">

View file

@ -4,12 +4,12 @@
<title xml:lang="en">dreditor</title>
<title xml:lang="tr">dreditor</title>
<description xml:lang="ko">
단락편집기 문서서식입니다.
텍스타일 이외의 모듈에서 단락편집기를 사용할 때 사용하시면 단락편집기 스타일에 맞추어서 표시해줍니다.
단락편집기 문서 서식입니다.
텍스타일 이외의 페이지에서 단락편집기 스타일에 맞추어 서식을 표시해줍니다.
</description>
<description xml:lang="en">
DrEditor document style.
If you use DrEditor with other modules rather than Textyle, setting style as this would help disply better.
If you use DrEditor with other pages rather than Textyle, setting style as this would help disply better.
</description>
<description xml:lang="tr">
DrEditor belge şekli.
@ -17,9 +17,9 @@
</description>
<version>0.1</version>
<date>2010-05-25</date>
<author email_address="haneul0318@gmail.com" link="http://seungyeop.kr">
<name xml:lang="ko">haneul</name>
<name xml:lang="en">haneul</name>
<name xml:lang="tr">haneul</name>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="en">NHN</name>
<name xml:lang="tr">NHN</name>
</author>
</skin>

View file

@ -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">

View file

@ -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">