diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index cbc8e29..a7a4283 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -93,5 +93,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/mytasks.html b/app/modules/project/templates/project/mytasks.html index 354febf..f079e62 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -100,5 +100,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 2b3e4a1..690839b 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + @@ -240,6 +240,10 @@ + + @@ -247,38 +251,50 @@
- -
-
- 담당자 - + +
+
+ 담당자 + + account_circle + +
-
- 세션 - +
+ 세션 + + view_column + +
-
- 우선순위 - +
+ 우선순위 + + flag + +
-
- 마감일 - +
+ 마감일 + + event + +
@@ -452,5 +468,5 @@ - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index 1a54c8e..047017a 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -465,18 +465,24 @@ color: var(--pj-ink); box-sizing: border-box; } .pj-t-title-input:focus { outline: none; background: #f6f7f8 !important; border-radius: 8px; } -.pj-meta-row { display: flex; gap: 10px; margin-bottom: 10px; flex-wrap: wrap; } -.pj-meta-field { flex: 1 1 110px; min-width: 100px; } -.pj-meta-label { display: block; font-size: 10.5px; font-weight: 700; color: var(--pj-ink-soft); - text-transform: uppercase; letter-spacing: .03em; margin-bottom: 4px; } -.pj-meta-field select, .pj-meta-field input { - display: block; width: 100%; margin: 0 !important; padding: 6px 8px !important; - border: 1px solid var(--pj-border) !important; border-radius: 8px !important; - font-size: 12.5px !important; font-family: inherit; background: #fafafa !important; box-sizing: border-box; +/* 메타 정보 — 아사나처럼 "라벨(좌, 고정폭) + 아이콘/값(우)" 목록형 한 줄씩. */ +.pj-meta-list { display: flex; flex-direction: column; margin-bottom: 4px; } +.pj-meta-row2 { + display: flex; align-items: center; min-height: 40px; + border-bottom: 1px solid #f1f2f4; gap: 12px; } -.pj-meta-field select:hover, .pj-meta-field input:hover, -.pj-meta-field select:focus, .pj-meta-field input:focus { - border-color: var(--pj-accent) !important; background: var(--pj-accent-tint) !important; outline: none; +.pj-meta-label2 { flex: 0 0 92px; font-size: 13px; font-weight: 600; color: var(--pj-ink-soft); } +.pj-meta-value2 { display: flex; align-items: center; gap: 8px; flex: 1; min-width: 0; } +.pj-meta-ic { font-size: 18px; color: #9aa1a9; flex: none; } +.pj-meta-value2 select, .pj-meta-value2 input { + display: block; width: auto; max-width: 100%; margin: 0 !important; padding: 6px 8px !important; + border: 1px solid transparent !important; border-radius: 6px !important; background: transparent !important; + font-size: 13.5px !important; font-weight: 600; font-family: inherit; color: var(--pj-ink); + box-sizing: border-box; cursor: pointer; +} +.pj-meta-value2 select:hover, .pj-meta-value2 input:hover, +.pj-meta-value2 select:focus, .pj-meta-value2 input:focus { + border-color: var(--pj-border) !important; background: #f6f7f8 !important; outline: none; } .pj-extra-label { font-size: 12.5px; font-weight: 700; color: var(--pj-ink-soft); margin-right: auto; } .pj-modal-card label { display: block; font-size: 12.5px; font-weight: 600; color: #525860; margin-bottom: 12px; } diff --git a/app/static/project.js b/app/static/project.js index e9e17d9..dfd60c0 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -55,7 +55,7 @@ function wireModalClose(modal) { if (!modal) return; modal.addEventListener("click", function (e) { - if (e.target === modal || e.target.hasAttribute("data-close")) closeModal(modal); + if (e.target === modal || e.target.closest("[data-close]")) closeModal(modal); }); } @@ -2765,7 +2765,7 @@ } finally { taskClosing = false; } } taskModal.addEventListener("click", function (e) { - if (e.target === taskModal || e.target.hasAttribute("data-close")) attemptCloseTaskModal(); + if (e.target === taskModal || e.target.closest("[data-close]")) attemptCloseTaskModal(); }); document.addEventListener("keydown", function (e) { if (e.key === "Escape" && !taskModal.hidden) { e.preventDefault(); attemptCloseTaskModal(); } @@ -2808,7 +2808,7 @@ try { list = (await api("GET", "/project/api/projects/" + projId + "/members")).members || []; } catch (_) { list = []; } } - sel.innerHTML = '' + list.map(function (m) { + sel.innerHTML = '' + list.map(function (m) { const name = idOf(m.user_email); return '"; }).join("");