Browse Source

Syntax Check

Giancarlo Voci 7 years ago
parent
commit
0222ecdef9

+ 5 - 0
TODO.txt

@@ -14,3 +14,8 @@
 [✘] TODO verificare se è più veloce mandare l'immagine generata da PHP o l'XSLT+XML
 [✘] TODO Subtemplates: da studiare bene che cosa si può fare, lo scopo è far cambiare direttamente all'etichetta il template senza rimandarglielo.
 [✘] TODO posizionamento: piazzare un etichetta, da API o Findbox impostarne le coordinate XYZ, da questa poi col sistema di triangolazione mappare la posizione delle altre etichette
+
+[✘] TODO Messaggistica JS/HTML: ServiceWorker (libreria SWIVEL)
+[✘] TODO ADMIN componenti da utilizzare dal tema AdminTo: bootstrap-inputmask, jquery multiselect, switchery, select2.js, css+js del core del tema
+[✘] Stampa WEB: utilizzare NW.JS per un maggior controllo grazie alle API
+[✘] Produzione e Dev devono avere classi isolate switchabili così da non impazzire se non è possibile accedere al db remoto del cliente

+ 1 - 1
cfg/config.bin

@@ -1 +1 @@
-eJx9kF1vmzAUhu8t+T+gXG2aykcgabfI0ghxE1rAEYYqWlUhIC5BAcz4yNZG+e8zZNXuZsmSj3Xe8z7nfc4KnsRF+wKBGQbEIeYKTdomVSYQWKa1wRKSAj/EEIQ26nMFghVehms0hQB7FlnZ3hpNwuD+5k4INvZ644gboFcxkkHwYPoy+13nDUPnc5eX7NPnL7o20+eqql4uYhb10KR8a38W3w687VDB07gYXouaNx3SdXW+2CdVXDLEyyKvjsJkn/Qta1DDeTcUddy2iNesKvNqD4Fr7qKlY3uPUWC7OKLYQsIMAggW0jbuDhAsTYpD30HKdSIE1A6wZ7oYEffGGX8csiaRFdKAuNgX5N//ai4XRUSQl3HGWqXgGZfrKoPAtogXDZow+F9z313bBxTKCpZ20q9Dnh6ktG87XrJGSguxjMSqOClEeB8AI9sHLATPFvGx/Jq8jCs1fN+nXc4rCMYEta9TWZvfyZoqa4bYe8xxphqGfrVtTsInwDSA4MjekKX+O5pm3BrqVFdnt0I3xPqjyd6Pp4eGPFYetapttX7X+7M5Zxvq7Z5O7YAjgO5tb7UkO4r9J9vCgos6GG+H/IWzYPgDFT21Ew==
+eJx9kVFv2jAUhd8t+T9EPG2aGhwCtBuytBAMpA0xih3EVlVRCC5ETWLqJGwt4r/PgVV7myVL9tW9Pt85ftzlcpPk1RMEKxIyjwbYMgcmgsCJOPWpM8GdSqXdDgSu486JgQ0eRgSCyMNN1oVgQsbRDPcgIIFLJ14ww52IT2/u9MDcm819vTl+1goCgnsnNMXvQ6YEPp3qrBCfPn+xrYE9RAidz/otFuBO8Va95t/2sqpxLtMkb0+jg1Q1tm00HG03ZVIILIs8K1+0yHbTVEJhJWXdXg5JVWF5EGWRlVsIFs46Hvte8BBzb0FiRlxsI3Sth4SHP+IpDeOpE/kcW6h1s8K1ajQrBCNjmdR7CMYOI1Ho4+5VEwLmcRI4C4Lp4sa/VHw6o7EbMU4XJNTevv+dOZ+7OqSsSHai6uZyJ81DuYPAc2kQtzMR/19zU1/bWxQmcpHWxq99lu6NtKlqWQhlpLm2a4gy2eQa+QPgwvYBC8GjS0NiPm+eLpaU3DZpnckSgkvG1teeaQ3vTAuZVl8ncEl6gPp9+yqrjlqHE8YheBFv2EX/lmX1b/uoZ6PBrZ5rg/+pdu8vx3tFH8qAueWynL3bzckZijkL1qtj1eJooKkXTMZ0zUi48lyiuZhPyLL9Ia2sGf4AGu/CIA==

+ 1 - 1
cfg/config.ini

@@ -1,5 +1,5 @@
 [globals]
-VERSION=1.0.4
+VERSION=1.5.0
 AUTOLOAD="src/"
 CACHE = TRUE
 UI=ui/

+ 32 - 32
package-lock.json

@@ -15,9 +15,9 @@
       "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
     },
     "ajv": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
-      "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
+      "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -486,9 +486,9 @@
       }
     },
     "bootstrap": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
-      "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
+      "integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
     },
     "boxen": {
       "version": "1.3.0",
@@ -1504,9 +1504,9 @@
       "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
     },
     "js-base64": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
-      "integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz",
+      "integrity": "sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g=="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -1767,9 +1767,9 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA=="
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
     },
     "no-case": {
       "version": "2.3.2",
@@ -1857,9 +1857,9 @@
       }
     },
     "node-sass": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz",
-      "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
       "requires": {
         "async-foreach": "^0.1.3",
         "chalk": "^1.1.1",
@@ -1884,7 +1884,7 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -2155,9 +2155,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
     },
     "punycode": {
       "version": "2.1.1",
@@ -2326,11 +2326,11 @@
       }
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "^7.1.3"
       }
     },
     "safe-buffer": {
@@ -2438,9 +2438,9 @@
       "integrity": "sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA=="
     },
     "spdx-correct": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
-      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -2461,9 +2461,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
-      "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
     },
     "sprintf-js": {
       "version": "1.0.3",
@@ -2476,9 +2476,9 @@
       "integrity": "sha1-AP4maBBPEii1u37nOe9gEhu8sFc="
     },
     "sshpk": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
-      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+      "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==",
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",

+ 3 - 3
package.json

@@ -1,10 +1,10 @@
 {
   "name": "OM-Link",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
-  "description": "Default OM-Link version",
+  "description": "OM-Link Engine",
   "scripts": {
-    "clean": "rm -rf tmp bundle.css bundle.js ui/css/omlink.css ui/css/omlink.css.map ui/js/omlink.min.js",
+    "clean": "rm -rf tmp bundle.css bundle.js ui/css/omlink.css ui/css/omlink.css.map ui/js/omlink.min.js node_modules Site.log",
     "build": "node build.js",
     "deploy": "zip -x ui/css/* ui/js/* -9 -r deploy.zip omlink.sql lib cfg/config.bin cfg/labels.ini index.php bundle.* src_minified ui"
   },

+ 6 - 5
src/OpenMind/Admin/build.js

@@ -1,16 +1,17 @@
-const compressor = require('../../../node_modules/node-minify');
-const sass = require('../../../node_modules/node-sass');
+const MODULES_PATH = '../../../node_modules';
+const compressor = require(`${MODULES_PATH}/node-minify`);
+const sass = require(`${MODULES_PATH}/node-sass`);
 const {writeFileSync} = require('fs');
 
 // The Libraries to join in minified files
 const libList = [
-  "../../../node_modules/jquery/dist/jquery.min.js",
-  "../../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
+  `${MODULES_PATH}/jquery/dist/jquery.min.js`,
+  `${MODULES_PATH}/bootstrap/dist/js/bootstrap.bundle.min.js`
 ];
 
 // The css files to minify
 const cssList = [
-  "../../../node_modules/bootstrap/dist/css/bootstrap.min.css",
+  `${MODULES_PATH}/bootstrap/dist/css/bootstrap.min.css`,
   "ui/css/admin.css"
 ];
 

+ 6 - 35
src/OpenMind/Admin/ui/js/admin.js

@@ -15,37 +15,6 @@ var fetchHeaders = {
   'Expires': '0'
 };
 
-/* usefull if a blinking text is need, like in MaxMara project, you need to place this code in html:
- *
- * <nav class="navbar navbar-collapse p-0">
- *   <span class="navbar-text blink" style="color: red" id="statusbartext"></span>
- * </nav>
- */
-function SetStatusBarText(msg) {
-  $('#statusbartext').text(msg);
-  setTimeout(() => {
-    $('#statusbartext').text('');
-  }, 60000);
-}
-
-/*
-function refreshNotificationArea() {
-  fetch(`${BASEURL}/api.system.getserverstatus`, {headers: fetchHeaders})
-    .then(resp => {
-      if (resp.status === 200)
-        return resp.json();
-      else
-        return Promise.reject("getserverstatus: error");
-    })
-    .then(data => {
-      NotificationBuilder(data.notify);
-    })
-    .catch(err => {
-      console.log(err);
-    });
-}
-*/
-
 function SetupConfirmationDialog() {
   $('.requestconfirm').on('click', function (ev) {
     let confirmText = $(this).data('confirmtext');
@@ -56,10 +25,12 @@ function SetupConfirmationDialog() {
 
 function SetupSubmitFormDisabler() {
   $('body').on('submit', 'form', function () {
-    $('form input,form select').prop('disabled', false);
-    setTimeout(function () {
-      $('form input,form select').prop('disabled', true);
-    }, 500);
+    $('body').focus();
+    $('form input,form select').prop('readonly', true);
+
+    // Manual submit for more control
+    this.submit();
+    return false;
   });
 }
 

+ 1 - 1
src/OpenMind/DataManager/CSVImporter.php

@@ -87,7 +87,7 @@ class CSVImporter
                 $distinta->descrizione = $data[ENUM_DIMATEC_CSV::MXDESC];
                 $distinta->qta_prelevare = $data[ENUM_DIMATEC_CSV::MXQTMI];
                 $distinta->save();
-              } catch (PDOException $e) {
+              } catch (\PDOException $e) {
                 $this->output .= $e->getMessage();
               }
             });

+ 1 - 1
src/OpenMind/FindBox/FindBoxCoreSystem.php

@@ -151,7 +151,7 @@ class FindBoxCoreSystem
    * Remove label from findbox system
    *
    * @param string $labelId
-   * @return bool true if successfull else no barcode exist in findbox articles
+   * @return array
    */
   public function UnBind(string $labelId): array
   {

+ 1 - 3
src/OpenMind/FindBox/FindBoxService.php

@@ -137,9 +137,7 @@ class FindBoxService
   /**
    * Called from php spawn process. This script end after MAX_BLINK_TIME
    *
-   * @param $f3
-   * @param $args
-   * @throws \Exception
+   * @param \F3 $f3
    */
   public function Main($f3)
   {

+ 1 - 0
src/OpenMind/FindBox/SmartESL.php

@@ -72,6 +72,7 @@ class SmartESL
    * @param int $iter_time
    * @param int $iterations
    * @param int|null $ledColor
+   * @return array
    */
   public function BlinkSpecial(int $pattern, int $repeat, int $iter_time, int $iterations, int $ledColor = null)
   {

+ 3 - 3
src/OpenMind/System/ErrorHandlers.php

@@ -49,10 +49,10 @@ class ErrorHandlers
 
   /**
    * Simple function to write to default log file
-   * @param string $logmessage
-   * @param int $tracenumber trace index of debug_backtrace() return array, default 1
+   * @param string $logMessage
+   * @param int $traceNumber trace index of debug_backtrace() return array, default 1
    */
-  private function WriteLog($logMessage, $traceNumber = 1)
+  private function WriteLog(string $logMessage, int $traceNumber = 1)
   {
     $trace = debug_backtrace();
 

+ 1 - 1
src/OpenMind/System/OMUtils.php

@@ -122,7 +122,7 @@ class OMUtils
    *
    * @param string $ip
    * @param int $port
-   * @param int $mstimeout timeout of check in milliseconds
+   * @param int $timeout_sec
    * @return int
    */
   function isServerAlive(string $ip, int $port, int $timeout_sec = 5): int

+ 3 - 1
src/OpenMind/System/Soap.php

@@ -8,6 +8,8 @@
 
 namespace OpenMind\System;
 
+use SoapFault;
+
 class Soap extends \SoapClient
 {
   private $ws_url;
@@ -31,7 +33,7 @@ class Soap extends \SoapClient
    * Send list to Soap Service
    *
    * @param string $xml The xml in string format
-   * @param $soapaction the SOAPACTION: "http://servizi_xchange.org/ImportLists"
+   * @param string $soapaction the SOAPACTION: "http://servizi_xchange.org/ImportLists"
    * @return string The XML SOAP response or exception error
    */
   public function ImportLists(string $xml, string $soapaction): ?string

+ 0 - 26
src/OpenMind/Web/Web.php

@@ -21,31 +21,6 @@ class Pages extends Controller
     $f3->set('CONTENT', 'homemenu.tpl');
     echo \Template::instance()->render('masterpage.tpl');
   }
-
-  /**
-   * @deprecated Unused import for this project
-   * @param $f3
-   */
-  public function Import($f3)
-  {
-    $output = '';
-    try {
-      $output .= 'Scanning import folder for new CSV to import...<br/><br/>';
-
-      $importer = new \OpenMind\DataManager\CSVImporter('import');
-      $importer->ScanAndStoreData();
-      $output .= $importer->getOutput();
-
-    } catch (Exception $e) {
-      $output .= $e->getMessage();
-    }
-
-    $output .= '<br/>... end import<br/>';
-
-    $f3->set('MESSAGE', $output);
-    $f3->set('CONTENT', 'message.tpl');
-    echo \Template::instance()->render('masterpage.tpl');
-  }
 }
 
 class Web extends PluginStrategy
@@ -53,7 +28,6 @@ class Web extends PluginStrategy
   public function __construct()
   {
     // Services
-    //$this->AddRoute('GET /importdata', __NAMESPACE__ . '\Pages->Import');
     $this->AddRoute('GET /homemenu', __NAMESPACE__ . '\Pages->HomeMenu');
     $this->AddRoute('GET /', __NAMESPACE__ . '\Login->Login');
     $this->AddRoute("POST /loginform", __NAMESPACE__ . '\Login->LoginForm');

+ 0 - 155
ui/css/omlink.css

@@ -1,155 +0,0 @@
-/**
- * Main SCSS file
- *
- * @author Open Mind
- * @date 27/06/2018
- * @time 17:42
- * @since 18/07/2018 in SCSS format
- */
-.navbar.fixed-bottom {
-  color: white; }
-
-html, body {
-  height: 100%; }
-
-body {
-  background-color: #eeeeee !important;
-  color: white !important;
-  font-family: 'Roboto'; }
-
-/* latin */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 400;
-  src: local("Roboto"), local("Roboto-Regular"), url("ui/fonts/Roboto-Regular.ttf") format("truetype");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
-
-.error_body:before {
-  content: "";
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: url("ui/images/error_bg.png");
-  background-size: cover; }
-
-.error_body .card {
-  opacity: 0.9; }
-
-/*
-input[type="text"], input[type="password"] {
-  border-color: #C5AC0F !important;
-  background-color: #484848 !important;
-}
-
-input[type="text"]:focus, input[type="password"]:focus {
-  border-color: #C5AC0F !important;
-  color: #ffd242 !important;
-}
-*/
-/*input {
-  border-color: darken($inputBgColor, 10%);
-  color: darken($inputColor, 10%);
-}
-
-input:focus {
-  background-color: $inputBgColor !important;
-  border-color: $inputColor !important;
-}*/
-.form-control, .btn {
-  background-color: #4d5099 !important;
-  color: white !important; }
-
-.form-control:focus, .btn:focus {
-  background-color: #6063af !important;
-  border-color: #3c3e77 !important;
-  box-shadow: 0 0 10px #4d5099 !important; }
-
-.form-control:disabled {
-  color: #e6e6e6 !important;
-  background-color: #3f427e !important; }
-
-.debugborder {
-  border: 1px solid red !important; }
-
-.disablebutton {
-  opacity: 0.4; }
-
-.imgbuttonmenu {
-  max-height: 180px !important;
-  border-radius: 10px !important; }
-
-.om-shadow {
-  filter: drop-shadow(0px 0.2em 5px #444444); }
-
-input::placeholder {
-  color: gray !important; }
-
-input::-ms-input-placeholder {
-  color: gray !important; }
-
-.navbar {
-  background-color: rgba(94, 107, 116, 0.95) !important; }
-
-.rounded {
-  border-radius: 15px !important; }
-
-@keyframes blink {
-  0% {
-    -webkit-opacity: 0.1;
-    -moz-opacity: 0.1;
-    -ms-opacity: 0.1;
-    -o-opacity: 0.1;
-    opacity: 0.1; }
-  100% {
-    -webkit-opacity: 1;
-    -moz-opacity: 1;
-    -ms-opacity: 1;
-    -o-opacity: 1;
-    opacity: 1; } }
-
-@-webkit-keyframes blink {
-  0% {
-    -webkit-opacity: 0.1;
-    -moz-opacity: 0.1;
-    -ms-opacity: 0.1;
-    -o-opacity: 0.1;
-    opacity: 0.1; }
-  100% {
-    -webkit-opacity: 1;
-    -moz-opacity: 1;
-    -ms-opacity: 1;
-    -o-opacity: 1;
-    opacity: 1; } }
-
-.blink {
-  -webkit-transition: all 0.1s ease-in-out;
-  -moz-transition: all 0.1s ease-in-out;
-  -ms-transition: all 0.1s ease-in-out;
-  -o-transition: all 0.1s ease-in-out;
-  transition: all 0.1s ease-in-out;
-  -webkit-animation: blink alternate 1s infinite ease-in-out;
-  -moz-animation: blink alternate 1s infinite ease-in-out;
-  -ms-animation: blink alternate 1s infinite ease-in-out;
-  -o-animation: blink alternate 1s infinite ease-in-out;
-  animation: blink alternate 1s infinite ease-in-out; }
-
-#sysmsgnum {
-  color: white;
-  background-color: red;
-  font-size: 40%;
-  position: absolute;
-  left: 15px;
-  bottom: 0; }
-
-#notification_area {
-  padding-bottom: 0;
-  border-radius: 10px 10px; }
-
-#notification_area_deleteall {
-  background-color: #3380BD;
-  color: white;
-  border-radius: 0 0 10px 10px;
-  padding: 0; }

+ 1 - 1
ui/js/omlink.js

@@ -9,7 +9,7 @@
 let CUSTOM_NOTIFY = 0x4000;
 let REFRESH_FILTERS = CUSTOM_NOTIFY + 1;
 
-var fetchHeaders = {
+const fetchHeaders = {
   'Accept': 'text/html',
   'Content-Type': 'text/html',
   'X-Requested-With': 'XMLHttpRequest',