From ebfd37816a332308519b30af5bfb017c5052be69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:34:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/common/header.html | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index 74c4e5a..9b0f69f 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,9 +25,25 @@
</select>
</div>
- <div class="top-right col-lg-4">
+ <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" ng-if="$root.checkMngPermissionSettings() && $root.workProject.id > -1" ng-click="fn.addIssue()" tabindex="-1">
+ <button class="btn btn-xlg btn-primary btn-rounded mr-10 ml-3" ng-if="$root.workProject.id > -1 && !$root.allIssueList" ng-click="fn.addIssue()" tabindex="-1">
<i class="os-icon os-icon-plus"></i> <span translate="issue.createIssue">�씠�뒋 留뚮뱾湲�</span>
</button>
@@ -43,7 +59,7 @@
-->
<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>
@@ -60,14 +76,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">
@@ -75,8 +91,8 @@
</option>
<option value="vi" translate="common.vietnamese">
踰좏듃�궓�뼱
- </option>-->
- </select>
+ </option>
+ </select>-->
</div>
</div>
</div>
--
Gitblit v1.8.0