Merge branch 'master' into fixed_issue_622

EC-CUBE · Dec 20, 2024 · c4e3e7b · c4e3e7b
2 parents 00b9bad + be45d5e
commit c4e3e7b
Show file tree

Hide file tree

Showing 17 changed files with 2,138 additions and 3,922 deletions.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,8 @@
         "nanasess/php8-compat": "^1.0",
         "pear/archive_tar": "^1.4.3",
         "pear/mail": "*",
+        "pear/net_smtp": "^1.12",
+        "pear/net_socket": "^1.2",
         "pear/pear-core-minimal": "^1.10",
         "pear/xml_parser": "*",
         "pear/xml_serializer": "*",

diff --git a/composer.lock b/composer.lock
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>