Skip to content

Commit 0480601

Browse files
committed
move loading cog, fix PathIs
1 parent 8035f94 commit 0480601

8 files changed

Lines changed: 34 additions & 14 deletions

File tree

OpenFlow/src/public/Auditlogs.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ <h1 translate lib="web">auditlogs</h1>
44
</div>
55
<div class="col-sm"></div>
66
<div class="col-sm text-right">
7-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
7+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
8+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
89
</div>
910
</div>
1011

OpenFlow/src/public/Clients.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ <h1 translate lib="web">clients</h1>
55
<div class="col-md-6">
66
</div>
77
<div class=" col-md-6 text-right">
8-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
8+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
9+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
910
<input type="checkbox" ng-model="ctrl.showinactive" ng-change="ctrl.loadData()"> <span translate lib="web"
1011
ng-click="ctrl.showinactive = !ctrl.showinactive; ctrl.loadData()">showinactive</span>
1112
<input type="radio" name="show" value="openrpa" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate

OpenFlow/src/public/Controllers.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,23 @@ export class MenuCtrl {
181181
PathIs(path: string) {
182182
if (path == null && path == undefined) return false;
183183
if (this.path == null && this.path == undefined) return false;
184-
return this.path.toLowerCase().startsWith(path.toLowerCase());
184+
if (Array.isArray(path)) {
185+
for (var i = 0; i < path.length; i++) {
186+
if (path[i].endsWith("/") && this.path.toLowerCase().startsWith(path[i].toLowerCase()))
187+
return true;
188+
else if (this.path.toLowerCase() == path[i].toLowerCase()) {
189+
return true;
190+
}
191+
}
192+
return false;
193+
} else {
194+
if (path.endsWith("/") && this.path.toLowerCase().startsWith(path.toLowerCase()))
195+
return true;
196+
else if (this.path.toLowerCase() == path.toLowerCase()) {
197+
return true;
198+
}
199+
return false;
200+
}
185201
}
186202
toggleDarkMode() {
187203
this.halfmoon.toggleDarkMode();

OpenFlow/src/public/Credentials.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<h1 translate lib="web">credentials</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
6-
<a href="#/Credential" class="btn" translate lib="web">addcredential</a>
5+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
6+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
7+
<a href="#/Credential" class="btn" translate lib="web">addcredential</a>
78
</div>
89
<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
910
<table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">

OpenFlow/src/public/Customers.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<h1 translate lib="web">customers</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
6-
<a href="#/Customer" class="btn btn-info" translate lib="web"
5+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
6+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
7+
<a href="#/Customer" class="btn btn-info" translate lib="web"
78
ng-show="menuctrl.hasrole('customer admins') || menuctrl.hasrole('resellers')">addcustomer</a>
89
</div>
910
<div ng-show="ctrl.errormessage != ''" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>

OpenFlow/src/public/WorkitemQueues.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitemqueues</span></h1>
66
</div>
77

88
<div class="col-md-6 text-right">
9-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
10-
<em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em>
119
<a ng-href="#/WorkitemQueue" class="btn btn-info" ng-show="ctrl.loading == false" title="Add new Workitem queue"><em
1210
class="fas fa-plus"></em></a>
1311
<em class="fas fa-plus btn disabled" ng-show="ctrl.loading == true"></em>
12+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
13+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
1414
</div>
1515
</div>
1616

OpenFlow/src/public/Workitems.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitems</span></h1>
1717
</div>
1818

1919
<div class="col-md-8 text-right">
20-
20+
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
21+
<!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
2122
<a class="btn" href ng-click="ctrl.loadData()" title="Reload current data">
2223
Reload
2324
</a>
@@ -46,8 +47,6 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitems</span></h1>
4647
</a>
4748
<a ng-href="#/Workitem" class="btn btn-info"
4849
title="Add new Workitem to selected queue"><em class="fas fa-plus"></em></a>
49-
<em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
50-
<em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em>
5150
</div>
5251
</div>
5352

OpenFlow/src/public/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<body ng-controller="MenuCtrl as menuctrl" class="with-custom-webkit-scrollbars with-custom-css-scrollbars "
1515
data-dm-shortcut-enabled="true" data-set-preferred-mode-onload="true">
1616
<div class="page-wrapper with-navbar halfmoon-overrides">
17+
1718
<div class="sticky-alerts"></div>
1819

1920
<nav class="navbar navbar-expand-md fixed-top" ng-show="menuctrl.signedin">
@@ -105,8 +106,8 @@
105106
</div>
106107

107108
<input type="text" class="form-control" placeholder="Search" ng-model="menuctrl.searchstring"
108-
ng-model-options="{ debounce: 500 }" ng-change="menuctrl.Search()" id="menusearch" ng-show="!menuctrl.PathIs('/Nodered') && !menuctrl.PathIs('/Payment') && !menuctrl.PathIs('/Customer')
109-
&& !menuctrl.PathIs('/Entity/') && !menuctrl.PathIs('/User/') && !menuctrl.PathIs('/Role/')">
109+
ng-model-options="{ debounce: 500 }" ng-change="menuctrl.Search()" id="menusearch" ng-show="
110+
!menuctrl.PathIs(['/Nodered', '/Payment', '/Customer', '/Customer/', '/Entity/', '/User/', '/User', '/Role/', '/Role'])">
110111
<button class=" btn btn-action mr-5" type="button" ng-click="menuctrl.toggleDarkMode()"
111112
aria-label="Toggle dark mode" id="menudarkmode">
112113
<i class="fa fa-moon" aria-hidden="true"></i>

0 commit comments

Comments
 (0)