From 8d3a2add8eb7df46611bb786acdd5883e03dec76 Mon Sep 17 00:00:00 2001
From: kato <kato@e-catchup.jp>
Date: Tue, 13 Aug 2019 18:34:29 +0900
Subject: [PATCH] =?UTF-8?q?fix=20=E3=83=A1=E3=83=BC=E3=83=AB=E3=83=97?=
 =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AE=E3=83=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=20?=
 =?UTF-8?q?=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2=E3=81=A7=E3=80=81=E3=80=8C?=
 =?UTF-8?q?=E6=B3=A8=E6=84=8F=E6=9B=B8=E3=81=8D=E3=80=8D=E3=80=8C=E8=AA=AC?=
 =?UTF-8?q?=E6=98=8E=E6=96=87=E3=80=8D=E3=81=AE=E4=BD=BF=E3=81=84=E6=96=B9?=
 =?UTF-8?q?=E3=81=8C=E3=82=8F=E3=81=8B=E3=82=8A=E3=81=AB=E3=81=8F=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B1=BA=20=E3=83=BB?=
 =?UTF-8?q?=E5=BE=8C=E6=96=B9=E4=BA=92=E6=8F=9B=E3=82=82=E8=80=83=E6=85=AE?=
 =?UTF-8?q?=E3=81=97=E3=80=81=E5=85=A5=E5=8A=9B=E7=94=BB=E9=9D=A2=E3=81=AE?=
 =?UTF-8?q?UI=E3=81=AE=E8=AA=BF=E6=95=B4=E3=81=AE=E3=81=BF=E3=81=A7?=
 =?UTF-8?q?=E5=AE=8C=E7=B5=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mail/View/MailFields/admin/form.php       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/Baser/Plugin/Mail/View/MailFields/admin/form.php b/lib/Baser/Plugin/Mail/View/MailFields/admin/form.php
index 0b65ea9b7a..97fd79ef66 100755
--- a/lib/Baser/Plugin/Mail/View/MailFields/admin/form.php
+++ b/lib/Baser/Plugin/Mail/View/MailFields/admin/form.php
@@ -96,11 +96,16 @@
 				<?php echo $this->BcForm->error('MailField.valid') ?>
 			</td>
 		</tr>
-		<tr id="RowAttention">
-			<th class="col-head"><?php echo $this->BcForm->label('MailField.attention', __d('baser', '注意書き')) ?></th>
+		<tr id="RowDescription">
+			<th class="col-head">
+				<?php echo $this->BcForm->label('MailField.description', __d('baser', '説明文')) ?>
+				<br><small>※ 送信しない前見出し</small>
+				<?php echo $this->BcHtml->image('admin/icn_help.png', array('id' => 'helpDescription', 'class' => 'btn help', 'alt' => __d('baser', 'ヘルプ'))) ?>
+				<div id="helptextDescription" class="helptext"> <?php echo __d('baser', '姓・名などメール本文に入れない内容を入力してください。')?> </div>
+			</th>
 			<td class="col-input">
-				<?php echo $this->BcForm->input('MailField.attention', array('type' => 'textarea', 'cols' => 35, 'rows' => 3)) ?>
-				<?php echo $this->BcForm->error('MailField.attention') ?>
+				<?php echo $this->BcForm->input('MailField.description', array('type' => 'textarea', 'cols' => 35, 'rows' => 3)) ?>
+				<?php echo $this->BcForm->error('MailField.description') ?>
 			</td>
 		</tr>
 		<tr id="RowBeforeAttachment">
@@ -117,11 +122,16 @@
 				<?php echo $this->BcForm->error('MailField.after_attachment') ?>
 			</td>
 		</tr>
-		<tr id="RowDescription">
-			<th class="col-head"><?php echo $this->BcForm->label('MailField.description', __d('baser', '説明文')) ?></th>
+		<tr id="RowAttention">
+			<th class="col-head">
+				<?php echo $this->BcForm->label('MailField.attention', __d('baser', '注意書き')) ?>
+				<br><small>※ 送信しない後見出し</small>
+				<?php echo $this->BcHtml->image('admin/icn_help.png', array('id' => 'helpAttention', 'class' => 'btn help', 'alt' => __d('baser', 'ヘルプ'))) ?>
+				<div id="helptextAttention" class="helptext"> <?php echo __d('baser', '「確認のためもう一度入力してください」などメール本文に入れない内容を入力してください。')?> </div>
+			</th>
 			<td class="col-input">
-				<?php echo $this->BcForm->input('MailField.description', array('type' => 'textarea', 'cols' => 35, 'rows' => 3)) ?>
-				<?php echo $this->BcForm->error('MailField.description') ?>
+				<?php echo $this->BcForm->input('MailField.attention', array('type' => 'textarea', 'cols' => 35, 'rows' => 3)) ?>
+				<?php echo $this->BcForm->error('MailField.attention') ?>
 			</td>
 		</tr>
 		<tr id="RowSource">