하석형
04-11
Merge branch 'master' of http://210.180.118.83/jhpark/cms_frontend
@8cff3e202184521a9df583b1535bcddf9966babe
--- client/resources/scss/admin/content.scss
+++ client/resources/scss/admin/content.scss
... | ... | @@ -187,6 +187,10 @@ |
| 187 | 187 |
width: 100%; |
| 188 | 188 |
} |
| 189 | 189 |
} |
| 190 |
+ |
|
| 191 |
+ >div.modal-back{
|
|
| 192 |
+ max-width: 100%; |
|
| 193 |
+ } |
|
| 190 | 194 |
|
| 191 | 195 |
|
| 192 | 196 |
|
... | ... | @@ -194,9 +198,6 @@ |
| 194 | 198 |
grid-column: 1/3; |
| 195 | 199 |
} |
| 196 | 200 |
|
| 197 |
- &:nth-child(1),:nth-child(2){
|
|
| 198 |
- padding-top: 0; |
|
| 199 |
- } |
|
| 200 | 201 |
|
| 201 | 202 |
&:last-child{
|
| 202 | 203 |
grid-column: 1/3; |
... | ... | @@ -435,8 +436,8 @@ |
| 435 | 436 |
} |
| 436 | 437 |
|
| 437 | 438 |
.tbl-wrap{
|
| 438 |
- // height: 100%; |
|
| 439 |
- // box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
| 439 |
+ border: 1px solid var(--tk-gray-30); |
|
| 440 |
+ border-radius: 1rem; |
|
| 440 | 441 |
|
| 441 | 442 |
.tbl{
|
| 442 | 443 |
max-width: 100%; |
... | ... | @@ -465,14 +466,17 @@ |
| 465 | 466 |
tr{
|
| 466 | 467 |
&:last-child{
|
| 467 | 468 |
td{
|
| 469 |
+ border-bottom: 0; |
|
| 468 | 470 |
&:first-child{
|
| 469 | 471 |
border-radius: 0 0 0 1rem; |
| 470 | 472 |
} |
| 471 | 473 |
&:last-child{
|
| 472 | 474 |
border-radius: 0 0 1rem 0; |
| 473 | 475 |
} |
| 474 |
- |
|
| 475 |
- border-bottom: 0; |
|
| 476 |
+ &.data-none{
|
|
| 477 |
+ border-radius: 0 0 1rem 1rem; |
|
| 478 |
+ text-align: center; |
|
| 479 |
+ } |
|
| 476 | 480 |
|
| 477 | 481 |
} |
| 478 | 482 |
} |
... | ... | @@ -487,6 +491,8 @@ |
| 487 | 491 |
} |
| 488 | 492 |
} |
| 489 | 493 |
} |
| 494 |
+ |
|
| 495 |
+ |
|
| 490 | 496 |
} |
| 491 | 497 |
} |
| 492 | 498 |
} |
... | ... | @@ -776,6 +782,10 @@ |
| 776 | 782 |
} |
| 777 | 783 |
} |
| 778 | 784 |
} |
| 785 |
+ |
|
| 786 |
+ .auth-btn{
|
|
| 787 |
+ width: 120px; |
|
| 788 |
+ } |
|
| 779 | 789 |
} |
| 780 | 790 |
|
| 781 | 791 |
|
--- client/resources/scss/common/component/_pagination.scss
+++ client/resources/scss/common/component/_pagination.scss
... | ... | @@ -8,6 +8,8 @@ |
| 8 | 8 |
border: 1px solid var(--tk-gray-30); |
| 9 | 9 |
border-radius: var(--tk-rd-10); |
| 10 | 10 |
margin: 0 .5rem; |
| 11 |
+ cursor: pointer; |
|
| 12 |
+ user-select: none; |
|
| 11 | 13 |
|
| 12 | 14 |
&.active{
|
| 13 | 15 |
background-color: var(--tk-main-50); |
--- client/resources/scss/common/component/_tree.scss
+++ client/resources/scss/common/component/_tree.scss
... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 |
} |
| 8 | 8 |
|
| 9 | 9 |
>div.select {
|
| 10 |
- border: 1px solid var(--tk-primary); |
|
| 10 |
+ border: 1px solid var(--tk-main-50); |
|
| 11 | 11 |
border-radius: var(--tk-rd-12); |
| 12 | 12 |
} |
| 13 | 13 |
|
... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
} |
| 27 | 27 |
|
| 28 | 28 |
>div.node-wrap.selected{
|
| 29 |
- border: 1px solid var(--tk-primary); |
|
| 29 |
+ border: 1px solid var(--tk-main-50); |
|
| 30 | 30 |
border-radius: var(--tk-rd-12); |
| 31 | 31 |
|
| 32 | 32 |
} |
... | ... | @@ -37,8 +37,8 @@ |
| 37 | 37 |
// margin-bottom: 1rem; |
| 38 | 38 |
|
| 39 | 39 |
.node-wrap.selected{
|
| 40 |
- background-color: var(--tk-primary); |
|
| 41 |
- color: var(--tk-white); |
|
| 40 |
+ background-color: var(--tk-main-10); |
|
| 41 |
+ color: var(--tk-main-50); |
|
| 42 | 42 |
font-weight: 700; |
| 43 | 43 |
} |
| 44 | 44 |
} |
... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 |
span.bullet{
|
| 47 | 47 |
width: .5rem; |
| 48 | 48 |
height: .5rem; |
| 49 |
- background-color: var(--tk-main-10); |
|
| 49 |
+ background-color: var(--tk-main-40); |
|
| 50 | 50 |
border-radius: 50%; |
| 51 | 51 |
margin-right: 1rem; |
| 52 | 52 |
} |
--- client/views/component/userInfo/UserAuthorList.vue
+++ client/views/component/userInfo/UserAuthorList.vue
... | ... | @@ -2,11 +2,11 @@ |
| 2 | 2 |
|
| 3 | 3 |
<label class="form-title"><span>*</span> 사용자 권한</label> |
| 4 | 4 |
<div class="form-group"> |
| 5 |
- <button v-show="editMode != 'view'" class="btn sm ico-plus" @click="fnAuthAddModalOpen">권한 추가</button> |
|
| 5 |
+ <button v-show="editMode != 'view'" class="btn sm ico-plus-w auth-btn" @click="fnAuthAddModalOpen">권한 추가</button> |
|
| 6 | 6 |
<template v-if="mbrVO.authorList != null && mbrVO.authorList != []"> |
| 7 | 7 |
<div v-for="(auth, index) of mbrVO.authorList" :key="index" |
| 8 | 8 |
:class="{
|
| 9 |
- 'flex align-center border radius pd10 inline-block': true, |
|
| 9 |
+ 'layout': true, |
|
| 10 | 10 |
ml10: index != 0, |
| 11 | 11 |
}" |
| 12 | 12 |
> |
... | ... | @@ -30,48 +30,50 @@ |
| 30 | 30 |
<div class="modal-title"> |
| 31 | 31 |
<p>사용자 권한 목록</p> |
| 32 | 32 |
</div> |
| 33 |
- <button class="close-btn" @click="fnAuthAddModalClose">X</button> |
|
| 33 |
+ <button class="btn-close" @click="fnAuthAddModalClose"></button> |
|
| 34 | 34 |
</template> |
| 35 | 35 |
|
| 36 |
- <table class="form-table2 mb10"> |
|
| 37 |
- <colgroup> |
|
| 38 |
- <col style="width: 70%" /> |
|
| 39 |
- <col style="width: 30%" /> |
|
| 40 |
- </colgroup> |
|
| 41 |
- <thead> |
|
| 42 |
- <tr> |
|
| 43 |
- <th>권한명</th> |
|
| 44 |
- <th>비고</th> |
|
| 45 |
- </tr> |
|
| 46 |
- </thead> |
|
| 47 |
- <tbody> |
|
| 48 |
- <template v-if="userAuthorList.length > 0"> |
|
| 49 |
- <tr v-for="(authrt, index) of userAuthorList" :key="index"> |
|
| 50 |
- <td>{{ authrt["authrtNm"] }}</td>
|
|
| 51 |
- <td> |
|
| 52 |
- <button |
|
| 53 |
- type="button" |
|
| 54 |
- :class="{
|
|
| 55 |
- 'large-btn': true, |
|
| 56 |
- 'blue-btn': pageRole == 'adm', |
|
| 57 |
- 'green-btn': pageRole == 'portal', |
|
| 58 |
- }" |
|
| 59 |
- @click="fnAuthSelect(authrt)" |
|
| 60 |
- > |
|
| 61 |
- 선택 |
|
| 62 |
- </button> |
|
| 63 |
- </td> |
|
| 64 |
- </tr> |
|
| 65 |
- </template> |
|
| 66 |
- <template v-else> |
|
| 36 |
+ <div class="tbl-wrap"> |
|
| 37 |
+ <table class="tbl data"> |
|
| 38 |
+ <colgroup> |
|
| 39 |
+ <col style="width: 70%" /> |
|
| 40 |
+ <col style="width: 30%" /> |
|
| 41 |
+ </colgroup> |
|
| 42 |
+ <thead> |
|
| 67 | 43 |
<tr> |
| 68 |
- <td colspan="2" class="text-ct data-none"> |
|
| 69 |
- 등록된 정보가 존재하지 않습니다. |
|
| 70 |
- </td> |
|
| 44 |
+ <th>권한명</th> |
|
| 45 |
+ <th>비고</th> |
|
| 71 | 46 |
</tr> |
| 72 |
- </template> |
|
| 73 |
- </tbody> |
|
| 74 |
- </table> |
|
| 47 |
+ </thead> |
|
| 48 |
+ <tbody> |
|
| 49 |
+ <template v-if="userAuthorList.length > 0"> |
|
| 50 |
+ <tr v-for="(authrt, index) of userAuthorList" :key="index"> |
|
| 51 |
+ <td>{{ authrt["authrtNm"] }}</td>
|
|
| 52 |
+ <td> |
|
| 53 |
+ <button |
|
| 54 |
+ type="button" |
|
| 55 |
+ :class="{
|
|
| 56 |
+ 'large-btn': true, |
|
| 57 |
+ 'blue-btn': pageRole == 'adm', |
|
| 58 |
+ 'green-btn': pageRole == 'portal', |
|
| 59 |
+ }" |
|
| 60 |
+ @click="fnAuthSelect(authrt)" |
|
| 61 |
+ > |
|
| 62 |
+ 선택 |
|
| 63 |
+ </button> |
|
| 64 |
+ </td> |
|
| 65 |
+ </tr> |
|
| 66 |
+ </template> |
|
| 67 |
+ <template v-else> |
|
| 68 |
+ <tr> |
|
| 69 |
+ <td colspan="2" class="text-ct data-none"> |
|
| 70 |
+ 등록된 정보가 존재하지 않습니다. |
|
| 71 |
+ </td> |
|
| 72 |
+ </tr> |
|
| 73 |
+ </template> |
|
| 74 |
+ </tbody> |
|
| 75 |
+ </table> |
|
| 76 |
+ </div> |
|
| 75 | 77 |
<template v-slot:footer></template> |
| 76 | 78 |
</Modal> |
| 77 | 79 |
</template> |
--- client/views/component/userInfo/UserInfoInsert.vue
+++ client/views/component/userInfo/UserInfoInsert.vue
... | ... | @@ -259,7 +259,7 @@ |
| 259 | 259 |
/> |
| 260 | 260 |
</div> |
| 261 | 261 |
</template> |
| 262 |
- <div class="layout" v-if="showOpt.isCntrlRsn"> |
|
| 262 |
+ <div class="layout border-bottom" v-if="showOpt.isCntrlRsn"> |
|
| 263 | 263 |
<label class="form-title">차단 사유</label> |
| 264 | 264 |
<input |
| 265 | 265 |
type="text" |
... | ... | @@ -269,7 +269,7 @@ |
| 269 | 269 |
placeholder="차단 사유를 입력하세요." |
| 270 | 270 |
/> |
| 271 | 271 |
</div> |
| 272 |
- <div v-if="showOpt.isAuthor && pageRole == 'adm'" class="layout"> |
|
| 272 |
+ <div v-if="showOpt.isAuthor && pageRole == 'adm'" class="layout grid-column"> |
|
| 273 | 273 |
<UserAuthorList :mbrVO="mbrVO" /> |
| 274 | 274 |
</div> |
| 275 | 275 |
</div> |
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
... | ... | @@ -86,8 +86,8 @@ |
| 86 | 86 |
</div> |
| 87 | 87 |
<div class="layout"> |
| 88 | 88 |
<label class="form-title">첨부파일 확장자</label> |
| 89 |
- <div> |
|
| 90 |
- <div class="input-group"> |
|
| 89 |
+ <div class="form-group"> |
|
| 90 |
+ <div class="layout border-none"> |
|
| 91 | 91 |
<input type="text" class="form-control sm" v-model="inputExtNm" placeholder="첨부파일 확장자를 입력하세요" |
| 92 | 92 |
@keyup.enter="addinputExtNm" /> |
| 93 | 93 |
<button class="btn-ico xsm ico-plus" @click="addinputExtNm" title="추가"></button> |
--- client/views/pages/adm/departmentManagement/DepartmentManagement.vue
+++ client/views/pages/adm/departmentManagement/DepartmentManagement.vue
... | ... | @@ -56,6 +56,7 @@ |
| 56 | 56 |
class="form-control sm" |
| 57 | 57 |
:disabled="isFormDisabled" |
| 58 | 58 |
v-model="viewDept.deptNm" |
| 59 |
+ placeholder="부서명을 입력해주세요" |
|
| 59 | 60 |
/> |
| 60 | 61 |
</div> |
| 61 | 62 |
<div class="grid-column layout"> |
... | ... | @@ -78,10 +79,11 @@ |
| 78 | 79 |
<div class="grid-column layout"> |
| 79 | 80 |
<label class="form-title">부서설명</label> |
| 80 | 81 |
<textarea |
| 81 |
- class="form-control lg area" |
|
| 82 |
+ class="form-control sm area" |
|
| 82 | 83 |
style="min-height: 3rem" |
| 83 | 84 |
:disabled="isFormDisabled" |
| 84 | 85 |
v-model="viewDept.deptExpln" |
| 86 |
+ placeholder="부서에 대한 설명을 입력해주세요" |
|
| 85 | 87 |
></textarea> |
| 86 | 88 |
</div> |
| 87 | 89 |
</div> |
--- client/views/pages/adm/popup/PopupManagementInsert.vue
+++ client/views/pages/adm/popup/PopupManagementInsert.vue
... | ... | @@ -20,6 +20,7 @@ |
| 20 | 20 |
<div class="layout"> |
| 21 | 21 |
<label class="form-title">게시일</label> |
| 22 | 22 |
<div class="input-group"> |
| 23 |
+ <div class="form-control sm cal"> |
|
| 23 | 24 |
<VueDatePicker |
| 24 | 25 |
v-model="popup['bgngDt']" |
| 25 | 26 |
ref="bgngDt" |
... | ... | @@ -28,7 +29,9 @@ |
| 28 | 29 |
locale="ko" |
| 29 | 30 |
inputFormat="yyyy-mm-dd" |
| 30 | 31 |
/> |
| 32 |
+ </div> |
|
| 31 | 33 |
<div class="pd10">-</div> |
| 34 |
+ <div class="form-control sm cal"> |
|
| 32 | 35 |
<VueDatePicker |
| 33 | 36 |
v-model="popup['endDt']" |
| 34 | 37 |
ref="endDt" |
... | ... | @@ -37,6 +40,7 @@ |
| 37 | 40 |
locale="ko" |
| 38 | 41 |
inputFormat="yyyy-mm-dd" |
| 39 | 42 |
/> |
| 43 |
+ </div> |
|
| 40 | 44 |
</div> |
| 41 | 45 |
</div> |
| 42 | 46 |
<div class="layout"> |
--- client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue
+++ client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue
... | ... | @@ -43,15 +43,15 @@ |
| 43 | 43 |
<div class="layout"> |
| 44 | 44 |
<label for="" class="form-title">코드</label> |
| 45 | 45 |
<input type="text" class="form-control sm" :disabled="isFormDisabled || !submitStts" |
| 46 |
- v-model="viewCode.cd" /> |
|
| 46 |
+ v-model="viewCode.cd" placeholder="코드를 입력해주세요"/> |
|
| 47 | 47 |
</div> |
| 48 | 48 |
<div class="layout"> |
| 49 | 49 |
<label for="" class="form-title">코드명</label> |
| 50 |
- <input type="text" class="form-control sm" :disabled="isFormDisabled" v-model="viewCode.cdNm" /> |
|
| 50 |
+ <input type="text" class="form-control sm" :disabled="isFormDisabled" v-model="viewCode.cdNm" placeholder="코드명을 입력해주세요"/> |
|
| 51 | 51 |
</div> |
| 52 | 52 |
<div class="layout"> |
| 53 | 53 |
<label for="" class="form-title">코드값</label> |
| 54 |
- <input type="text" class="form-control sm" :disabled="isFormDisabled" v-model="viewCode.cdVl" /> |
|
| 54 |
+ <input type="text" class="form-control sm" :disabled="isFormDisabled" v-model="viewCode.cdVl" placeholder="코드값을 입력해주세요"/> |
|
| 55 | 55 |
</div> |
| 56 | 56 |
<div class="border-bottom layout"> |
| 57 | 57 |
<label for="" class="form-title">사용여부</label> |
... | ... | @@ -70,7 +70,7 @@ |
| 70 | 70 |
</div> |
| 71 | 71 |
<div class="grid-column layout"> |
| 72 | 72 |
<label for="textarea" class="form-title" style="vertical-align: top;">코드설명</label> |
| 73 |
- <textarea class="form-control" id="textarea" :disabled="isFormDisabled" v-model="viewCode.cdExpln" style="height: 100%;"></textarea> |
|
| 73 |
+ <textarea class="form-control sm" id="textarea" :disabled="isFormDisabled" v-model="viewCode.cdExpln" style="height: 100%;" placeholder="코드설명을 입력해주세요"></textarea> |
|
| 74 | 74 |
</div> |
| 75 | 75 |
</div> |
| 76 | 76 |
</div> |
--- client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementInsert.vue
+++ client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementInsert.vue
... | ... | @@ -16,6 +16,7 @@ |
| 16 | 16 |
class="form-control sm" |
| 17 | 17 |
v-model="contsTypeVO.contsKornNm" |
| 18 | 18 |
ref="contsKornNm" |
| 19 |
+ placeholder="콘텐츠 한글명을 입력해주세요" |
|
| 19 | 20 |
/> |
| 20 | 21 |
</div> |
| 21 | 22 |
<div class="layout"> |
... | ... | @@ -27,6 +28,7 @@ |
| 27 | 28 |
class="form-control sm" |
| 28 | 29 |
v-model="contsTypeVO.contsEngNm" |
| 29 | 30 |
ref="contsEngNm" |
| 31 |
+ placeholder="콘텐츠 영문명을 입력해주세요" |
|
| 30 | 32 |
/> |
| 31 | 33 |
</div> |
| 32 | 34 |
<div class="layout"> |
... | ... | @@ -38,6 +40,7 @@ |
| 38 | 40 |
class="form-control sm" |
| 39 | 41 |
v-model="contsTypeVO.mngrPageCrs" |
| 40 | 42 |
ref="mngrPageCrs" |
| 43 |
+ placeholder="관리자 path를 입력해주세요" |
|
| 41 | 44 |
/> |
| 42 | 45 |
</div> |
| 43 | 46 |
<div class="layout"> |
... | ... | @@ -49,6 +52,7 @@ |
| 49 | 52 |
class="form-control sm" |
| 50 | 53 |
v-model="contsTypeVO.pageCrs" |
| 51 | 54 |
ref="pageCrs" |
| 55 |
+ placeholder="사용자 path를 입력해주세요" |
|
| 52 | 56 |
/> |
| 53 | 57 |
</div> |
| 54 | 58 |
<div class="layout"> |
... | ... | @@ -60,6 +64,7 @@ |
| 60 | 64 |
class="form-control sm" |
| 61 | 65 |
v-model="contsTypeVO.compnCrs" |
| 62 | 66 |
ref="compnCrs" |
| 67 |
+ placeholder="component url을 입력해주세요" |
|
| 63 | 68 |
/> |
| 64 | 69 |
</div> |
| 65 | 70 |
<div class="layout"> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?