OWL ITS + 탐지시스템(인터넷 진흥원)
wyu
2021-12-08 d211fc6cb663961d5ebd30dd59a648f8ebcce351
인터넷 진흥원 로고 변경 진행중
6개 파일 추가됨
10개 파일 변경됨
75 ■■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/domain/User.java 3 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/default-profile-kisa.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/logo-kisa-en.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/logo-kisa-ko.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/logo-kisa-txt.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/logo-kisa-vertical.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/images/logo-kisa.png 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/styles/main.css 44 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.html 4 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-input-autocomplete/js-input-autocomplete.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueDetail.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueSendMailPartners.html 6 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/login/login.html 8 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/user/superUserAdd.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/user/userAdd.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
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"; //  기본 언어
src/main/webapp/assets/images/default-profile-kisa.png
src/main/webapp/assets/images/logo-kisa-en.png
src/main/webapp/assets/images/logo-kisa-ko.png
src/main/webapp/assets/images/logo-kisa-txt.png
src/main/webapp/assets/images/logo-kisa-vertical.png
src/main/webapp/assets/images/logo-kisa.png
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;
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>
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>
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>
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">
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>
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">
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">
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>