From 6b09e62261d9468528ecfe419b07fead5688da09 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 09:06:57 +0900
Subject: [PATCH] 이메일 템플릿 수정
---
src/main/webapp/assets/images/email-temp-detail.png | 0
src/main/webapp/assets/images/image-email.png | 0
src/main/webapp/assets/images/email-temp.png | 0
src/main/webapp/views/issue/issueSendMailPartners.html | 84 +++++-----------------------
src/main/webapp/assets/styles/main.css | 26 ++++++--
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 24 +++++++
6 files changed, 57 insertions(+), 77 deletions(-)
diff --git a/src/main/webapp/assets/images/email-temp-detail.png b/src/main/webapp/assets/images/email-temp-detail.png
new file mode 100644
index 0000000..17bb7ea
--- /dev/null
+++ b/src/main/webapp/assets/images/email-temp-detail.png
Binary files differ
diff --git a/src/main/webapp/assets/images/email-temp.png b/src/main/webapp/assets/images/email-temp.png
new file mode 100644
index 0000000..53bc77e
--- /dev/null
+++ b/src/main/webapp/assets/images/email-temp.png
Binary files differ
diff --git a/src/main/webapp/assets/images/image-email.png b/src/main/webapp/assets/images/image-email.png
new file mode 100644
index 0000000..dd4e971
--- /dev/null
+++ b/src/main/webapp/assets/images/image-email.png
Binary files differ
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index ae6d45f..30df0e3 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -123,7 +123,7 @@
body {
margin: 0;
font-family: "Noto Sans", "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
- font-size: 0.84rem;
+ font-size: 0.8rem;
font-weight: 400;
line-height: 1.5;
color: #3E4B5B;
@@ -9884,7 +9884,7 @@
.table tfoot th,
.table thead th {
- font-size: 0.75rem;
+ font-size: 0.8rem;
}
.table th.nowrap {
@@ -21055,7 +21055,7 @@
border: 0px solid #047bf8;
color: #888;
margin-right: 2px;
- font-size: 0.72rem;
+ font-size: 0.8rem;
border-radius: 4px;
margin-bottom: 2px;
margin-top: 2px;
@@ -21068,7 +21068,7 @@
color: darkblue;
font-weight: 600;
margin-right: 2px;
- font-size: 0.72rem;
+ font-size: 0.8rem;
border-radius: 4px;
margin-bottom: 2px;
margin-top: 2px;
@@ -28488,9 +28488,23 @@
margin-right: 20px !important;
}
+.mr-30 {
+ margin-right: 30px !important;
+}
+
+
.ml-10 {
margin-left: 10px !important;
}
+
+.ml-20 {
+ margin-left: 20px !important;
+}
+
+.ml-30 {
+ margin-left: 30px !important;
+}
+
.m-0 {
margin: 0 auto !important;
@@ -30357,10 +30371,10 @@
.h3-div {
font-size: 1.75rem;
}
-
+/*translate="issue.issueTitle"*/
.info_font {
color: #000;
- font-size: 1rem;
+ font-size: 0.8rem;
line-height: 1.5;
font-weight: 600;
}
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index ffdf7fc..a6a44a2 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -15,7 +15,8 @@
removeMailTarget : removeMailTarget,
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- changeTemplate : changeTemplate
+ changeTemplate : changeTemplate,
+ showEmailTemplate : showEmailTemplate,
};
$scope.vm = {
@@ -124,7 +125,6 @@
function changeTemplate(templateId){
$scope.vm.form.template = templateId;
- // var matches = document.getElementsByClassName('TemplateIMG');
var elements = document.getElementsByClassName("TemplateIMG");
for (let i = elements.length - 1; i >= 0; i--) {
@@ -135,5 +135,25 @@
}
}
}
+
+ function showEmailTemplate() {
+ const div1 = document.getElementById('Email-Template1');
+ const div2 = document.getElementById('Email-Template2');
+
+ if(div1.style.display === 'none') {
+ div1.style.display = 'block';
+ } else if (div1.style.display === 'block') {
+ div1.style.display = 'none';
+ }
+ if (div2.style.display == 'none') {
+ div2.style.display = 'block';
+ } else if (div2.style.display == 'block') {
+ div2.style.display = 'none';
+ }
+ }
}]);
});
+// $("Email-Template1").toggle(500) // show
+// document.getElementById("Email-Template1").style.display = "none"; // hide
+// $("Email-Template2").toggle(500) ; // show
+// document.getElementById("Email-Template2").style.display = "none"; // hide
\ No newline at end of file
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 9b3f8b8..13f14d8 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -13,11 +13,11 @@
<div class="form-group">
<small translate="issue.sendIssueSelectedUsers">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
- <span>{{user.name}}({{user.account}})</span>
- <span class="select3-selection__choice__remove"
- ng-click="fn.removeMailTarget($index)">횞</span>
- </span>
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
+ <span>{{user.name}}({{user.account}})</span>
+ <span class="select3-selection__choice__remove"
+ ng-click="fn.removeMailTarget($index)">횞</span>
+ </span>
</div>
<js-input-autocomplete data-input-name="mailUsers"
@@ -33,12 +33,13 @@
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
<div class="Template-area mt-20">
- <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�
+ <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label>
<div class="mt-20">
- <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/btn_naver.PNG" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/btn_google.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
- <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/btn_kakao.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
+ <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
+ <img id="ISSUE_SEND_2" class="TemplateIMG ml-30 mr-30" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
+ <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
</div>
+ <input class="btn-toggled btn-primary table-bordered" style="float: left" type="button" value="�뀥�뵆由�" ng-click="fn.showEmailTemplate()">
</div>
</div>
</form>
@@ -53,63 +54,8 @@
ng-click="fn.formSubmit()"><span translate="issue.sendMail">�씠硫붿씪 諛쒖넚</span>
</button>
</div>
-</div>
-
-<!-- <js-autocomplete-single data-input-name="issue"-->
-<!-- selected-model="vm.form.issues"-->
-<!-- search="vm.issueName"-->
-<!-- source="fn.getIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"-->
-<!-- page="vm.autoCompletePage.issue.page"-->
-<!-- total-page="vm.autoCompletePage.issue.totalPage"-->
-<!-- input-disabled="false"-->
-<!-- translation-texts="{ empty : 'common.emptyIssue' }"-->
-<!-- extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',-->
-<!-- type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
-
-
-<!-- <ng-dropdown-multiselect class="multiSelect cursor"-->
-<!-- data-input-name="companyFieldsEmail"-->
-<!-- selected-model="vm.form.companyFieldsEmail.concat(vm.form.ispFieldsEmail,vm.form.hostingFieldsEmail)"-->
-<!-- extra-settings="{ stringTypeOption : true }"-->
-<!-- options="vm.options.companyFieldsEmail"></ng-dropdown-multiselect>-->
-
-<!-- <span class="issue-detail-label" translate="companyField.info"></span>-->
-<!-- <input ng-if="vm.form.companyFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.companyFieldsEmail">-->
-
-<!-- <span class="issue-detail-label" translate="ispField.info"></span>-->
-<!-- <input ng-if="vm.form.ispFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.ispFieldsEmail">-->
-
-<!-- <span class="issue-detail-label" translate="hostingField.info"></span>-->
-<!-- <input ng-if="vm.form.hostingFieldsEmail != null"-->
-<!-- type="text"-->
-<!-- class="form-control"-->
-<!-- kr-input-->
-<!-- autocomplete="off"-->
-<!-- ng-model="vm.form.hostingFieldsEmail">-->
-
-<!-- <h6>{{vm.form.companyFieldsEmail}}</h6>-->
-<!-- <span>{{vm.form.id}}===============</span>-->
-<!-- <h6>{{vm.form.ispFieldsEmail}}===============</h6>-->
-<!-- <span>===============</span>-->
-<!-- <h6>{{vm.form.hostingFieldsEmail}}</h6>-->
-<!-- <div style="display: flex; text-align: center">-->
-<!-- �뀥�뵆由�1-->
-<!-- </div>-->
-<!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- �뀥�뵆由�2-->
- <!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- </div>-->
-<!-- <div style="border: 1px #111111; margin-left: 20px; box-sizing: border-box;">-->
-<!-- �뀥�뵆由�3-->
-<!-- </div>-->
-<!-- </div>-->
+ <div>
+ <img style="height: 350px; width: 330px; display: none; margin: 0 auto;" class="mt-20" id="Email-Template1" src="assets/images/email-temp-detail.png">
+ <img style="height: 350px; width: 330px; display: none; margin: 0 auto;" class="mt-20 mb-30" id="Email-Template2" src="assets/images/email-temp.png">
+ </div>
+</div>
\ No newline at end of file
--
Gitblit v1.8.0