From 70000ea89eb68b299a66116876295cc31792be69 Mon Sep 17 00:00:00 2001
From: sai_tanaka <tanaka@sai-net.jp>
Date: Thu, 19 Jul 2018 17:38:58 +0900
Subject: [PATCH] =?UTF-8?q?#67=20=E3=80=90=E3=83=AC=E3=82=A4=E3=82=A2?=
 =?UTF-8?q?=E3=82=A6=E3=83=88=E7=AE=A1=E7=90=86=E3=80=91=E3=83=96=E3=83=AD?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E5=90=8D=E3=81=8C=E3=80=8C...=E3=80=8D?=
 =?UTF-8?q?=E3=81=A7=E7=9C=81=E7=95=A5=E3=81=95=E3=82=8C=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codeception/_support/Page/Admin/LayoutEditPage.php           | 3 ---
 src/Eccube/Resource/template/admin/Content/layout.twig       | 2 +-
 src/Eccube/Resource/template/admin/Content/layout_block.twig | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/codeception/_support/Page/Admin/LayoutEditPage.php b/codeception/_support/Page/Admin/LayoutEditPage.php
index cbaed03d5ae..9eeb2c9236f 100644
--- a/codeception/_support/Page/Admin/LayoutEditPage.php
+++ b/codeception/_support/Page/Admin/LayoutEditPage.php
@@ -32,9 +32,6 @@ public function 登録()
 
     public function ブロックを移動($blockName, $dest, $timeout = 10)
     {
-        if (mb_strlen($blockName) > 10) {
-            $blockName = mb_substr($blockName, 0, 10).'…';
-        }
         $this->tester->waitForElementVisible(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][a[text()='${blockName}']]]]"], $timeout);
         $this->tester->dragAndDrop(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][a[text()='${blockName}']]]]"], $dest);
         return $this;
diff --git a/src/Eccube/Resource/template/admin/Content/layout.twig b/src/Eccube/Resource/template/admin/Content/layout.twig
index b095e433d31..26b974724b2 100644
--- a/src/Eccube/Resource/template/admin/Content/layout.twig
+++ b/src/Eccube/Resource/template/admin/Content/layout.twig
@@ -443,7 +443,7 @@ file that was distributed with this source code.
                                                                    data-id="{{ UnusedBlock.id }}"
                                                                    data-name="{{ UnusedBlock.name }}"
                                                                    title="{{ UnusedBlock.name }}"
-                                                                >{{ UnusedBlock.name|length > 10 ? UnusedBlock.name|slice(0, 10) ~ '…' : UnusedBlock.name }}</a>
+                                                                >{{ UnusedBlock.name }}</a>
                                                             </div>
                                                             <div class="col-auto text-right">
                                                                 <input type="hidden" class="name" name="name_{{ loop_index }}"
diff --git a/src/Eccube/Resource/template/admin/Content/layout_block.twig b/src/Eccube/Resource/template/admin/Content/layout_block.twig
index 6cd8eab11dc..d28b58d4a7a 100644
--- a/src/Eccube/Resource/template/admin/Content/layout_block.twig
+++ b/src/Eccube/Resource/template/admin/Content/layout_block.twig
@@ -17,7 +17,7 @@ file that was distributed with this source code.
                data-id="{{ BlockPosition.Block.id }}"
                data-name="{{ BlockPosition.Block.name }}"
                title="{{ BlockPosition.Block.name }}"
-            >{{ BlockPosition.Block.name|length > 10 ? BlockPosition.Block.name|slice(0, 10) ~ '…' : BlockPosition.Block.name }}</a>
+            >{{ BlockPosition.Block.name }}</a>
         </div>
         <div class="col-auto text-right">
             <div class="d-inline-block px-3 sort{% if loop.first %} first{% endif %}">