From c23fb74967932d628e1379a8a78a7ab5aa5c9c97 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 17:03:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/assets/images/logo-kisa-ko.png | 0
src/main/webapp/assets/images/logo-kisa.png | 0
src/main/webapp/assets/images/logo-kisa-vertical.png | 0
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html | 2
src/main/webapp/views/user/superUserAdd.html | 2
src/main/webapp/views/user/userAdd.html | 2
src/main/webapp/views/login/login.html | 8 ++--
src/main/webapp/assets/styles/main.css | 44 +++++++++++++--------
src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html | 2
src/main/webapp/assets/images/logo-kisa-en.png | 0
src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html | 4 +-
src/main/java/kr/wisestone/owl/domain/User.java | 3 +
src/main/webapp/assets/images/default-profile-kisa.png | 0
src/main/webapp/views/issue/issueDetail.html | 2
src/main/webapp/views/issue/issueSendMailPartners.html | 6 +++
src/main/webapp/assets/images/logo-kisa-txt.png | 0
16 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 6cb764e..d479a6e 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -15,7 +15,8 @@
public static final String USER_STATUS_ACTIVE = "01"; // �궗�슜�옄 �솢�꽦
public static final String USER_STATUS_DEL = "02"; // �궗�슜�옄 �깉�눜
- public static final String DEFAULT_PROFILE = "assets/images/default_profile.png"; // 湲곕낯 �봽濡쒗븘
+ //public static final String DEFAULT_PROFILE = "assets/images/default_profile.png"; // 湲곕낯 �봽濡쒗븘
+ public static final String DEFAULT_PROFILE = "assets/images/default-profile-kisa.png"; // �씤�꽣�꽬吏꾪씎�썝 湲곕낯 �봽濡쒗븘
//public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "09:00"; // 湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛�
public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "false"; // 湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛� false濡� 蹂�寃�
public static final String DEFAULT_LANGUAGE = "ko"; // 湲곕낯 �뼵�뼱
diff --git a/src/main/webapp/assets/images/default-profile-kisa.png b/src/main/webapp/assets/images/default-profile-kisa.png
new file mode 100644
index 0000000..a3f7a26
--- /dev/null
+++ b/src/main/webapp/assets/images/default-profile-kisa.png
Binary files differ
diff --git a/src/main/webapp/assets/images/logo-kisa-en.png b/src/main/webapp/assets/images/logo-kisa-en.png
new file mode 100644
index 0000000..b1ee00d
--- /dev/null
+++ b/src/main/webapp/assets/images/logo-kisa-en.png
Binary files differ
diff --git a/src/main/webapp/assets/images/logo-kisa-ko.png b/src/main/webapp/assets/images/logo-kisa-ko.png
new file mode 100644
index 0000000..0929f66
--- /dev/null
+++ b/src/main/webapp/assets/images/logo-kisa-ko.png
Binary files differ
diff --git a/src/main/webapp/assets/images/logo-kisa-txt.png b/src/main/webapp/assets/images/logo-kisa-txt.png
new file mode 100644
index 0000000..b387dc3
--- /dev/null
+++ b/src/main/webapp/assets/images/logo-kisa-txt.png
Binary files differ
diff --git a/src/main/webapp/assets/images/logo-kisa-vertical.png b/src/main/webapp/assets/images/logo-kisa-vertical.png
new file mode 100644
index 0000000..5da7d1f
--- /dev/null
+++ b/src/main/webapp/assets/images/logo-kisa-vertical.png
Binary files differ
diff --git a/src/main/webapp/assets/images/logo-kisa.png b/src/main/webapp/assets/images/logo-kisa.png
new file mode 100644
index 0000000..a3f7a26
--- /dev/null
+++ b/src/main/webapp/assets/images/logo-kisa.png
Binary files differ
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 27d63ec..ad1020d 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -12747,13 +12747,15 @@
.menu-w .logo-w .logo-element,
.top-bar .logo-w .logo-element {
content: "";
- width: 60px;
- height: 30px;
- background-image: url(../images/logo-owl.png);
+ width: 110px;
+ height: 40px;
+ background-image: url(../images/logo-kisa-en.png);
+ background-size: cover;
position: relative;
display: inline-block;
vertical-align: middle;
- margin-right: 20px;
+ margin-right: 0px;
+ right: 10px;
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
}
@@ -12761,11 +12763,13 @@
.menu-w .logo-w .logo-element:after,
.top-bar .logo-w .logo-element:after {
content: "";
- width: 105px;
- height: 31px;
- background-image: url(../images/logo-owltxt.png);
+ width: 120px;
+ height: 30px;
+ background-image: url(../images/logo-kisa-txt.png);
+ background-size: cover;
right: -20px;
- left: 70px;
+ left: 110px;
+ top: 10px;
position: absolute;
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
@@ -12773,14 +12777,14 @@
.menu-w .logo-w .logo:hover .logo-element,
.top-bar .logo-w .logo:hover .logo-element {
- -webkit-transform: translateX(5px);
- transform: translateX(5px);
+ -webkit-transform: translateX(2px);
+ transform: translateX(2px);
}
.menu-w .logo-w .logo:hover .logo-element:after,
.top-bar .logo-w .logo:hover .logo-element:after {
- -webkit-transform: translateX(-10px);
- transform: translateX(-10px);
+ -webkit-transform: translateX(-3px);
+ transform: translateX(-3px);
}
.menu-w .logo-w .logo:hover .logo-label:after,
@@ -13020,7 +13024,7 @@
.menu-w .logo-w {
text-align: center;
- padding: 14px 1rem 14px 1.7rem;
+ padding: 10px 1rem 12px 1.1rem;
}
.menu-w .logo-w a {
@@ -14267,7 +14271,7 @@
}
.menu-position-side.menu-w.color-scheme-dark .logo-w {
- background-color: #000035;
+ background-color:#f2f4f8;
}
.menu-position-side.menu-w.color-scheme-dark .element-search:before {
@@ -16662,11 +16666,17 @@
line-height: 20px;
text-align: center;
}
-
-.auth-box-w .auth-header img {
+/* 湲곗〈 濡쒓퀬 �쐞移� 諛� �겕湲� */
+/*.auth-box-w .auth-header img {
width: 70px;
-}
+}*/
+/* �씤�꽣�꽬 吏꾪씎�썝 濡쒓퀬 �쐞移� 諛� �겕湲� 議곗젙*/
+.auth-box-w .auth-header img {
+ width: 120px;
+ position: relative;
+ bottom: 6px;
+}
.auth-box-w form {
padding: 20px 50px;
padding-bottom: 20px;
diff --git a/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html b/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html
index 87f54ca..46867d7 100644
--- a/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html
+++ b/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html
@@ -47,7 +47,7 @@
<img ng-if="settings.imageable && (option.profile != '' && option.profile != undefined) && settings.type == 'user'"
ng-src='{{option.profile}}' class="autocomplte-img">
<img ng-if="settings.imageable && (option.profile == '' || option.profile == undefined) && settings.type == 'user'"
- src="/assets/images/default_profile.png" class="autocomplte-img">
+ src="/assets/images/default-profile-kisa.png" class="autocomplte-img">
{{fn.getPropertyForObject(option, settings.displayProp)}}</label>
</div>
</a>
@@ -71,7 +71,7 @@
<img ng-if="settings.imageable && (option[settings.imagePathProp] != '' && option[settings.imagePathProp] != undefined) && settings.type == 'user'"
ng-src='{{option.profile}}' class="autocomplte-img">
<img ng-if="settings.imageable && (option[settings.imagePathProp] == '' || option[settings.imagePathProp] == undefined) && settings.type == 'user'"
- src="/assets/images/default_profile.png" class="autocomplte-img">
+ src="/assets/images/default-profile-kisa.png" class="autocomplte-img">
<span class="option-span"
translate="{{fn.getPropertyForObject(option, settings.displayProp)}}"></span>
</a>
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html
index e0ea774..06121b4 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html
@@ -17,7 +17,7 @@
<a role="menuitem" data-id="{{fn.getPropertyForObject(option,settings.idProp)}}" class="option-a height-auto"
tabindex="-1" ng-click="fn.selectTarget(fn.getPropertyForObject(option,settings.idProp))">
<img ng-if="settings.imageable && (option.profile != '' && option.profile != undefined) && settings.type == 'user'" ng-src='{{option.profile}}' class="autocomplte-img">
- <img ng-if="settings.imageable && (option.profile == '' || option.profile == undefined) && settings.type == 'user'" src="assets/images/default_profile.png" class="autocomplte-img">
+ <img ng-if="settings.imageable && (option.profile == '' || option.profile == undefined) && settings.type == 'user'" src="assets/images/default-profile-kisa.png" class="autocomplte-img">
<span class="option-span title-span"
translate="{{fn.getPropertyForObject(option, settings.displayProp)}}"></span>
</a>
diff --git a/src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html b/src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html
index ea1ad6f..b9d1355 100644
--- a/src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html
+++ b/src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html
@@ -21,7 +21,7 @@
ng-src='{{option.profile}}'
class="autocomplte-img">
<img ng-if="settings.imageable && (option.profile == '' || option.profile == undefined) && settings.type == 'user'"
- src="assets/images/default_profile.png"
+ src="assets/images/default-profile-kisa.png"
class="autocomplte-img">
<span class="option-span"
translate="{{fn.getPropertyForObject(option, settings.displayProp)}}"></span>
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 91fb912..2eabc4c 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -510,7 +510,7 @@
<span class="info_detail_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
</div>
<div class="col-sm-2">
- <button type="button" class="btn btn-primary form-control input-sm offset-5" ng-click="fn.modifyDownIssueStatus()"
+ <button type="button" class="btn btn-darkgrey form-control input-sm offset-5" ng-click="fn.modifyDownIssueStatus()"
translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</button>
</div>
<div class="col-sm-1">
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index fa28066..ff6ed0f 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -50,6 +50,12 @@
<img ng-show="vm.form.template == 'ISSUE_SEND_3'" style="margin: 50px auto 0;" id="Email-Template3" src="assets/images/emailthumb-hosting.png">
</div>
</div>
+ <summernote
+ class="summernote"
+ lang="ko-KR"
+ config="vm.options"
+ ng-model="vm.form.description"
+ target=".note-editable"></summernote>
</div>
</form>
</div>
diff --git a/src/main/webapp/views/login/login.html b/src/main/webapp/views/login/login.html
index a08cb35..14b673e 100644
--- a/src/main/webapp/views/login/login.html
+++ b/src/main/webapp/views/login/login.html
@@ -5,9 +5,9 @@
<div class="flex">
<div class="loginbackdiv">
<div class="loginback">
- <img src="/assets/images/loginlogo.png"/>
+ <img src="/assets/images/logo-kisa-vertical.png"/>
<div class="stardiv">
- <div class="stars"></div>
+ <!-- <div class="stars"></div>
<div class="twinkling"></div>
</div>
<div class="bgdiv">
@@ -15,14 +15,14 @@
<div class="login-circle">
<div class="circle1"></div>
<div class="circle2"></div>
- <div class="circle3"></div>
+ <div class="circle3"></div>-->
</div>
</div>
</div>
<div class="logincont">
<div class="auth-box-w">
<h3 class="auth-header">
- <img alt="" src="/assets/images/logineyes.png">
+ <img alt="" src="/assets/images/logo-kisa-en.png">
LOG IN
</h3>
<form role="form" ng-enter="fn.login()" name="loginForm">
diff --git a/src/main/webapp/views/user/superUserAdd.html b/src/main/webapp/views/user/superUserAdd.html
index d6e6596..b076b0f 100644
--- a/src/main/webapp/views/user/superUserAdd.html
+++ b/src/main/webapp/views/user/superUserAdd.html
@@ -1,7 +1,7 @@
<div class="content-box">
<div class="row">
<div class="join-box">
- <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-owl-dark.png" class="join-logo"></a>
+ <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-kisa-ko.png" class="join-logo"></a>
<div class="join">
<h4 translate="users.setupOWLITSMembership">OWL ITS 理쒓퀬愿�由ъ옄 �깮�꽦</h4>
<form name="userAddForm">
diff --git a/src/main/webapp/views/user/userAdd.html b/src/main/webapp/views/user/userAdd.html
index 38b8cb0..9cda2f1 100644
--- a/src/main/webapp/views/user/userAdd.html
+++ b/src/main/webapp/views/user/userAdd.html
@@ -1,7 +1,7 @@
<div class="content-box">
<div class="row">
<div class="join-box">
- <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-owl-dark.png" class="join-logo"></a>
+ <a href="http://owlsolution.co.kr" target="_self"><img alt="" src="/assets/images/logo-kisa-ko.png" class="join-logo"></a>
<span class="login-btn"><span translate="users.usedAccount">�씠誘� 怨꾩젙�씠 �엳�쑝�떊媛��슂?</span>
<a class="link" ui-sref="login">Log in</a>
</span>
--
Gitblit v1.8.0