diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 3dab820e0..51416f6c3 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -1,4 +1,9 @@ - +{@ $db_info = Context::getDBInfo() } + + + + + diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index ff7d3e896..4599a2102 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -33,6 +33,7 @@ Context::set('time_zone', $GLOBALS['_time_zone']); Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N'); Context::set('use_sso', $db_info->use_sso=='Y'?'Y':'N'); + Context::set('use_html5', $db_info->use_html5=='Y'?'Y':'N'); Context::set('use_spaceremover', $db_info->use_spaceremover?$db_info->use_spaceremover:'Y'); Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N'); Context::set('use_db_session', $db_info->use_db_session=='N'?'N':'Y'); diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php index 1bc1f84b2..d82c58ee4 100644 --- a/modules/admin/lang/es.lang.php +++ b/modules/admin/lang/es.lang.php @@ -91,4 +91,7 @@ $lang->last_week = 'Last week'; $lang->this_week = 'This week'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php index b4e151662..6fd5125f5 100644 --- a/modules/admin/lang/fr.lang.php +++ b/modules/admin/lang/fr.lang.php @@ -90,4 +90,7 @@ $lang->last_week = 'Last week'; $lang->this_week = 'This week'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php index aa1c8a744..be1344b8c 100644 --- a/modules/admin/lang/jp.lang.php +++ b/modules/admin/lang/jp.lang.php @@ -90,4 +90,7 @@ $lang->last_week = '先週'; $lang->this_week = '今週'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php index 46a2532f2..5bfbe8cee 100644 --- a/modules/admin/lang/ko.lang.php +++ b/modules/admin/lang/ko.lang.php @@ -90,4 +90,7 @@ $lang->last_week = '지난 주'; $lang->this_week = '이번 주'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'HTML5를 문서의 DTD로 사용합니다.'; ?> diff --git a/modules/admin/lang/ru.lang.php b/modules/admin/lang/ru.lang.php index bf250781e..67f5e4dd0 100644 --- a/modules/admin/lang/ru.lang.php +++ b/modules/admin/lang/ru.lang.php @@ -88,4 +88,7 @@ $lang->last_week = 'Last week'; $lang->this_week = 'This week'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/tr.lang.php b/modules/admin/lang/tr.lang.php index c7f5e81a3..d14892ef8 100644 --- a/modules/admin/lang/tr.lang.php +++ b/modules/admin/lang/tr.lang.php @@ -89,4 +89,7 @@ $lang->last_week = 'Geçen Hafta'; $lang->this_week = 'Bu Hafta'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/vi.lang.php b/modules/admin/lang/vi.lang.php index 15ee2774c..58b854d59 100644 --- a/modules/admin/lang/vi.lang.php +++ b/modules/admin/lang/vi.lang.php @@ -92,4 +92,7 @@ $lang->last_week = 'Last week'; $lang->this_week = 'This week'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php index c5afe80a8..053ea7a06 100644 --- a/modules/admin/lang/zh-CN.lang.php +++ b/modules/admin/lang/zh-CN.lang.php @@ -89,4 +89,7 @@ $lang->last_week = 'Last week'; $lang->this_week = 'This week'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/lang/zh-TW.lang.php b/modules/admin/lang/zh-TW.lang.php index 80cae5742..809e2fb21 100644 --- a/modules/admin/lang/zh-TW.lang.php +++ b/modules/admin/lang/zh-TW.lang.php @@ -89,4 +89,7 @@ $lang->last_week = '上週'; $lang->this_week = '本週'; + + $lang->use_html5 = 'HTML5 DTD'; + $lang->about_html5 = 'Use HTML5 DTD'; ?> diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html index a20534e69..5ce2cd344 100644 --- a/modules/admin/tpl/config.html +++ b/modules/admin/tpl/config.html @@ -10,10 +10,10 @@ @@ -24,6 +24,13 @@
+ + + +
{$lang->use_html5}
 + + +
{$lang->use_rewrite}
 diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index f1e3270fc..26d10c6cd 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -62,6 +62,9 @@ $use_ssl = Context::get('use_ssl'); if(!$use_ssl) $use_ssl = 'none'; + $use_html5 = Context::get('use_html5'); + if(!$use_html5) $use_html5 = 'N'; + $http_port = Context::get('http_port'); $https_port = Context::get('https_port'); @@ -77,6 +80,7 @@ $db_info->use_rewrite = $use_rewrite; $db_info->use_sso = $use_sso; $db_info->use_ssl = $use_ssl; + $db_info->use_html5 = $use_html5; $db_info->use_mobile_view = $use_mobile_view; if($http_port) $db_info->http_port = (int) $http_port; else if($db_info->http_port) unset($db_info->http_port);