From a6d9e4215d55507bec2d9c80067cdf8cd9e4dca7 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 20:45:29 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/common/sidebar.html | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index d48cf1e..cdb4dec 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -69,8 +69,6 @@
</ul>
</div>
</div>
-
-
</div>
<!--------------------
@@ -84,13 +82,6 @@
</div>
<span translate="common.dashboard">���떆蹂대뱶</span>
</a>
- </li>
- <li class="pointer">
- <a ng-click="fn.moveMenu('issues.list')" tabindex="-1">
- <div class="icon-w">
- <div class="os-icon os-icon-layers"></div>
- </div>
- <span translate="issue.managementIssue">�씠�뒋 愿�由�</span></a>
</li>
<!--
<li class="">
@@ -191,7 +182,12 @@
<div class="logo-element"></div>
</a>
</div>
+
<div class="logged-user-w avatar-inline">
+ <div class="row mb-1" ng-if="$root.user.levelName != null" >
+ <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.user.levelName}}</span>
+ <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.departments}}</span>
+ </div>
<div class="logged-user-i">
<div class="avatar-w">
<img alt="" ng-src="{{$root.user.profile}}">
@@ -201,7 +197,7 @@
{{$root.user.name}}
</div>
</div>
- <div class="logged-user-toggler-arrow">
+ <div class="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -258,14 +254,23 @@
</a>
</li>
<li class="sub-header">
- <span>Tasks</span>
+ <span>ISSUE LIST</span>
</li>
- <li class="pointer">
- <a ng-click="fn.moveMenu('issues.list')" tabindex="-1">
+
+ <li ng-repeat="issueType in $root.workIssueTypes" >
+ <a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(issueType.id)">
<div class="icon-w">
- <div class="os-icon os-icon-layers"></div>
+ <div class="os-icon os-icon-layout"></div>
</div>
- <span translate="issue.managementIssue">�씠�뒋 愿�由�</span>
+ <span>{{issueType.name}}</span>
+ </a>
+ </li>
+ <li ng-if="$root.workIssueTypes.length == 0">
+ <a tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-delete"></div>
+ </div>
+ <span translate="common.notIssueType">�씠�뒋 �쑀�삎�씠 �뾾�뒿�땲�떎.</span>
</a>
</li>
<!--
@@ -331,7 +336,34 @@
</div>
<span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionManager()">
+
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <span>PARTNER LIST</span>
+ </li>
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <a ui-sref="companyField.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-agenda-1"></div>
+ </div>
+ <span translate="common.customCompanyField">�뾽泥� 愿�由�</span></a>
+ </li>
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <a ui-sref="ispField.list" tabindex="-1">
+ <div class="icon-w">
+
+ <div class="os-icon os-icon-agenda-1"></div>
+ </div>
+ <span translate="common.customIspField">ISP 愿�由�</span></a>
+ </li>
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <a ui-sref="hostingField.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-agenda-1"></div>
+ </div>
+ <span translate="common.customHostingField">�샇�뒪�똿 愿�由�</span></a>
+ </li>
+
+ <li class="sub-header">
<span>Management</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_NOTICE')">
@@ -348,12 +380,26 @@
</div>
<span translate="FAQ.manageFAQ">FAQ 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_FAQ')">
+ <a ui-sref="faqs.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-ui-92"></div>
+ </div>
+ <span translate="FAQ.FAQ">FAQ</span></a>
+ </li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
<a ui-sref="qna.list" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-phone-21"></div>
</div>
<span translate="QNA.manageQNA">QnA 愿�由�</span></a>
+ </li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
+ <a ui-sref="qna.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="QNA.QNA">QnA</span></a>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
<a ui-sref="guide.list" tabindex="-1">
@@ -362,12 +408,19 @@
</div>
<span translate="guide.manageGuide">媛��씠�뱶 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
+ <a ui-sref="guide.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="guide.guide">媛��씠�뱶</span></a>
+ </li>
- <li class="sub-header">
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<span>API</span>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.auth" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
@@ -375,14 +428,14 @@
<span translate="api.auth">API �씤利�</span></a>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.setting" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
</div>
<span translate="api.setting">API �꽕�젙</span></a>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.monitor" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
--
Gitblit v1.8.0