move loading cog, fix PathIs

Author: skadefro

OpenFlow/src/public/Auditlogs.html

@@ -4,7 +4,8 @@ <h1 translate lib="web">auditlogs</h1>
   </div>
   <div class="col-sm"></div>
   <div class="col-sm text-right">
-    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
+    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+    <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
   </div>
 </div>
 

OpenFlow/src/public/Clients.html

@@ -5,7 +5,8 @@ <h1 translate lib="web">clients</h1>
   <div class="col-md-6">
   </div>
   <div class=" col-md-6 text-right">
-    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
+    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+    <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
     <input type="checkbox" ng-model="ctrl.showinactive" ng-change="ctrl.loadData()"> <span translate lib="web"
       ng-click="ctrl.showinactive = !ctrl.showinactive; ctrl.loadData()">showinactive</span>
     <input type="radio" name="show" value="openrpa" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate

OpenFlow/src/public/Controllers.ts

@@ -181,7 +181,23 @@ export class MenuCtrl {
     PathIs(path: string) {
         if (path == null && path == undefined) return false;
         if (this.path == null && this.path == undefined) return false;
-        return this.path.toLowerCase().startsWith(path.toLowerCase());
+        if (Array.isArray(path)) {
+            for (var i = 0; i < path.length; i++) {
+                if (path[i].endsWith("/") && this.path.toLowerCase().startsWith(path[i].toLowerCase()))
+                    return true;
+                else if (this.path.toLowerCase() == path[i].toLowerCase()) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            if (path.endsWith("/") && this.path.toLowerCase().startsWith(path.toLowerCase()))
+                return true;
+            else if (this.path.toLowerCase() == path.toLowerCase()) {
+                return true;
+            }
+            return false;
+        }
     }
     toggleDarkMode() {
         this.halfmoon.toggleDarkMode();

OpenFlow/src/public/Credentials.html

@@ -2,8 +2,9 @@
   <h1 translate lib="web">credentials</h1>
 </div>
 <div class="col-sm-12 text-right">
-  <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
-  <a href="#/Credential" class="btn" translate lib="web">addcredential</a>
+  <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+  <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
+<a href="#/Credential" class="btn" translate lib="web">addcredential</a>
 </div>
 <div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
 <table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">

OpenFlow/src/public/Customers.html

@@ -2,8 +2,9 @@
   <h1 translate lib="web">customers</h1>
 </div>
 <div class="col-sm-12 text-right">
-  <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
-  <a href="#/Customer" class="btn btn-info" translate lib="web"
+  <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+  <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
+<a href="#/Customer" class="btn btn-info" translate lib="web"
     ng-show="menuctrl.hasrole('customer admins') || menuctrl.hasrole('resellers')">addcustomer</a>
 </div>
 <div ng-show="ctrl.errormessage != ''" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>

OpenFlow/src/public/WorkitemQueues.html

@@ -6,11 +6,11 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitemqueues</span></h1>
   </div>
 
   <div class="col-md-6 text-right">
-    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
-    <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em>
     <a ng-href="#/WorkitemQueue" class="btn btn-info" ng-show="ctrl.loading == false" title="Add new Workitem queue"><em
         class="fas fa-plus"></em></a>
     <em class="fas fa-plus btn disabled" ng-show="ctrl.loading == true"></em>
+    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+    <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
   </div>
 </div>
 

OpenFlow/src/public/Workitems.html

@@ -17,7 +17,8 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitems</span></h1>
   </div>
 
   <div class="col-md-8 text-right">
-
+    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+    <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
     <a class="btn" href ng-click="ctrl.loadData()" title="Reload current data">
       Reload
     </a>
@@ -46,8 +47,6 @@ <h1>{{ctrl.queue}} <span translate lib="web">workitems</span></h1>
     </a>
     <a ng-href="#/Workitem" class="btn btn-info"
       title="Add new Workitem to selected queue"><em class="fas fa-plus"></em></a>
-    <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
-    <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em>
   </div>
 </div>
 

OpenFlow/src/public/index.html

@@ -14,6 +14,7 @@
 <body ng-controller="MenuCtrl as menuctrl" class="with-custom-webkit-scrollbars with-custom-css-scrollbars "
   data-dm-shortcut-enabled="true" data-set-preferred-mode-onload="true">
   <div class="page-wrapper with-navbar halfmoon-overrides">
+    
     <div class="sticky-alerts"></div>
 
     <nav class="navbar navbar-expand-md fixed-top" ng-show="menuctrl.signedin">
@@ -105,8 +106,8 @@
         </div>
 
         <input type="text" class="form-control" placeholder="Search" ng-model="menuctrl.searchstring"
-          ng-model-options="{ debounce: 500 }" ng-change="menuctrl.Search()" id="menusearch" ng-show="!menuctrl.PathIs('/Nodered') && !menuctrl.PathIs('/Payment') && !menuctrl.PathIs('/Customer')
-          && !menuctrl.PathIs('/Entity/') && !menuctrl.PathIs('/User/') && !menuctrl.PathIs('/Role/')">
+          ng-model-options="{ debounce: 500 }" ng-change="menuctrl.Search()" id="menusearch" ng-show="
+          !menuctrl.PathIs(['/Nodered', '/Payment', '/Customer', '/Customer/', '/Entity/', '/User/', '/User', '/Role/', '/Role'])">
         <button class=" btn btn-action mr-5" type="button" ng-click="menuctrl.toggleDarkMode()"
           aria-label="Toggle dark mode" id="menudarkmode">
           <i class="fa fa-moon" aria-hidden="true"></i>