From f874e669e02677c74b6befcf9aa7c53f578ed84a Mon Sep 17 00:00:00 2001
From: flyskyko
Date: Thu, 24 Nov 2011 02:30:59 +0000
Subject: [PATCH 01/25] issue 1073 when addon mobile option on, error message
showed. fix this bug
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9870 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
modules/addon/addon.admin.controller.php | 23 ++++++++++++-----------
modules/addon/tpl/addon_list.html | 4 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 3a3209e7f..2ac45a4dd 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -20,8 +20,8 @@
**/
function procAddonAdminSaveActivate()
{
- $pc = Context::get('pc');
- $mobile = Context::get('mobile');
+ $pcOnList = Context::get('pc_on');
+ $mobileOnList = Context::get('mobile_on');
$fixed = Context::get('fixed');
$site_module_info = Context::get('site_module_info');
@@ -29,13 +29,13 @@
if($site_module_info->site_srl) $site_srl = $site_module_info->site_srl;
else $site_srl = 0;
- if (!$pc) $pc = array();
- if (!$mobile) $mobile = array();
+ if (!$pcOnList) $pcOnList = array();
+ if (!$mobileOnList) $mobileOnList = array();
if (!$fixed) $fixed = array();
- if (!is_array($pc)) $pc = array($pc);
- if (!is_array($mobile)) $pc = array($mobile);
- if (!is_array($fixed)) $pc = array($fixed);
+ if (!is_array($pcOnList)) $pcOnList = array($pcOnList);
+ if (!is_array($mobileOnList)) $pcOnList = array($mobileOnList);
+ if (!is_array($fixed)) $pcOnList = array($fixed);
// get current addon info
$oModel = &getAdminModel('addon');
@@ -45,13 +45,13 @@
$updateList = array();
foreach($currentAddonList as $addon)
{
- if ($addon->activated !== in_array($addon->addon_name, $pc))
+ if ($addon->activated !== in_array($addon->addon_name, $pcOnList))
{
$updateList[] = $addon->addon_name;
continue;
}
- if ($addon->mactivated !== in_array($addon->addon_name, $mobile))
+ if ($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
{
$updateList[] = $addon->addon_name;
continue;
@@ -69,12 +69,12 @@
{
unset($args);
- if (in_array($targetAddon, $pc))
+ if (in_array($targetAddon, $pcOnList))
$args->is_used = 'Y';
else
$args->is_used = 'N';
- if (in_array($targetAddon, $mobile))
+ if (in_array($targetAddon, $mobileOnList))
$args->is_used_m = 'Y';
else
$args->is_used_m = 'N';
@@ -97,6 +97,7 @@
$this->makeCacheFile($site_srl, 'mobile', 'site');
}
+ $this->setMessage('success_updated', 'info');
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 79ebb8bc3..faa9ce565 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -41,8 +41,8 @@
| {$addon->path} |
{$lang->cmd_setup} |
- activated" /> |
- mactivated" /> |
+ activated" /> |
+ mactivated" /> |
{$lang->cmd_delete} |
From 87e5c89db1a1256ba6d5090420c397dd80f4b7f7 Mon Sep 17 00:00:00 2001
From: ChanMyeong
Date: Thu, 24 Nov 2011 02:34:50 +0000
Subject: [PATCH 02/25] Login widget UI fix. When widget code has not colorset,
login button is displayed submit(text) type.
widgets/login_info/skins/xe_official/login_form.html
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9871 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
widgets/login_info/skins/xe_official/login_form.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index de1e866d3..d8f4a4ef8 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -27,7 +27,8 @@
-
+
+
From f748458ecde931be60b6ac8c2626933955f3a8af Mon Sep 17 00:00:00 2001
From: flyskyko
Date: Thu, 24 Nov 2011 02:51:33 +0000
Subject: [PATCH 03/25] issue 1064, problem that root of thumbnail image
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9872 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
modules/admin/admin.admin.view.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 634659c4b..a738c66f7 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -478,7 +478,7 @@
if (!$layout_info) continue;
$layout_parse = explode('.', $layout_info->layout);
if (count($layout_parse) == 2){
- $thumb_path = sprintf('./themes/%s/layout/%s/thumbnail.png', $layout_parse[0], $layout_parse[1]);
+ $thumb_path = sprintf('./themes/%s/layouts/%s/thumbnail.png', $layout_parse[0], $layout_parse[1]);
}
else{
$thumb_path = './layouts/'.$layout_info->layout.'/thumbnail.png';
From 76eee73aac0b42c165531c135040f6d85a202832 Mon Sep 17 00:00:00 2001
From: ChanMyeong
Date: Thu, 24 Nov 2011 10:29:55 +0000
Subject: [PATCH 04/25] #1077 fixed. About colorset display on the admin page.
etc.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9873 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
layouts/user_layout/conf/info.xml | 2 +-
modules/admin/lang/lang.xml | 2 ++
modules/layout/tpl/layout_instance_list.html | 2 +-
modules/menu/conf/module.xml | 4 ++--
modules/module/tpl/skin_config.html | 9 ++++-----
modules/page/m.skins/default/mobile.html | 4 ++--
modules/page/skins/default/content.html | 4 ++--
modules/page/tpl/content.html | 4 ++--
modules/page/tpl/header.html | 4 ++--
modules/page/tpl/mcontent.html | 4 ++--
modules/page/tpl/page_info.html | 2 +-
11 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml
index e169ac982..9e7c640c6 100644
--- a/layouts/user_layout/conf/info.xml
+++ b/layouts/user_layout/conf/info.xml
@@ -14,7 +14,7 @@
製作者名
-