From 2b5c6c4c2b6d54ec4a2f2ba57561d8912065e0ee Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 15:48:28 +0900
Subject: [PATCH] - 전체프로젝트가 선택 된 상태에서 ISSUE TYPE LIST 선택 시에도 전체프로젝트로 유지되도록 수정 - 전체 프로젝트 또는 전체 이슈 일 경우에도 '이슈 만들기' 버튼 보이도록 수정(만들기 폼에서 프로젝트,이슈유형 수정가능하도록)
---
src/main/webapp/views/common/header.html | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index d84538b..9875edd 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -1,7 +1,7 @@
<link href="/assets/font/dripicons/webfont.css" rel="stylesheet">
<div class="top-bar color-scheme-light" owl-profile-over>
<div class="top-menu-controls row">
- <div class="top-left col-lg-8">
+ <div class="top-left col-lg-7">
<h3>
<span class="badge badge-primary vertical-middle">PROJECT</span> {{$root.workProject.name}}
</h3>
@@ -25,8 +25,24 @@
</select>
</div>
- <div class="top-right col-lg-4">
- <button class="btn btn-xlg btn-primary btn-rounded mr-10" ng-click="fn.addIssue()" tabindex="-1">
+ <div class="top-right col-lg-5">
+ <div class="input-group">
+ <input class="form-control"
+ type="text"
+ tabindex="-2"
+ maxlength="300"
+ kr-input
+ owl-auto-focus
+ ng-model="vm.searchAll.keyWord"
+ placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}"
+ ng-enter="fn.searchAll(0)">
+ <div class="input-group-prepend ml-10">
+ <button class="btn btn-navy" ng-click="fn.searchAll(0)"> <span translate="common.search">寃��깋</span></button>
+ </div>
+ </div>
+
+
+ <button class="btn btn-xlg btn-primary btn-rounded mr-10 ml-3" ng-click="fn.addIssue()" tabindex="-1">
<i class="os-icon os-icon-plus"></i> <span translate="issue.createIssue">�씠�뒋 留뚮뱾湲�</span>
</button>
@@ -42,8 +58,11 @@
-->
<div class="messages-notifications os-dropdown-trigger os-dropdown-position-left" ui-sref="notices.list"
style="padding-top:5px;">
- <span class="new-messages-push"></span>
+<!-- <span class="new-messages-push"></span>-->
<i class="dripicons-broadcast"></i>
+ </div>
+ <div class="messages-notifications os-dropdown-trigger os-dropdown-position-left">
+ <i class="os-icon os-icon-email-2-at2 mr-20" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="吏곸젒 �옉�꽦�븳 硫붿씪 蹂대궡湲�"></i>
</div>
<!--
@@ -59,14 +78,14 @@
-->
- <select class="form-control rounded width-80-p"
+<!-- <select class="form-control rounded width-80-p"
ng-model="$root.language"
tabindex="-1"
ng-change="$root.changeLocale($root.language)">
<option value="ko" translate="common.korean">
�븳援��뼱
</option>
- <!--<option value="en" translate="common.english">
+ <option value="en" translate="common.english">
�쁺�뼱
</option>
<option value="ja" translate="common.japaneseLanguage">
@@ -74,8 +93,8 @@
</option>
<option value="vi" translate="common.vietnamese">
踰좏듃�궓�뼱
- </option>-->
- </select>
+ </option>
+ </select>-->
</div>
</div>
</div>
--
Gitblit v1.8.0