This commit is contained in:
2018-09-16 09:04:26 +08:00
parent f85cec8fd1
commit 29cce35d30
34 changed files with 88 additions and 88 deletions

View File

@@ -12,8 +12,8 @@ before_script:
- 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi'
- npm -v
- npm install winston@2.3.0 --production
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
- npm install iobroker.web --prefix ./node_modules/iobroker.js-controller/ --production
- 'npm install https://github.com/yunkong2/yunkong2.js-controller/tarball/master --production'
- npm install yunkong2.web --prefix ./node_modules/yunkong2.js-controller/ --production
env:
- CXX=g++-4.8
addons:

View File

@@ -89,7 +89,7 @@ module.exports = function (grunt) {
options: {
patterns: [
{
match: /iobroker/gi,
match: /yunkong2/gi,
replacement: appName
},
{

View File

@@ -70,7 +70,7 @@
* (bluefox) make red-number working again.
* (bluefox) extend dialog with atuoclose timeout
* (bluefox) add editWidgetNames
* (bluefox) remove jqueryUI files to iobroker.web
* (bluefox) remove jqueryUI files to yunkong2.web
### 0.7.4 (2015-10-27)
* (SmilingJack) add "jqui-navigation" with password
@@ -341,7 +341,7 @@
- (bluefox) fix installation process
### 0.2.11 (2015-03-11)
- (bluefox) fix install for iobroker. Required newest ioBroke.js-controller
- (bluefox) fix install for yunkong2. Required newest ioBroke.js-controller
### 0.2.10 (2015-03-09)
- (bluefox) fix install for node-red-vis

View File

@@ -1,20 +1,20 @@
![Logo](admin/vis.png)
# iobroker.vis
# yunkong2.vis
============
[![NPM version](http://img.shields.io/npm/v/iobroker.vis.svg)](https://www.npmjs.com/package/iobroker.vis)
[![Downloads](https://img.shields.io/npm/dm/iobroker.vis.svg)](https://www.npmjs.com/package/iobroker.vis)
[![NPM version](http://img.shields.io/npm/v/yunkong2.vis.svg)](https://www.npmjs.com/package/yunkong2.vis)
[![Downloads](https://img.shields.io/npm/dm/yunkong2.vis.svg)](https://www.npmjs.com/package/yunkong2.vis)
[![NPM](https://nodei.co/npm/iobroker.vis.png?downloads=true)](https://nodei.co/npm/iobroker.vis/)
[![NPM](https://nodei.co/npm/yunkong2.vis.png?downloads=true)](https://nodei.co/npm/yunkong2.vis/)
WEB visualisation for iobroker platform.
WEB visualisation for yunkong2 platform.
## Installation & Documentation
![Demo interface](https://github.com/GermanBluefox/DashUI/raw/master/images/user0.png)
![Demo interface](https://github.com/GermanBluefox/DashUI/raw/master/images/user7.png)
[Online Demos](https://iobroker.net:8080)
[Online Demos](https://yunkong2.net:8080)
## Bindings of objects
Normally most of widgets have ObjectID attribute. And this attribute can be bound with some value of object ID.
@@ -41,7 +41,7 @@ Following operations are supported:
- hex2 - convert value to hexadecimal value. All letters are lower cased. If value less 16, so the leading zero will be added.
- HEX - same as hex, but upper cased.
- HEX2 - same as hex2, but upper cased.
- date - format date according to given format. Format is the same as in [iobroker.javascript](https://github.com/iobroker/iobroker.javascript/blob/master/README.md#formatdate)
- date - format date according to given format. Format is the same as in [yunkong2.javascript](https://github.com/yunkong2/yunkong2.javascript/blob/master/README.md#formatdate)
- min(N) - if value is less than N, take the N, elsewise value
- max(M) - if value is greater than M, take the M, elsewise value
- sqrt - square root
@@ -202,7 +202,7 @@ Notice that this settings is valid only for reconnection and not for the first c
* (bluefox) show error stack
* (bluefox) fix binding
* (Apollon77) fix testing
* (bluefox) fix for iobroker.pro and external socket.io settings
* (bluefox) fix for yunkong2.pro and external socket.io settings
* (bluefox) A user variable was added into bindings.
* (bluefox) Fixed widget tabs

View File

@@ -2,6 +2,6 @@
"Check license": "Lizenz prüfen",
"License:": "License Key:",
"Service is offline. Please try later.": "Service ist momentan nicht erreichbar oder keine Internetverbindung vorhanden. Bitte fersuchen Sie später noch ein mal oder prüfen Sie die Internetverbindung.",
"instruction": "Man braucht eine Lizenz um <b>vis</b> zu nutzen.<br><b>vis</b> ist kostenlos für private Nutzung. Nur für kommerzielle Gebrauch muss man für eine Lizenz bezahlen.<br>Man kann eine Lizenz auf <a href='https://iobroker.net' target='_blank'>iobroker.net</a> nach der Registrierung bekommen.",
"instruction": "Man braucht eine Lizenz um <b>vis</b> zu nutzen.<br><b>vis</b> ist kostenlos für private Nutzung. Nur für kommerzielle Gebrauch muss man für eine Lizenz bezahlen.<br>Man kann eine Lizenz auf <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> nach der Registrierung bekommen.",
"vis adapter settings": "vis Adapter-Einstellungen"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Check license",
"License:": "License key:",
"Service is offline. Please try later.": "Service is offline or no internet available. Please try later or check the internet connection.",
"instruction": "To use <b>vis</b>, you must get the license key for it.<br><b>vis</b> is free for private use, but for commercial use it has a price.<br>You can get the license on <a href='https://iobroker.net' target='_blank'>iobroker.net</a> after short registration.",
"instruction": "To use <b>vis</b>, you must get the license key for it.<br><b>vis</b> is free for private use, but for commercial use it has a price.<br>You can get the license on <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> after short registration.",
"vis adapter settings": "vis adapter settings"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Verificar licencia",
"License:": "Clave de licencia:",
"Service is offline. Please try later.": "El servicio está fuera de línea o no hay internet disponible. Por favor intente más tarde o verifique la conexión a internet.",
"instruction": "Para usar <b> vis </b>, debe obtener la clave de licencia correspondiente. <br> <b> vis </b> es gratuito para uso privado, pero para uso comercial tiene un precio. <br> Usted puede obtener la licencia en <a href='https://iobroker.net' target='_blank'>iobroker.net</a> después de un breve registro.",
"instruction": "Para usar <b> vis </b>, debe obtener la clave de licencia correspondiente. <br> <b> vis </b> es gratuito para uso privado, pero para uso comercial tiene un precio. <br> Usted puede obtener la licencia en <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> después de un breve registro.",
"vis adapter settings": "vis configuración del adaptador"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Vérifier la licence",
"License:": "Clé de licence:",
"Service is offline. Please try later.": "Le service est hors ligne ou pas disponible sur Internet. Veuillez réessayer plus tard ou vérifier la connexion Internet.",
"instruction": "Pour utiliser <b> vis </b>, vous devez obtenir la clé de licence. <br> <b>vis</b> est libre pour un usage privé, mais pour un usage commercial, il a un prix. <br> Vous peut obtenir la licence sur <a href='https://iobroker.net' target='_blank'>iobroker.net</a> après une brève inscription.",
"instruction": "Pour utiliser <b> vis </b>, vous devez obtenir la clé de licence. <br> <b>vis</b> est libre pour un usage privé, mais pour un usage commercial, il a un prix. <br> Vous peut obtenir la licence sur <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> après une brève inscription.",
"vis adapter settings": "paramètres de l'adaptateur vis"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Controlla la licenza",
"License:": "Chiave di licenza:",
"Service is offline. Please try later.": "Il servizio è offline o non disponibile su Internet. Si prega di provare più tardi o controllare la connessione internet.",
"instruction": "Per utilizzare <b> vis </b>, devi ottenere il codice di licenza per esso. <br> <b>vis</b> è gratuito per uso privato, ma per uso commerciale ha un prezzo. <br> Tu può ottenere la licenza su <a href='https://iobroker.net' target='_blank'>iobroker.net</a> dopo una breve registrazione.",
"instruction": "Per utilizzare <b> vis </b>, devi ottenere il codice di licenza per esso. <br> <b>vis</b> è gratuito per uso privato, ma per uso commerciale ha un prezzo. <br> Tu può ottenere la licenza su <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> dopo una breve registrazione.",
"vis adapter settings": "impostazioni della scheda vis"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Controleer licentie",
"License:": "Licentiesleutel:",
"Service is offline. Please try later.": "Service is offline of geen internet beschikbaar. Probeer het later opnieuw of controleer de internetverbinding.",
"instruction": "Als u <b> vis </b> wilt gebruiken, moet u hiervoor de licentiesleutel hebben. <br> <b> vis </b> is gratis voor privégebruik, maar voor commercieel gebruik heeft het een prijs. <br> You kan de licentie krijgen op <a href='https://iobroker.net' target='_blank'>iobroker.net</a> na een korte registratie.",
"instruction": "Als u <b> vis </b> wilt gebruiken, moet u hiervoor de licentiesleutel hebben. <br> <b> vis </b> is gratis voor privégebruik, maar voor commercieel gebruik heeft het een prijs. <br> You kan de licentie krijgen op <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> na een korte registratie.",
"vis adapter settings": "vis adapter instellingen"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Sprawdź licencję",
"License:": "Klucz licencyjny:",
"Service is offline. Please try later.": "Usługa jest niedostępna lub nie ma dostępu do Internetu. Spróbuj później lub sprawdź połączenie internetowe.",
"instruction": "Aby użyć <b> vis </b>, musisz uzyskać klucz licencyjny. <B> vis </b> jest bezpłatny do użytku prywatnego, ale do celów komercyjnych ma swoją cenę. może uzyskać licencję na <a href='https://iobroker.net' target='_blank'>iobroker.net</a> po krótkiej rejestracji.",
"instruction": "Aby użyć <b> vis </b>, musisz uzyskać klucz licencyjny. <B> vis </b> jest bezpłatny do użytku prywatnego, ale do celów komercyjnych ma swoją cenę. może uzyskać licencję na <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> po krótkiej rejestracji.",
"vis adapter settings": "ustawienia adaptera vis"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Verifique a licença",
"License:": "Chave de licença:",
"Service is offline. Please try later.": "O serviço está offline ou não há internet disponível. Por favor tente mais tarde ou confira a conexão com a internet.",
"instruction": "Para usar <b> vis </b>, você deve obter a chave de licença para isso. <b>vis</b> é grátis para uso privado, mas para uso comercial, ele tem um preço. <br> Você pode obter a licença em <a href='https://iobroker.net' target='_blank'>iobroker.net</a> após curto registro.",
"instruction": "Para usar <b> vis </b>, você deve obter a chave de licença para isso. <b>vis</b> é grátis para uso privado, mas para uso comercial, ele tem um preço. <br> Você pode obter a licença em <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> após curto registro.",
"vis adapter settings": "vis as configurações do adaptador"
}

View File

@@ -2,6 +2,6 @@
"Check license": "Проверить лицензию",
"License:": "Лицензионный ключ:",
"Service is offline. Please try later.": "Сервис сейчас недоступен или нет интернет соединения. Попробуйте попозже или проверте интеренет соединение.",
"instruction": "Для пользования <b>vis</b> необходимо получить лицензионный ключ.<br><b>vis</b> бесплатен для личного использования в некоммерческих целях. Для использования <b>vis</b> в коммерческих целях необходимо заплатить за лицензию.<br>Лицензионный ключ можно получить здесь <a href='https://iobroker.net/accountLicenses' target='_blank'>iobroker.net</a> после регистрации.",
"instruction": "Для пользования <b>vis</b> необходимо получить лицензионный ключ.<br><b>vis</b> бесплатен для личного использования в некоммерческих целях. Для использования <b>vis</b> в коммерческих целях необходимо заплатить за лицензию.<br>Лицензионный ключ можно получить здесь <a href='https://yunkong2.net/accountLicenses' target='_blank'>yunkong2.net</a> после регистрации.",
"vis adapter settings": "Настройки драйвера vis"
}

View File

@@ -61,7 +61,7 @@
$.ajax({
type: 'POST',
url: 'https://iobroker.net/cert/',
url: 'https://yunkong2.net/cert/',
data: $('#license').val(),
contentType: 'text/plain',
xhrFields: {

View File

@@ -76,7 +76,7 @@
$.ajax({
type: 'POST',
url: 'https://iobroker.net/cert/',
url: 'https://yunkong2.net/cert/',
data: $('#license').val(),
contentType: 'text/plain',
xhrFields: {

View File

@@ -6,6 +6,6 @@ systemDictionary = {
"Check license": { "en": "Check license", "de": "Lizenz prüfen", "ru": "Проверить лицензию", "pt": "Verifique a licença", "nl": "Controleer licentie", "fr": "Vérifier la licence", "it": "Controlla la licenza", "es": "Verificar licencia", "pl": "Sprawdź licencję"},
"License:": { "en": "License key:", "de": "License Key:", "ru": "Лицензионный ключ:", "pt": "Chave de licença:", "nl": "Licentiesleutel:", "fr": "Clé de licence:", "it": "Chiave di licenza:", "es": "Clave de licencia:", "pl": "Klucz licencyjny:"},
"Service is offline. Please try later.": { "en": "Service is offline or no internet available. Please try later or check the internet connection.", "de": "Service ist momentan nicht erreichbar oder keine Internetverbindung vorhanden. Bitte fersuchen Sie später noch ein mal oder prüfen Sie die Internetverbindung.", "ru": "Сервис сейчас недоступен или нет интернет соединения. Попробуйте попозже или проверте интеренет соединение.", "pt": "O serviço está offline ou não há internet disponível. Por favor tente mais tarde ou confira a conexão com a internet.", "nl": "Service is offline of geen internet beschikbaar. Probeer het later opnieuw of controleer de internetverbinding.", "fr": "Le service est hors ligne ou pas disponible sur Internet. Veuillez réessayer plus tard ou vérifier la connexion Internet.", "it": "Il servizio è offline o non disponibile su Internet. Si prega di provare più tardi o controllare la connessione internet.", "es": "El servicio está fuera de línea o no hay internet disponible. Por favor intente más tarde o verifique la conexión a internet.", "pl": "Usługa jest niedostępna lub nie ma dostępu do Internetu. Spróbuj później lub sprawdź połączenie internetowe."},
"instruction": { "en": "To use <b>vis</b>, you must get the license key for it.<br><b>vis</b> is free for private use, but for commercial use it has a price.<br>You can get the license on <a href='https://iobroker.net' target='_blank'>iobroker.net</a> after short registration.", "de": "Man braucht eine Lizenz um <b>vis</b> zu nutzen.<br><b>vis</b> ist kostenlos für private Nutzung. Nur für kommerzielle Gebrauch muss man für eine Lizenz bezahlen.<br>Man kann eine Lizenz auf <a href='https://iobroker.net' target='_blank'>iobroker.net</a> nach der Registrierung bekommen.", "ru": "Для пользования <b>vis</b> необходимо получить лицензионный ключ.<br><b>vis</b> бесплатен для личного использования в некоммерческих целях. Для использования <b>vis</b> в коммерческих целях необходимо заплатить за лицензию.<br>Лицензионный ключ можно получить здесь <a href='https://iobroker.net/accountLicenses' target='_blank'>iobroker.net</a> после регистрации.", "pt": "Para usar <b> vis </b>, você deve obter a chave de licença para isso. <b>vis</b> é grátis para uso privado, mas para uso comercial, ele tem um preço. <br> Você pode obter a licença em <a href='https://iobroker.net' target='_blank'>iobroker.net</a> após curto registro.", "nl": "Als u <b> vis </b> wilt gebruiken, moet u hiervoor de licentiesleutel hebben. <br> <b> vis </b> is gratis voor privégebruik, maar voor commercieel gebruik heeft het een prijs. <br> You kan de licentie krijgen op <a href='https://iobroker.net' target='_blank'>iobroker.net</a> na een korte registratie.", "fr": "Pour utiliser <b> vis </b>, vous devez obtenir la clé de licence. <br> <b>vis</b> est libre pour un usage privé, mais pour un usage commercial, il a un prix. <br> Vous peut obtenir la licence sur <a href='https://iobroker.net' target='_blank'>iobroker.net</a> après une brève inscription.", "it": "Per utilizzare <b> vis </b>, devi ottenere il codice di licenza per esso. <br> <b>vis</b> è gratuito per uso privato, ma per uso commerciale ha un prezzo. <br> Tu può ottenere la licenza su <a href='https://iobroker.net' target='_blank'>iobroker.net</a> dopo una breve registrazione.", "es": "Para usar <b> vis </b>, debe obtener la clave de licencia correspondiente. <br> <b> vis </b> es gratuito para uso privado, pero para uso comercial tiene un precio. <br> Usted puede obtener la licencia en <a href='https://iobroker.net' target='_blank'>iobroker.net</a> después de un breve registro.", "pl": "Aby użyć <b> vis </b>, musisz uzyskać klucz licencyjny. <B> vis </b> jest bezpłatny do użytku prywatnego, ale do celów komercyjnych ma swoją cenę. może uzyskać licencję na <a href='https://iobroker.net' target='_blank'>iobroker.net</a> po krótkiej rejestracji."},
"instruction": { "en": "To use <b>vis</b>, you must get the license key for it.<br><b>vis</b> is free for private use, but for commercial use it has a price.<br>You can get the license on <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> after short registration.", "de": "Man braucht eine Lizenz um <b>vis</b> zu nutzen.<br><b>vis</b> ist kostenlos für private Nutzung. Nur für kommerzielle Gebrauch muss man für eine Lizenz bezahlen.<br>Man kann eine Lizenz auf <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> nach der Registrierung bekommen.", "ru": "Для пользования <b>vis</b> необходимо получить лицензионный ключ.<br><b>vis</b> бесплатен для личного использования в некоммерческих целях. Для использования <b>vis</b> в коммерческих целях необходимо заплатить за лицензию.<br>Лицензионный ключ можно получить здесь <a href='https://yunkong2.net/accountLicenses' target='_blank'>yunkong2.net</a> после регистрации.", "pt": "Para usar <b> vis </b>, você deve obter a chave de licença para isso. <b>vis</b> é grátis para uso privado, mas para uso comercial, ele tem um preço. <br> Você pode obter a licença em <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> após curto registro.", "nl": "Als u <b> vis </b> wilt gebruiken, moet u hiervoor de licentiesleutel hebben. <br> <b> vis </b> is gratis voor privégebruik, maar voor commercieel gebruik heeft het een prijs. <br> You kan de licentie krijgen op <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> na een korte registratie.", "fr": "Pour utiliser <b> vis </b>, vous devez obtenir la clé de licence. <br> <b>vis</b> est libre pour un usage privé, mais pour un usage commercial, il a un prix. <br> Vous peut obtenir la licence sur <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> après une brève inscription.", "it": "Per utilizzare <b> vis </b>, devi ottenere il codice di licenza per esso. <br> <b>vis</b> è gratuito per uso privato, ma per uso commerciale ha un prezzo. <br> Tu può ottenere la licenza su <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> dopo una breve registrazione.", "es": "Para usar <b> vis </b>, debe obtener la clave de licencia correspondiente. <br> <b> vis </b> es gratuito para uso privado, pero para uso comercial tiene un precio. <br> Usted puede obtener la licencia en <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> después de un breve registro.", "pl": "Aby użyć <b> vis </b>, musisz uzyskać klucz licencyjny. <B> vis </b> jest bezpłatny do użytku prywatnego, ale do celów komercyjnych ma swoją cenę. może uzyskać licencję na <a href='https://yunkong2.net' target='_blank'>yunkong2.net</a> po krótkiej rejestracji."},
"vis adapter settings": { "en": "vis adapter settings", "de": "vis Adapter-Einstellungen", "ru": "Настройки драйвера vis", "pt": "vis as configurações do adaptador", "nl": "vis adapter instellingen", "fr": "paramètres de l'adaptateur vis", "it": "impostazioni della scheda vis", "es": "vis configuración del adaptador", "pl": "ustawienia adaptera vis"},
};

View File

@@ -16,8 +16,8 @@ install:
- ps: npm --version
- npm install
- npm install winston@2.3.1
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
- npm install iobroker.web --prefix ./node_modules/iobroker.js-controller/
- 'npm install https://github.com/yunkong2/yunkong2.js-controller/tarball/master --production'
- npm install yunkong2.web --prefix ./node_modules/yunkong2.js-controller/
test_script:
- echo %cd%
- node --version

View File

@@ -116,29 +116,29 @@
}
},
"desc": {
"en": "Graphical user interface for iobroker",
"de": "Grafische Benutzeroberfläche für iobroker",
"ru": "Графический пользовательский интерфейс для iobroker",
"pt": "Interface gráfica do usuário para iobroker",
"nl": "Grafische gebruikersinterface voor iobroker",
"fr": "Interface utilisateur graphique pour iobroker",
"it": "Interfaccia utente grafica per iobroker",
"es": "Interfaz gráfica de usuario para iobroker",
"pl": "Graficzny interfejs użytkownika dla iobroker"
"en": "Graphical user interface for yunkong2",
"de": "Grafische Benutzeroberfläche für yunkong2",
"ru": "Графический пользовательский интерфейс для yunkong2",
"pt": "Interface gráfica do usuário para yunkong2",
"nl": "Grafische gebruikersinterface voor yunkong2",
"fr": "Interface utilisateur graphique pour yunkong2",
"it": "Interfaccia utente grafica per yunkong2",
"es": "Interfaz gráfica de usuario para yunkong2",
"pl": "Graficzny interfejs użytkownika dla yunkong2"
},
"platform": "Javascript/Node.js",
"loglevel": "info",
"icon": "vis.png",
"enabled": true,
"mode": "once",
"extIcon": "https://raw.githubusercontent.com/iobroker/iobroker.vis/master/admin/vis.png",
"extIcon": "https://raw.githubusercontent.com/yunkong2/yunkong2.vis/master/admin/vis.png",
"keywords": [
"DashUI",
"GUI",
"graphical",
"scada"
],
"readme": "https://github.com/iobroker/iobroker.vis/blob/master/README.md",
"readme": "https://github.com/yunkong2/yunkong2.vis/blob/master/README.md",
"authors": [
"bluefox <dogafox@gmail.com>"
],

View File

@@ -83,7 +83,7 @@ function syncWidgetSets(onlyLocal, isLicenseError) {
var dirs = fs.readdirSync(path);
var sets = [];
for (var d = 0; d < dirs.length; d++) {
if (dirs[d].match(/^iobroker\./i) && fs.existsSync(path + dirs[d] + '/widgets/')) {
if (dirs[d].match(/^yunkong2\./i) && fs.existsSync(path + dirs[d] + '/widgets/')) {
pack = null;
try {
pack = JSON.parse(fs.readFileSync(path + dirs[d] + '/io-package.json').toString());
@@ -97,7 +97,7 @@ function syncWidgetSets(onlyLocal, isLicenseError) {
try {
dirs = fs.readdirSync(__dirname + '/../../../../');
for (d = 0; d < dirs.length; d++) {
if (dirs[d].match(/^iobroker\./i) && fs.existsSync(__dirname + '/../../../../' + dirs[d] + '/widgets/')) {
if (dirs[d].match(/^yunkong2\./i) && fs.existsSync(__dirname + '/../../../../' + dirs[d] + '/widgets/')) {
found = false;
name = dirs[d].toLowerCase();
for (var s = 0; s < sets.length; s++) {
@@ -139,7 +139,7 @@ function syncWidgetSets(onlyLocal, isLicenseError) {
if (!found) {
for (var b = 0; b < sets.length; b++) {
var ssName = sets[b].name.toLowerCase();
if (ssName === 'iobroker.vis-' + name || ssName === 'iobroker.' + name) {
if (ssName === 'yunkong2.vis-' + name || ssName === 'yunkong2.' + name) {
found = true;
break;
}
@@ -164,7 +164,7 @@ function syncWidgetSets(onlyLocal, isLicenseError) {
} else {
for (var g = 0; g < sets.length; g++) {
var sName = sets[g].name.toLowerCase();
if (sName === 'iobroker.vis-' + name || sName === 'iobroker.' + name) {
if (sName === 'yunkong2.vis-' + name || sName === 'yunkong2.' + name) {
if (sets[g].pack && sets[g].pack.native && sets[g].pack.native.always) {
widgetSets.push({name: name, always: true});
} else if (sets[g].pack && sets[g].pack.native && sets[g].pack.native.dependencies) {

View File

@@ -27,8 +27,8 @@ let appName;
function getControllerDir(isInstall) {
// Find the js-controller location
const possibilities = [
'iobroker.js-controller',
'ioBroker.js-controller',
'yunkong2.js-controller',
'yunkong2.js-controller',
];
/** @type {string} */
let controllerPath;

View File

@@ -1,6 +1,6 @@
/**
*
* iobroker vis Adapter
* yunkong2 vis Adapter
*
* (c) 2014-2017 bluefox, hobbyquaker
*
@@ -105,7 +105,7 @@ function writeFile(fileName, callback) {
function upload(callback) {
adapter.log.info('Upload ' + adapter.name + ' anew, while changes detected...');
var file = utils.controllerDir + '/iobroker.js';
var file = utils.controllerDir + '/yunkong2.js';
var child = require('child_process').spawn('node', [file, 'upload', adapter.name, 'widgets']);
var count = 0;
child.stdout.on('data', function (data) {
@@ -299,14 +299,14 @@ function main() {
// first of all check license
if (!adapter.config.license || typeof adapter.config.license !== 'string') {
indicateError(function () {
adapter.log.error('No license found for vis. Please get one on https://iobroker.net !');
adapter.log.error('No license found for vis. Please get one on https://yunkong2.net !');
//adapter.stop();
generatePages(true);
});
} else {
// An object of options to indicate where to post to
var postOptions = {
host: 'iobroker.net',
host: 'yunkong2.net',
path: '/cert/',
method: 'POST',
headers: {

View File

@@ -1,6 +1,6 @@
{
"name": "iobroker.vis",
"description": "Graphical user interface for iobroker.",
"name": "yunkong2.vis",
"description": "Graphical user interface for yunkong2.",
"version": "1.1.7",
"author": {
"name": "bluefox",
@@ -10,19 +10,19 @@
"bluefox <dogafox@gmail.com>",
"hobbyquaker <hq@ccu.io>"
],
"homepage": "https://github.com/iobroker/iobroker.vis",
"homepage": "https://github.com/yunkong2/yunkong2.vis",
"repository": {
"type": "git",
"url": "https://github.com/iobroker/iobroker.vis"
"url": "https://github.com/yunkong2/yunkong2.vis"
},
"licenses": [
{
"type": "CC-BY-NC-4.0",
"url": "https://github.com/iobroker/iobroker.vis/blob/master/LICENSE"
"url": "https://github.com/yunkong2/yunkong2.vis/blob/master/LICENSE"
}
],
"keywords": [
"iobroker",
"yunkong2",
"GUI",
"DashUI",
"web interface",
@@ -35,12 +35,12 @@
"devDependencies": {
"gulp": "^3.9.1",
"gulp-replace": "^1.0.0",
"iobroker.web": "*",
"yunkong2.web": "*",
"mocha": "^5.2.0",
"chai": "^4.1.2"
},
"bugs": {
"url": "https://github.com/iobroker/iobroker.vis/issues"
"url": "https://github.com/yunkong2/yunkong2.vis/issues"
},
"main": "main.js",
"scripts": {

View File

@@ -415,7 +415,7 @@ function clearControllerLog() {
}
function clearDB() {
var dirPath = rootDir + 'tmp/iobroker-data/sqlite';
var dirPath = rootDir + 'tmp/yunkong2-data/sqlite';
var files;
try {
if (fs.existsSync(dirPath)) {

View File

@@ -52,12 +52,12 @@ describe('Test package.json and io-package.json', function() {
console.log();
}
if (
ioPackage.common.title.indexOf('iobroker') !== -1 ||
ioPackage.common.title.indexOf('ioBroker') !== -1 ||
ioPackage.common.title.indexOf('yunkong2') !== -1 ||
ioPackage.common.title.indexOf('yunkong2') !== -1 ||
ioPackage.common.title.indexOf('adapter') !== -1 ||
ioPackage.common.title.indexOf('Adapter') !== -1
) {
console.log('WARNING: title contains Adapter or ioBroker. It is clear anyway, that it is adapter for ioBroker.');
console.log('WARNING: title contains Adapter or yunkong2. It is clear anyway, that it is adapter for yunkong2.');
console.log();
}

View File

@@ -160,9 +160,9 @@ var servConn = {
}
},
reload: function () {
if (window.location.host === 'iobroker.net' ||
window.location.host === 'iobroker.biz' ||
window.location.host === 'iobroker.pro') {
if (window.location.host === 'yunkong2.net' ||
window.location.host === 'yunkong2.biz' ||
window.location.host === 'yunkong2.pro') {
window.location = '/';
} else {
window.location.reload();
@@ -179,7 +179,7 @@ var servConn = {
if (autoSubscribe !== undefined) this._autoSubscribe = autoSubscribe;
// To start vis as local use one of:
// - start vis from directory with name local, e.g. c:/blbla/local/ioBroker.vis/www/index.html
// - start vis from directory with name local, e.g. c:/blbla/local/yunkong2.vis/www/index.html
// - do not create "_socket/info.js" file in "www" directory
// - create "_socket/info.js" file with
// var socketUrl = "local"; var socketSession = ""; sysLang="en";
@@ -232,7 +232,7 @@ var servConn = {
}
// remove port if via cloud
if (url.match(/iobroker\.pro|iobroker\.net/)) {
if (url.match(/yunkong2\.pro|yunkong2\.net/)) {
url = url.replace(/:\d+/, '');
}
@@ -273,7 +273,7 @@ var servConn = {
setTimeout(function () {
var timeOut = 6000;
// If online give more time
if (window.location.href.indexOf('iobroker.') !== -1) {
if (window.location.href.indexOf('yunkong2.') !== -1) {
timeOut = 12000;
}
that.waitConnect = setTimeout(function() {

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2017 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)

View File

@@ -1,9 +1,9 @@
function fillAbout() {
var html = '';
html += '<ul style="font-size: 1.1em; line-height: 2em; display: inline;">';
html += ' <li><a href="http://iobroker.net/" target="_blank" class="translate">' + _('Web') + '</a></li>';
html += ' <li><a href="http://forum.iobroker.net" target="_blank" class="translate">' + _('Community') + '</a></li>';
html += ' <li><a href="https://github.com/ioBroker/ioBroker.vis/blob/master/README.md" target="_blank" class="translate">' + _('Change log') + '</a>';
html += ' <li><a href="http://yunkong2.net/" target="_blank" class="translate">' + _('Web') + '</a></li>';
html += ' <li><a href="http://forum.yunkong2.net" target="_blank" class="translate">' + _('Community') + '</a></li>';
html += ' <li><a href="https://github.com/yunkong2/yunkong2.vis/blob/master/README.md" target="_blank" class="translate">' + _('Change log') + '</a>';
html += ' </li>';
html += '</ul>';

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)
@@ -13,7 +13,7 @@
* (Free for non-commercial use).
*/
// visEdit - the ioBroker.vis Editor extensions
// visEdit - the yunkong2.vis Editor extensions
/* jshint browser:true */
/* global _ */

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)
@@ -13,7 +13,7 @@
* (Free for non-commercial use).
*/
// visEdit - the ioBroker.vis Editor
// visEdit - the yunkong2.vis Editor
/* jshint browser:true */
/* global document */
/* global console */

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker,
* Creative Common Attribution-NonCommercial (CC BY-NC)
@@ -12,7 +12,7 @@
* Licensees may copy, distribute, display, and perform the work and make derivative works based on it only for noncommercial purposes.
* (Free for non-commercial use).
*/
// visEdit - the ioBroker.vis Editor Wizard
// visEdit - the yunkong2.vis Editor Wizard
'use strict';

View File

@@ -1,6 +1,6 @@
/**
* ioBroker.vis
* https://github.com/ioBroker/ioBroker.vis
* yunkong2.vis
* https://github.com/yunkong2/yunkong2.vis
*
* Copyright (c) 2013-2018 bluefox https://github.com/GermanBluefox, hobbyquaker https://github.com/hobbyquaker
* Creative Common Attribution-NonCommercial (CC BY-NC)