Merge branch 'master' into fixed_issue_355

nobuhiko · Dec 20, 2024 · c55503b · c55503b
2 parents 0a0fc40 + 46e5e42
commit c55503b
Show file tree

Hide file tree

Showing 28 changed files with 2,103 additions and 2,147 deletions.
diff --git a/data/Smarty/templates/admin/admin_popup_header.tpl b/data/Smarty/templates/admin/admin_popup_header.tpl
@@ -29,8 +29,7 @@
 <meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>

diff --git a/data/Smarty/templates/admin/contents/file_manager.tpl b/data/Smarty/templates/admin/contents/file_manager.tpl
@@ -22,6 +22,22 @@
  */
 *}-->
 
+<style>
+#contents-filemanager-tree {
+    float: left;
+    height: 430px;
+}
+#contents-filemanager-right {
+    width: 720px;
+    float: right;
+}
+#tree {
+    width: 230px;
+    border: 3px solid #ddd;
+    padding: 10px;
+    background-color: #F3F3F3;
+}
+</style>
 <script type="text/javascript">//<![CDATA[
     $(function() {
         var bread_crumbs = <!--{$tpl_now_dir}-->;

diff --git a/data/Smarty/templates/admin/login_frame.tpl b/data/Smarty/templates/admin/login_frame.tpl
@@ -29,8 +29,7 @@
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
 <meta name="robots" content="noindex,nofollow" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 

diff --git a/data/Smarty/templates/admin/main_frame.tpl b/data/Smarty/templates/admin/main_frame.tpl
@@ -29,9 +29,7 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
 <meta name="robots" content="noindex,nofollow" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_file_manager.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 

diff --git a/html/admin/css/common.css b/html/admin/css/common.css
diff --git a/html/admin/css/install.css b/html/admin/css/install.css
diff --git a/html/admin/load_module_config.php b/html/admin/load_module_config.php
@@ -39,7 +39,7 @@
 if (!empty($module_id) && is_numeric($module_id)) {
     GC_Utils_Ex::gfPrintLog('loading module ====> module_id = ' . $module_id);
 
-    $objQuery =& SC_Query_Ex::getSingletonInstance();
+    $objQuery = SC_Query_Ex::getSingletonInstance();
     $arrRet = $objQuery->select('module_code', 'dtb_module', 'module_id = ?', array($module_id));
 
     if (isset($arrRet[0]['module_code'])) {

diff --git a/html/test/upgrade/index.php b/html/test/upgrade/index.php
@@ -56,13 +56,13 @@
 );
 
 switch (getMode()) {
-case 'products_list':
-    displayProductsList();
-    break;
+    case 'products_list':
+        displayProductsList();
+        break;
 
-default:
-    displayProductsList();
-    break;
+    default:
+        displayProductsList();
+        break;
 }
 
 /**
@@ -106,7 +106,7 @@ function updateModuleTable($arrProductsList)
 {
     $table = 'dtb_module';
     $where = 'module_id = ?';
-    $objQuery =& SC_Query_Ex::getSingletonInstance();
+    $objQuery = SC_Query_Ex::getSingletonInstance();
 
     $objQuery->begin();
     foreach ($arrProductsList as $arrProduct) {