@c8y/ng1-modules 1017.276.0 → 1017.278.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/ui/containers/header.html +34 -28
- package/enterpriseEdition/customBranding/brandingConfigurationForm.html +2 -6
- package/export/views/detail.html +2 -16
- package/package.json +1 -1
- package/smartRules/list/smartRulesList.html +0 -1
- package/smartRules/views/list.html +12 -15
- package/tenantPolicies/tenantPolicyDetail/tenantPolicyDetail.html +4 -0
- package/tenantPolicies/tenantPolicyList/tenantPolicyList.html +5 -2
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
<div
|
|
2
2
|
class="app-main-header"
|
|
3
|
-
ng-class="{
|
|
3
|
+
ng-class="{
|
|
4
|
+
open: vm.navOpen,
|
|
5
|
+
'nav-hidden-on-startup': vm.navHiddenOnStartup,
|
|
6
|
+
drawerOpen: vm.openDrawer
|
|
7
|
+
}"
|
|
4
8
|
ng-mouseleave="vm.hideAppSwitcher()"
|
|
5
9
|
>
|
|
6
10
|
<div class="header-bar">
|
|
7
11
|
<button
|
|
8
|
-
type="button"
|
|
9
12
|
class="navigator-toggle main-header-button"
|
|
13
|
+
type="button"
|
|
14
|
+
title="{{ 'Toggle navigator' | translate }}"
|
|
10
15
|
ng-click="vm.toggleNav()"
|
|
11
|
-
ng-class="{'nav-hidden-on-startup': vm.navHiddenOnStartup}"
|
|
16
|
+
ng-class="{ 'nav-hidden-on-startup': vm.navHiddenOnStartup }"
|
|
12
17
|
ng-if="vm.rootNodes().length"
|
|
13
|
-
title="{{ 'Toggle navigator' | translate }}"
|
|
14
18
|
>
|
|
15
19
|
<i c8y-icon="dedent-right"></i>
|
|
16
20
|
</button>
|
|
17
21
|
<div class="app-view">
|
|
18
22
|
<c8y-app-icon app="vm.currentApp" class="c8y-app-icon" white="false"></c8y-app-icon>
|
|
19
|
-
<div
|
|
20
|
-
<
|
|
21
|
-
<div class="rect2"></div>
|
|
22
|
-
<div class="rect3"></div>
|
|
23
|
-
<div class="rect4"></div>
|
|
24
|
-
<div class="rect5"></div>
|
|
23
|
+
<div ng-show="vm.isLoading()">
|
|
24
|
+
<c8y-loading></c8y-loading>
|
|
25
25
|
</div>
|
|
26
26
|
<span class="page-header" ng-show="!vm.isLoading()">
|
|
27
27
|
<c8y-ui-title></c8y-ui-title>
|
|
@@ -36,11 +36,12 @@
|
|
|
36
36
|
<div
|
|
37
37
|
class="app-switcher-dropdown main-header-item dropdown"
|
|
38
38
|
uib-dropdown
|
|
39
|
-
ng-show="vm.applications.length > 1
|
|
39
|
+
ng-show="vm.applications.length > 1"
|
|
40
40
|
>
|
|
41
41
|
<button
|
|
42
|
+
class="main-header-button dropdown-toggle c8y-dropdown"
|
|
42
43
|
type="button"
|
|
43
|
-
|
|
44
|
+
aria-label="'App switcher' | translate"
|
|
44
45
|
uib-dropdown-toggle
|
|
45
46
|
aria-haspopup="true"
|
|
46
47
|
>
|
|
@@ -55,7 +56,7 @@
|
|
|
55
56
|
ng-repeat="app in vm.oneCloudApplications"
|
|
56
57
|
class="appLink"
|
|
57
58
|
ng-href="{{ vm.getHref(app) }}"
|
|
58
|
-
ng-class="{active: app.currentApp}"
|
|
59
|
+
ng-class="{ active: app.currentApp }"
|
|
59
60
|
title="{{ app | humanizeAppName }}"
|
|
60
61
|
>
|
|
61
62
|
<c8y-app-icon class="c8y-app-icon" app="app" white="false"></c8y-app-icon>
|
|
@@ -68,7 +69,7 @@
|
|
|
68
69
|
ng-repeat="app in vm.applications"
|
|
69
70
|
class="appLink"
|
|
70
71
|
ng-href="{{ vm.getHref(app) }}"
|
|
71
|
-
ng-class="{active: app.currentApp}"
|
|
72
|
+
ng-class="{ active: app.currentApp }"
|
|
72
73
|
title="{{ app | humanizeAppName }}"
|
|
73
74
|
>
|
|
74
75
|
<c8y-app-icon class="c8y-app-icon" app="app" white="false"></c8y-app-icon>
|
|
@@ -80,13 +81,13 @@
|
|
|
80
81
|
|
|
81
82
|
<div class="main-header-item dropdown" is-open="vm.menuStatus.userOpen" uib-dropdown>
|
|
82
83
|
<button
|
|
83
|
-
type="button"
|
|
84
84
|
class="main-header-button dropdown-toggle c8y-dropdown"
|
|
85
|
+
type="button"
|
|
85
86
|
uib-dropdown-toggle
|
|
86
87
|
>
|
|
87
88
|
<span
|
|
88
89
|
class="hidden-xs hidden-sm userName text-truncate d-inline-block"
|
|
89
|
-
style="vertical-align: text-bottom; max-width: 104px
|
|
90
|
+
style="vertical-align: text-bottom; max-width: 104px"
|
|
90
91
|
title="{{ vm.getUserName() }}"
|
|
91
92
|
>
|
|
92
93
|
{{ vm.getUserName() }}
|
|
@@ -97,7 +98,8 @@
|
|
|
97
98
|
<ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
|
|
98
99
|
<li>
|
|
99
100
|
<a title="{{ 'User settings' | translate }}" href="" ng-click="vm.editUser()">
|
|
100
|
-
<i c8y-icon="profile"></i>
|
|
101
|
+
<i c8y-icon="profile"></i>
|
|
102
|
+
{{ 'User settings' | translate }}
|
|
101
103
|
</a>
|
|
102
104
|
</li>
|
|
103
105
|
|
|
@@ -107,13 +109,15 @@
|
|
|
107
109
|
href=""
|
|
108
110
|
ng-click="vm.showAccessDeniedRequestsList()"
|
|
109
111
|
>
|
|
110
|
-
<i c8y-icon="access"></i>
|
|
112
|
+
<i c8y-icon="access"></i>
|
|
113
|
+
{{ 'Access denied requests' | translate }}
|
|
111
114
|
</a>
|
|
112
115
|
</li>
|
|
113
116
|
|
|
114
117
|
<li>
|
|
115
118
|
<a title="{{ 'Logout' | translate }}" href="" ng-click="vm.logout()">
|
|
116
|
-
<i c8y-icon="sign-out"></i>
|
|
119
|
+
<i c8y-icon="sign-out"></i>
|
|
120
|
+
{{ 'Logout' | translate }}
|
|
117
121
|
</a>
|
|
118
122
|
</li>
|
|
119
123
|
|
|
@@ -124,7 +128,8 @@
|
|
|
124
128
|
ng-click="vm.activateSupportAccess()"
|
|
125
129
|
ng-if="!vm.supportActivated"
|
|
126
130
|
>
|
|
127
|
-
<i c8y-icon="c8y-c8y-support"></i>
|
|
131
|
+
<i c8y-icon="c8y-c8y-support"></i>
|
|
132
|
+
{{ 'Activate support' | translate }}
|
|
128
133
|
</a>
|
|
129
134
|
<a
|
|
130
135
|
title="{{ 'Deactivate support' | translate }}"
|
|
@@ -144,7 +149,8 @@
|
|
|
144
149
|
target="_blank"
|
|
145
150
|
rel="noopener noreferrer"
|
|
146
151
|
>
|
|
147
|
-
<i c8y-icon="question-circle"></i>
|
|
152
|
+
<i c8y-icon="question-circle"></i>
|
|
153
|
+
{{ 'Request support' | translate }}
|
|
148
154
|
</a>
|
|
149
155
|
</li>
|
|
150
156
|
|
|
@@ -153,12 +159,12 @@
|
|
|
153
159
|
<li
|
|
154
160
|
ng-if="!vm.hideVersions"
|
|
155
161
|
class="dropdown-header text-pre-normal"
|
|
156
|
-
style="margin-top: -1px
|
|
162
|
+
style="margin-top: -1px"
|
|
157
163
|
>
|
|
158
164
|
<i c8y-icon="info-circle" class="text-muted"></i>
|
|
159
|
-
<span class="text-muted" translate
|
|
160
|
-
|
|
161
|
-
>
|
|
165
|
+
<span class="text-muted" translate>
|
|
166
|
+
Version: {{ vm.backendVersion }} (backend), {{ vm.uiVersion }} (UI)
|
|
167
|
+
</span>
|
|
162
168
|
</li>
|
|
163
169
|
</ul>
|
|
164
170
|
</div>
|
|
@@ -166,17 +172,17 @@
|
|
|
166
172
|
|
|
167
173
|
<!-- right drawer button -->
|
|
168
174
|
<button
|
|
175
|
+
class="drawer-toggle main-header-button"
|
|
169
176
|
type="button"
|
|
177
|
+
title="{{ 'Toggle side drawer' | translate }}"
|
|
170
178
|
ng-if="vm.showRightDrawer"
|
|
171
|
-
class="drawer-toggle main-header-button"
|
|
172
179
|
ng-click="vm.openDrawer = !vm.openDrawer"
|
|
173
|
-
title="{{ 'Toggle side drawer' | translate }}"
|
|
174
180
|
>
|
|
175
181
|
<i c8y-icon="dedent"></i>
|
|
176
182
|
</button>
|
|
177
183
|
</div>
|
|
178
184
|
<div class="head-toggler">
|
|
179
|
-
<button
|
|
185
|
+
<button title="{{ 'Toggle' | translate }}" type="button" ng-click="vm.toggle()">
|
|
180
186
|
<i c8y-icon="dedent-right"></i>
|
|
181
187
|
</button>
|
|
182
188
|
</div>
|
|
@@ -68,12 +68,8 @@
|
|
|
68
68
|
</div>
|
|
69
69
|
<div class="inner-scroll flex-grow">
|
|
70
70
|
<div class="card-block p-t-0 p-b-0 overflow-visible">
|
|
71
|
-
<div
|
|
72
|
-
<
|
|
73
|
-
<div class="rect2"></div>
|
|
74
|
-
<div class="rect3"></div>
|
|
75
|
-
<div class="rect4"></div>
|
|
76
|
-
<div class="rect5"></div>
|
|
71
|
+
<div ng-show="vm.isLoading">
|
|
72
|
+
<c8y-loading></c8y-loading>
|
|
77
73
|
</div>
|
|
78
74
|
<form name="platformConfigurationForm1" ng-blur="vm.updateLivePreview()" novalidate>
|
|
79
75
|
<c8y-schema-form
|
package/export/views/detail.html
CHANGED
|
@@ -76,22 +76,8 @@
|
|
|
76
76
|
</div>
|
|
77
77
|
|
|
78
78
|
<div ng-if="config.id" class="p-relative">
|
|
79
|
-
<div class="
|
|
80
|
-
<
|
|
81
|
-
<div
|
|
82
|
-
class="d-inline-block p-relative p-r-56 p-l-4 p-t-24 m-l-8"
|
|
83
|
-
style="width: 60px; margin-top: -20px"
|
|
84
|
-
>
|
|
85
|
-
<div class="spinner">
|
|
86
|
-
<div class="rect1"></div>
|
|
87
|
-
<div class="rect2"></div>
|
|
88
|
-
<div class="rect3"></div>
|
|
89
|
-
<div class="rect4"></div>
|
|
90
|
-
<div class="rect5"></div>
|
|
91
|
-
</div>
|
|
92
|
-
</div>
|
|
93
|
-
<span translate>Migrating…</span>
|
|
94
|
-
</div>
|
|
79
|
+
<div class="d-flex a-i-center" ng-if="isMigratingInProgress()">
|
|
80
|
+
<c8y-loading></c8y-loading>
|
|
95
81
|
</div>
|
|
96
82
|
<smart-rules-list
|
|
97
83
|
mo="config.id"
|
package/package.json
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
<div ng-controller="SmartRulesListCtrl as vm">
|
|
2
|
-
|
|
3
2
|
<div ng-if="canSeeSection()">
|
|
4
3
|
<c8y-breadcrumbs-set>
|
|
5
4
|
<c8y-breadcrumbs-item
|
|
@@ -35,8 +34,8 @@
|
|
|
35
34
|
<c8y-if-allowed any-app="['devicemanagement']">
|
|
36
35
|
<a
|
|
37
36
|
class="btn btn-link"
|
|
38
|
-
title="{{ 'Open in Device management' | translate }}"
|
|
39
37
|
type="button"
|
|
38
|
+
title="{{ 'Open in Device management' | translate }}"
|
|
40
39
|
target="_blank"
|
|
41
40
|
rel="noopener noreferrer"
|
|
42
41
|
ng-href="{{ getLinkToDM() }}"
|
|
@@ -54,9 +53,7 @@
|
|
|
54
53
|
<c8y-help src="/users-guide/cockpit/#smart-rules"></c8y-help>
|
|
55
54
|
|
|
56
55
|
<div ng-if="loadingStatus.inProgress">
|
|
57
|
-
<c8y-rectangle-spinner
|
|
58
|
-
message="'Retrieving smart rules…' | translate"
|
|
59
|
-
></c8y-rectangle-spinner>
|
|
56
|
+
<c8y-rectangle-spinner></c8y-rectangle-spinner>
|
|
60
57
|
</div>
|
|
61
58
|
|
|
62
59
|
<div ng-if="!loadingStatus.inProgress && loadingStatus.done && loadingStatus.error">
|
|
@@ -73,9 +70,9 @@
|
|
|
73
70
|
>
|
|
74
71
|
<button
|
|
75
72
|
class="btn btn-primary"
|
|
76
|
-
ng-click="add()"
|
|
77
|
-
title="{{ 'Add smart rule' | translate }}"
|
|
78
73
|
type="button"
|
|
74
|
+
title="{{ 'Add smart rule' | translate }}"
|
|
75
|
+
ng-click="add()"
|
|
79
76
|
>
|
|
80
77
|
{{ 'Add smart rule' | translate }}
|
|
81
78
|
</button>
|
|
@@ -112,8 +109,8 @@
|
|
|
112
109
|
>
|
|
113
110
|
<button
|
|
114
111
|
class="btn btn-link btn-collapse"
|
|
115
|
-
title="{{ 'Details' | translate }}"
|
|
116
112
|
type="button"
|
|
113
|
+
title="{{ 'Details' | translate }}"
|
|
117
114
|
ng-class="{ active: isOpen[rule.id] }"
|
|
118
115
|
ng-click="isOpen[rule.id] = !isOpen[rule.id]"
|
|
119
116
|
>
|
|
@@ -127,8 +124,8 @@
|
|
|
127
124
|
>
|
|
128
125
|
<button
|
|
129
126
|
class="dropdown-toggle c8y-dropdown"
|
|
130
|
-
title="{{ 'Actions' | translate }}"
|
|
131
127
|
type="button"
|
|
128
|
+
title="{{ 'Actions' | translate }}"
|
|
132
129
|
data-toggle="dropdown"
|
|
133
130
|
aria-haspopup="true"
|
|
134
131
|
uib-dropdown-toggle
|
|
@@ -138,8 +135,8 @@
|
|
|
138
135
|
<ul role="list" class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
|
|
139
136
|
<li ng-if="canModify(rule)">
|
|
140
137
|
<button
|
|
141
|
-
title="{{ 'Edit smart rule' | translate }}"
|
|
142
138
|
type="button"
|
|
139
|
+
title="{{ 'Edit smart rule' | translate }}"
|
|
143
140
|
ng-click="edit(rule)"
|
|
144
141
|
>
|
|
145
142
|
<i c8y-icon="pencil"></i>
|
|
@@ -148,9 +145,9 @@
|
|
|
148
145
|
</li>
|
|
149
146
|
<li ng-if="canAddRules(rule)">
|
|
150
147
|
<button
|
|
148
|
+
type="button"
|
|
151
149
|
title="{{ 'Duplicate smart rule' | translate }}"
|
|
152
150
|
ng-click="clone(rule)"
|
|
153
|
-
type="button"
|
|
154
151
|
>
|
|
155
152
|
<i c8y-icon="copy"></i>
|
|
156
153
|
{{ 'Duplicate' | translate }}
|
|
@@ -158,9 +155,9 @@
|
|
|
158
155
|
</li>
|
|
159
156
|
<li ng-if="canModify(rule)">
|
|
160
157
|
<button
|
|
158
|
+
type="button"
|
|
161
159
|
title="{{ 'Delete smart rule' | translate }}"
|
|
162
160
|
ng-click="remove(rule)"
|
|
163
|
-
type="button"
|
|
164
161
|
>
|
|
165
162
|
<i c8y-icon="delete"></i>
|
|
166
163
|
{{ 'Delete' | translate }}
|
|
@@ -196,8 +193,8 @@
|
|
|
196
193
|
ng-if="context.context === 'group' || context.context === 'device'"
|
|
197
194
|
>
|
|
198
195
|
<label
|
|
199
|
-
aria-label="{{ 'Rule activation switch' | translate }}"
|
|
200
196
|
class="c8y-switch"
|
|
197
|
+
aria-label="{{ 'Rule activation switch' | translate }}"
|
|
201
198
|
uib-tooltip="{{ tooltip(rule) | translate }}"
|
|
202
199
|
tooltip-popup-delay="500"
|
|
203
200
|
tooltip-append-to-body="true"
|
|
@@ -289,8 +286,8 @@
|
|
|
289
286
|
<div class="card-actions-group separator">
|
|
290
287
|
<button
|
|
291
288
|
class="btn-flip"
|
|
292
|
-
title="{{ 'Details' | translate }}"
|
|
293
289
|
type="button"
|
|
290
|
+
title="{{ 'Details' | translate }}"
|
|
294
291
|
ng-click="isFlipped = !isFlipped"
|
|
295
292
|
>
|
|
296
293
|
<i c8y-icon="reply"></i>
|
|
@@ -343,8 +340,8 @@
|
|
|
343
340
|
<div class="card-actions-group separator">
|
|
344
341
|
<button
|
|
345
342
|
class="btn-flip"
|
|
346
|
-
title="{{ 'Back' | translate }}"
|
|
347
343
|
type="button"
|
|
344
|
+
title="{{ 'Back' | translate }}"
|
|
348
345
|
ng-click="isFlipped = !isFlipped"
|
|
349
346
|
>
|
|
350
347
|
<i c8y-icon="reply"></i>
|
|
@@ -6,6 +6,10 @@
|
|
|
6
6
|
label="{{ 'Tenant policies' | translate }}"
|
|
7
7
|
icon="c8y-tenant-policies"
|
|
8
8
|
></c8y-breadcrumbs-item>
|
|
9
|
+
<c8y-breadcrumbs-item
|
|
10
|
+
label="{{ 'Tenants' | translate }}"
|
|
11
|
+
icon="c8y-layers"
|
|
12
|
+
></c8y-breadcrumbs-item>
|
|
9
13
|
</c8y-breadcrumbs-set>
|
|
10
14
|
|
|
11
15
|
<form name="vm.policyForm" novalidate>
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
<c8y-ui-title-set title="vm.TITLE | translate"></c8y-ui-title-set>
|
|
2
2
|
<c8y-breadcrumbs-set>
|
|
3
|
-
<c8y-breadcrumbs-item label="{{ vm.TITLE | translate }}" icon="
|
|
4
|
-
<c8y-breadcrumbs-item
|
|
3
|
+
<c8y-breadcrumbs-item label="{{ vm.TITLE | translate }}" icon="c8y-layers"></c8y-breadcrumbs-item>
|
|
4
|
+
<c8y-breadcrumbs-item
|
|
5
|
+
label="{{ 'Tenants' | translate }}"
|
|
6
|
+
icon="c8y-layers"
|
|
7
|
+
></c8y-breadcrumbs-item>
|
|
5
8
|
</c8y-breadcrumbs-set>
|
|
6
9
|
<c8y-ui-action-bar-set>
|
|
7
10
|
<li class="navbar-form" action-bar-position="left">
|