From 3581db593226f4964675f33937de449060c3dc8f Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 8 Nov 2013 06:04:28 +0000 Subject: [PATCH] remove cdn feature git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13187 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 13 +---- .../FrontEndFileHandler.class.php | 48 +++---------------- classes/template/TemplateHandler.class.php | 4 +- config/config.inc.php | 18 ------- modules/admin/admin.admin.view.php | 1 - modules/admin/lang/lang.xml | 14 ------ modules/admin/tpl/config_general.html | 8 ---- modules/counter/tpl/index.html | 12 ++--- modules/document/tpl/category_list.html | 2 +- modules/document/tpl/checked_list.html | 2 +- modules/document/tpl/declared_list.html | 2 +- modules/document/tpl/document_list.html | 2 +- modules/document/tpl/extra_keys.html | 2 +- modules/document/tpl/header.html | 2 +- modules/document/tpl/preview_page.html | 2 +- modules/document/tpl/print_page.html | 2 +- modules/editor/tpl/admin_index.html | 2 +- modules/editor/tpl/editor_module_config.html | 2 +- modules/editor/tpl/setup_component.html | 6 +-- modules/editor/tpl/view_component.html | 6 +-- modules/file/tpl/file_list.html | 2 +- modules/file/tpl/header.html | 2 +- modules/importer/tpl/header.html | 4 +- modules/importer/tpl/index.html | 2 +- modules/install/install.admin.controller.php | 4 -- modules/integration_search/tpl/header.html | 2 +- modules/integration_search/tpl/index.html | 2 +- modules/layout/tpl/copy_layout.html | 2 +- .../layout/tpl/layout_all_instance_list.html | 2 +- modules/layout/tpl/layout_edit.html | 2 +- modules/layout/tpl/layout_instance_list.html | 2 +- .../m.skins/default/find_member_account.html | 6 +-- .../m.skins/default/find_temp_password.html | 2 +- .../member/m.skins/default/leave_form.html | 6 +-- .../member/m.skins/default/login_form.html | 4 +- .../m.skins/default/modify_email_address.html | 6 +-- .../member/m.skins/default/modify_info.html | 2 +- .../m.skins/default/modify_password.html | 6 +-- .../m.skins/default/rechecked_password.html | 2 +- .../member/m.skins/default/signup_form.html | 6 +-- modules/member/tpl/group_list.html | 4 +- modules/member/tpl/insert_member.html | 2 +- modules/member/tpl/member_list.html | 6 +-- modules/member/tpl/signup_config.html | 2 +- .../message/skins/default/system_message.html | 2 +- modules/module/tpl/copy_module.html | 2 +- modules/module/tpl/filebox_add.html | 2 +- modules/module/tpl/header.html | 2 +- .../module/tpl/include.manage_selected.html | 2 +- .../tpl/include.module_grant_setup.html | 2 +- modules/module/tpl/lang.html | 2 +- modules/module/tpl/module_grant_setup.html | 2 +- modules/module/tpl/module_grants.html | 2 +- modules/module/tpl/module_selector.html | 2 +- modules/module/tpl/module_setup.html | 2 +- modules/module/tpl/skin_info.html | 2 +- modules/page/tpl/article_content_modify.html | 2 +- modules/page/tpl/content.html | 2 +- modules/page/tpl/header.html | 2 +- modules/page/tpl/index.html | 8 ++-- modules/page/tpl/mcontent.html | 2 +- modules/page/tpl/mobile.html | 2 +- modules/page/tpl/page_content_modify.html | 8 ++-- modules/page/tpl/page_delete.html | 2 +- .../page/tpl/page_mobile_content_modify.html | 8 ++-- modules/point/tpl/header.html | 2 +- modules/point/tpl/member_list.html | 2 +- modules/point/tpl/point_module_config.html | 2 +- modules/poll/tpl/config.html | 2 +- modules/poll/tpl/poll_list.html | 2 +- modules/poll/tpl/result.html | 2 +- modules/session/tpl/index.html | 2 +- modules/spamfilter/tpl/header.html | 2 +- modules/trackback/tpl/trackback_list.html | 2 +- modules/trash/tpl/header.html | 2 +- modules/trash/tpl/trash_list.html | 2 +- modules/widget/tpl/add_content_widget.html | 4 +- modules/widget/tpl/skin_info.html | 2 +- modules/widget/tpl/widget_detail_info.html | 4 +- modules/widget/tpl/widget_generate_code.html | 2 +- .../tpl/widget_generate_code.include.html | 6 +-- .../tpl/widget_generate_code_in_page.html | 16 +++---- .../widget_style_generate_code_in_page.html | 16 +++---- 83 files changed, 137 insertions(+), 225 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 1426bfcba..ace27ba4e 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1994,22 +1994,13 @@ class Context * $args[1]: media, * $args[2]: target IE, * $args[3]: index - * @param bool $useCdn use cdn - * @param string $cdnPrefix cdn prefix - * @param string $cdnVersion cdn version * */ - function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '') + function loadFile($args) { is_a($this, 'Context') ? $self = $this : $self = Context::getInstance(); - if($useCdn && !$cdnPrefix) - { - $cdnPrefix = __XE_CDN_PREFIX__; - $cdnVersion = __XE_CDN_VERSION__; - } - - $self->oFrontEndFileHandler->loadFile($args, $useCdn, $cdnPrefix, $cdnVersion); + $self->oFrontEndFileHandler->loadFile($args); } /** diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 316946203..5fbc7b7dc 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -87,28 +87,15 @@ class FrontEndFileHandler extends Handler * $args[3]: index * * - * If $useCdn set true, use CDN instead local file. - * CDN path = $cdnPrefix . $cdnVersion . $args[0]
- *
- * i.e.
- * $cdnPrefix = 'http://static.xpressengine.com/core/';
- * $cdnVersion = 'ardent1';
- * $args[0] = './common/js/xe.js';
- * The CDN path is http://static.xprssengine.com/core/ardent1/common/js/xe.js.
- * * @param array $args Arguments - * @param bool $useCdn If set true, use cdn instead local file - * @param string $cdnPrefix CDN url prefix. (http://static.xpressengine.com/core/) - * @param string $cdnVersion CDN version string (ardent1) * @return void * */ - function loadFile($args, $useCdn = FALSE, $cdnPrefix = '', $cdnVersion = '') + function loadFile($args) { if(!is_array($args)) { $args = array($args); } - $file = $this->getFileInfo($args[0], $args[2], $args[1]); $availableExtension = array('css' => 1, 'js' => 1); @@ -117,9 +104,6 @@ class FrontEndFileHandler extends Handler return; } - $file->useCdn = $useCdn; - $file->cdnPrefix = $cdnPrefix; - $file->cdnVersion = $cdnVersion; $file->index = (int) $args[3]; if($file->fileExtension == 'css') @@ -294,23 +278,14 @@ class FrontEndFileHandler extends Handler $this->_sortMap($map, $mapIndex); - $dbInfo = Context::getDBInfo(); - $useCdn = $dbInfo->use_cdn; - $result = array(); foreach($map as $indexedMap) { foreach($indexedMap as $file) { - if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') - { - $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; - } - else - { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - } + $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; + $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; + $result[] = array('file' => $fullFilePath, 'media' => $file->media, 'targetie' => $file->targetIe); } } @@ -339,23 +314,14 @@ class FrontEndFileHandler extends Handler $this->_sortMap($map, $mapIndex); - $dbInfo = Context::getDBInfo(); - $useCdn = $dbInfo->use_cdn; - $result = array(); foreach($map as $indexedMap) { foreach($indexedMap as $file) { - if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') - { - $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; - } - else - { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - } + $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; + $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; + $result[] = array('file' => $fullFilePath, 'targetie' => $file->targetIe); } } diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 44e23bf2b..1e7cd753d 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -675,7 +675,7 @@ class TemplateHandler else { $metafile = $attr['target']; - $result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);"; + $result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);"; } break; case 'css': @@ -686,7 +686,7 @@ class TemplateHandler else { $metafile = $attr['target']; - $result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);"; + $result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);"; } break; } diff --git a/config/config.inc.php b/config/config.inc.php index ab9a5d9eb..0d986c1e5 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -100,8 +100,6 @@ else * define('__OB_GZHANDLER_ENABLE__', 1); * define('__ENABLE_PHPUNIT_TEST__', 0); * define('__PROXY_SERVER__', 'http://domain:port/path'); - * define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/'); - * define('__XE_CDN_VERSION__', 'yourCdnVersion'); */ if(file_exists(_XE_PATH_ . 'config/config.user.inc.php')) { @@ -234,22 +232,6 @@ if(!defined('__PROXY_SERVER__')) define('__PROXY_SERVER__', NULL); } -if(!defined('__XE_CDN_PREFIX__')) -{ - /** - * CDN prefix - */ - define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/'); -} - -if(!defined('__XE_CDN_VERSION__')) -{ - /** - * CDN version - */ - define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%'); -} - // Require specific files when using Firebug console output if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1) { diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 2baca8c6f..afe1fb678 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -59,7 +59,6 @@ class adminAdminView extends admin Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y'); Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N'); Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none"); - Context::set('use_cdn', $db_info->use_cdn ? $db_info->use_cdn : "none"); if($db_info->http_port) { Context::set('http_port', $db_info->http_port); diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 4bb5d8190..c5b3d3ac8 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -880,13 +880,6 @@ - - - - - - - @@ -1017,13 +1010,6 @@ - - - - - - - diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html index 9c7d6b2e7..766347010 100644 --- a/modules/admin/tpl/config_general.html +++ b/modules/admin/tpl/config_general.html @@ -164,14 +164,6 @@ -
- -
- - -

{$lang->about_cdn}

-
-
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html index d8ed0d7c3..bb1a5a34b 100644 --- a/modules/counter/tpl/index.html +++ b/modules/counter/tpl/index.html @@ -1,5 +1,5 @@ - - + + @@ -73,14 +73,14 @@ - +
- + @@ -91,7 +91,7 @@ {@$img_width = 1} - -
+ {$key} @@ -102,7 +102,7 @@ {$key} + {$key} {$lang->unit_year} diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html index de5412a05..cd469383c 100644 --- a/modules/document/tpl/category_list.html +++ b/modules/document/tpl/category_list.html @@ -4,7 +4,7 @@ - + - +

{$lang->document} {$lang->help}

diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index af115fe4c..8cdf6e556 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +

{$lang->document} {$lang->help}

diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html index e0c43a2f7..22f3edbbe 100644 --- a/modules/document/tpl/extra_keys.html +++ b/modules/document/tpl/extra_keys.html @@ -1,4 +1,4 @@ - + diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html index 4ca9dc4b5..0a95fde2a 100644 --- a/modules/document/tpl/header.html +++ b/modules/document/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->document} {$lang->cmd_management}

{$lang->document_list} diff --git a/modules/document/tpl/preview_page.html b/modules/document/tpl/preview_page.html index 5195e31d4..eb1e0f8a3 100644 --- a/modules/document/tpl/preview_page.html +++ b/modules/document/tpl/preview_page.html @@ -1,4 +1,4 @@ - + {$content}

diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 9cffeb1af..0fc174353 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -1,4 +1,4 @@ - +

{$oDocument->getTitleText()}

{$oDocument->get('nick_name')} {$oDocument->getRegdate()} diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index 963879de7..283620454 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -1,4 +1,4 @@ - +

{$lang->editor} {$lang->help}

diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 71bff861c..0061f0a61 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -1,5 +1,5 @@ - +
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html index 6f2bda1e3..9c653a711 100644 --- a/modules/editor/tpl/setup_component.html +++ b/modules/editor/tpl/setup_component.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->editor}

diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 7f5478941..10cc4ebaf 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -1,6 +1,6 @@ - - - + + +

{$component->title} ver. {$component->version}

diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 73de322c9..ffe181a40 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +
diff --git a/modules/file/tpl/header.html b/modules/file/tpl/header.html index b624d5adf..0ee48c509 100644 --- a/modules/file/tpl/header.html +++ b/modules/file/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->file} {$lang->cmd_management}

{$lang->file_list} diff --git a/modules/importer/tpl/header.html b/modules/importer/tpl/header.html index f66d188eb..da53b10da 100644 --- a/modules/importer/tpl/header.html +++ b/modules/importer/tpl/header.html @@ -1,5 +1,5 @@ - - + + {@ $type_list = array('module'=>$lang->type_module, 'ttxml'=>$lang->type_ttxml, 'member'=>$lang->type_member, 'sync'=>$lang->type_syncmember, 'message'=>$lang->type_message) }

{$lang->importer} {$lang->help}

diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html index 5923ebf5a..cac85a045 100644 --- a/modules/importer/tpl/index.html +++ b/modules/importer/tpl/index.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 353a231e4..fe149412a 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -67,9 +67,6 @@ class installAdminController extends install $http_port = Context::get('http_port'); $https_port = Context::get('https_port'); - $use_cdn = Context::get('use_cdn'); - if($use_cdn != 'Y') $use_cdn = 'N'; - $use_rewrite = Context::get('use_rewrite'); if($use_rewrite!='Y') $use_rewrite = 'N'; @@ -92,7 +89,6 @@ class installAdminController extends install $db_info->use_rewrite = $use_rewrite; $db_info->use_sso = $use_sso; $db_info->use_ssl = $use_ssl; - $db_info->use_cdn = $use_cdn; $db_info->use_html5 = $use_html5; $db_info->admin_ip_list = $admin_ip_list; diff --git a/modules/integration_search/tpl/header.html b/modules/integration_search/tpl/header.html index b72cf7348..f19d26fdd 100644 --- a/modules/integration_search/tpl/header.html +++ b/modules/integration_search/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->integration_search}

diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index 600e805e6..1835af521 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/layout/tpl/copy_layout.html b/modules/layout/tpl/copy_layout.html index 795b71305..96054e5d9 100644 --- a/modules/layout/tpl/copy_layout.html +++ b/modules/layout/tpl/copy_layout.html @@ -3,7 +3,7 @@ var newTitle = '{$lang->new_title}'; var layoutTitle = '{$layout->layout_title}'; var addLang = '{$lang->cmd_insert}'; - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html index 47198a717..bcc8394e3 100644 --- a/modules/layout/tpl/layout_all_instance_list.html +++ b/modules/layout/tpl/layout_all_instance_list.html @@ -1,5 +1,5 @@ - + diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html index eb4921a00..e926f5854 100644 --- a/modules/layout/tpl/layout_edit.html +++ b/modules/layout/tpl/layout_edit.html @@ -1,5 +1,5 @@ - +

{nl2br($lang->about_layout_code)}

{$lang->layout_image_repository}

diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html index 13cc2d60a..702ea4fca 100644 --- a/modules/layout/tpl/layout_instance_list.html +++ b/modules/layout/tpl/layout_instance_list.html @@ -1,5 +1,5 @@ - + diff --git a/modules/member/m.skins/default/find_member_account.html b/modules/member/m.skins/default/find_member_account.html index 5eb2b0bdf..517d11bd0 100644 --- a/modules/member/m.skins/default/find_member_account.html +++ b/modules/member/m.skins/default/find_member_account.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->cmd_find_member_account_with_email}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/find_temp_password.html b/modules/member/m.skins/default/find_temp_password.html index 3ba9e7c94..b625fd6b4 100644 --- a/modules/member/m.skins/default/find_temp_password.html +++ b/modules/member/m.skins/default/find_temp_password.html @@ -1,4 +1,4 @@ - +

{$lang->cmd_find_member_account}

{$lang->about_temp_password}

diff --git a/modules/member/m.skins/default/leave_form.html b/modules/member/m.skins/default/leave_form.html index 200906203..eba8cb714 100644 --- a/modules/member/m.skins/default/leave_form.html +++ b/modules/member/m.skins/default/leave_form.html @@ -1,6 +1,6 @@ - - - + + +

{$member_title = $lang->msg_leave_member}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/login_form.html b/modules/member/m.skins/default/login_form.html index c83f542b8..24493b6ca 100644 --- a/modules/member/m.skins/default/login_form.html +++ b/modules/member/m.skins/default/login_form.html @@ -1,5 +1,5 @@ - - + +

{$lang->cmd_login}

diff --git a/modules/member/m.skins/default/modify_email_address.html b/modules/member/m.skins/default/modify_email_address.html index 3f8577f50..8951bf884 100644 --- a/modules/member/m.skins/default/modify_email_address.html +++ b/modules/member/m.skins/default/modify_email_address.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->cmd_modify_member_email_address}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/modify_info.html b/modules/member/m.skins/default/modify_info.html index 76080093f..e70313449 100644 --- a/modules/member/m.skins/default/modify_info.html +++ b/modules/member/m.skins/default/modify_info.html @@ -6,7 +6,7 @@ - + diff --git a/modules/module/tpl/lang.html b/modules/module/tpl/lang.html index 955508825..8ede243f6 100644 --- a/modules/module/tpl/lang.html +++ b/modules/module/tpl/lang.html @@ -1,4 +1,4 @@ - +

Select Your Language

diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index e596e58e7..3a1476010 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -1,4 +1,4 @@ - + diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 89dd5c87e..27dac3b18 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -1,5 +1,5 @@ - + - + @@ -92,7 +92,7 @@ jQuery(function($){ - + diff --git a/modules/page/tpl/mcontent.html b/modules/page/tpl/mcontent.html index 6339ceeb5..36b180a06 100644 --- a/modules/page/tpl/mcontent.html +++ b/modules/page/tpl/mcontent.html @@ -1,6 +1,6 @@ {$page_content} - +

{$lang->about_mcontent}

diff --git a/modules/page/tpl/mobile.html b/modules/page/tpl/mobile.html index e295f91fe..ec955fb92 100644 --- a/modules/page/tpl/mobile.html +++ b/modules/page/tpl/mobile.html @@ -1,4 +1,4 @@ - +
{$page_content}
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 388d59632..520abe078 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -1,8 +1,8 @@ - - - - + + + +
{$page_content}
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index a1cbf33aa..5f3d6c64b 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -1,4 +1,4 @@ - +
diff --git a/modules/page/tpl/page_mobile_content_modify.html b/modules/page/tpl/page_mobile_content_modify.html index 3b6486696..7be77183b 100644 --- a/modules/page/tpl/page_mobile_content_modify.html +++ b/modules/page/tpl/page_mobile_content_modify.html @@ -1,8 +1,8 @@ - - - - + + + +
{$page_content}
diff --git a/modules/point/tpl/header.html b/modules/point/tpl/header.html index 759db716a..a388e500f 100644 --- a/modules/point/tpl/header.html +++ b/modules/point/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->point} {$lang->cmd_management} {$lang->help}

diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html index f2222cf70..1f6456c75 100644 --- a/modules/point/tpl/member_list.html +++ b/modules/point/tpl/member_list.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html index 787821f43..81273df1c 100644 --- a/modules/point/tpl/point_module_config.html +++ b/modules/point/tpl/point_module_config.html @@ -1,4 +1,4 @@ - +

{$lang->point}

diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html index 41956cd00..fc1d5ebde 100644 --- a/modules/poll/tpl/config.html +++ b/modules/poll/tpl/config.html @@ -1,4 +1,4 @@ - +
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index e83ce7ddf..7d540a6c3 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -4,7 +4,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; xe.lang.msg_select_poll = '{$lang->msg_poll_is_null}'; xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}'; - +

{$lang->poll} {$lang->help}

diff --git a/modules/poll/tpl/result.html b/modules/poll/tpl/result.html index 3684b5f8f..c604ac379 100644 --- a/modules/poll/tpl/result.html +++ b/modules/poll/tpl/result.html @@ -1,4 +1,4 @@ - +

{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")} {$lang->poll_join_count} : {number_format($poll->poll_count)}

diff --git a/modules/session/tpl/index.html b/modules/session/tpl/index.html index 7c3ffafa1..c3cc9114e 100644 --- a/modules/session/tpl/index.html +++ b/modules/session/tpl/index.html @@ -1,4 +1,4 @@ - +

{$lang->session} {$lang->cmd_management}

diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html index a9ef8de56..ef8da12e1 100644 --- a/modules/spamfilter/tpl/header.html +++ b/modules/spamfilter/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->spamfilter} {$lang->help}

diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 504065bf5..10ed25382 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +

{$lang->trackback} {$lang->help}

diff --git a/modules/trash/tpl/header.html b/modules/trash/tpl/header.html index cf7e9e9de..bd7fd3cbc 100644 --- a/modules/trash/tpl/header.html +++ b/modules/trash/tpl/header.html @@ -1,2 +1,2 @@ - +

{$lang->cmd_trash} {$lang->cmd_management}

diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index a0de0190f..8f08c3e82 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -2,7 +2,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; var no_text_comment = '{$lang->no_text_comment}'; - +

{$lang->trash} {$lang->help}

diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html index 01174f180..9d1a4dc3a 100644 --- a/modules/widget/tpl/add_content_widget.html +++ b/modules/widget/tpl/add_content_widget.html @@ -1,5 +1,5 @@ - - + + diff --git a/modules/widget/tpl/skin_info.html b/modules/widget/tpl/skin_info.html index ec3711114..98defb9e2 100644 --- a/modules/widget/tpl/skin_info.html +++ b/modules/widget/tpl/skin_info.html @@ -1,4 +1,4 @@ - +

{$skin_info->title}

Total: {number_format($total_count)}, Page: {number_format($page)}/{number_format($total_page)}
diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html index d2e05f811..a66f928b6 100644 --- a/modules/widget/tpl/widget_detail_info.html +++ b/modules/widget/tpl/widget_detail_info.html @@ -1,5 +1,5 @@ - - + +

{$lang->widget}

{$lang->widget_maker}

diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html index c70a00f67..044278e22 100644 --- a/modules/widget/tpl/widget_generate_code.html +++ b/modules/widget/tpl/widget_generate_code.html @@ -1,5 +1,5 @@ - + diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html index 840c6681e..145582f6b 100644 --- a/modules/widget/tpl/widget_generate_code.include.html +++ b/modules/widget/tpl/widget_generate_code.include.html @@ -1,6 +1,6 @@ - - - + + +
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index 16b831654..1780a887d 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -1,11 +1,11 @@ - - - - - - - - + + + + + + + +