From 676968ed04203414ce29af711f7998a589c2fe0c Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Thu, 14 May 2015 11:38:38 +0200 Subject: [PATCH] Add list option for plugins --- web/lang/big5_big5.php | 5 + web/lang/cn_zh.php | 5 + web/lang/cs_cz.php | 5 + web/lang/de_de.php | 5 + web/lang/dk_dk.php | 5 + web/lang/en_gb.php | 5 + web/lang/es_ar.php | 5 + web/lang/es_es.php | 5 + web/lang/et_ee.php | 5 + web/lang/fr_fr.php | 5 + web/lang/he_il.php | 5 + web/lang/hu_hu.php | 5 + web/lang/it_it.php | 5 + web/lang/ja_jp.php | 5 + web/lang/nl_nl.php | 5 + web/lang/pl_pl.php | 5 + web/lang/pt_br.php | 5 + web/lang/ro_ro.php | 5 + web/lang/ru_ru.php | 5 + web/lang/se_se.php | 5 + .../classic/css/classic/views/plugin.css | 19 +++ web/skins/classic/css/flat/views/plugin.css | 26 ++++ web/skins/classic/js/classic.js | 1 + web/skins/classic/js/flat.js | 1 + web/skins/classic/views/js/plugin.js | 114 +++++++++++++++++- web/skins/classic/views/js/plugin.js.php | 10 +- web/skins/classic/views/plugin.php | 62 ++++++++-- 27 files changed, 318 insertions(+), 15 deletions(-) diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index f3725e2d1..8c7d51aa6 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -80,6 +80,7 @@ $SLANG = array( '8BitGrey' => '8 位元灰階', 'Action' => 'Action', 'Actual' => 'Actual', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => '新增控制', 'AddNewMonitor' => '新增監視', 'AddNewUser' => '新增使用者', @@ -96,6 +97,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => '警告', 'All' => '全部', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => '確定', 'ApplyingStateChange' => '確定狀態改變', 'ArchArchived' => 'Archived Only', @@ -523,6 +525,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -591,6 +595,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Colours', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => '重新命名', 'Replay' => '重新播放', 'ReplayAll' => 'All Events', diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index 9037b9f8f..3ce2bb9e7 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '8 位灰度', 'Action' => '活动动作', 'Actual' => '实际', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => '新建控制', 'AddNewMonitor' => '新建监视器', 'AddNewUser' => '新建用户', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => '警报', 'All' => '全部', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => '应用', 'ApplyingStateChange' => '状态改变生效', 'ArchArchived' => '仅限于存档', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => '数值预置', 'Off' => '关', 'On' => '开', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => '远程影像颜色', 'RemoteMethod' => '远程方法', 'RemoteProtocol' => '远程协议', + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => '重命名', 'Replay' => '重放', 'ReplayAll' => '全部事件', diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 534fdce7f..2488aba53 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '8 bit ed kla', 'Action' => 'Akce', 'Actual' => 'Skuten', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Pidat nov zen', 'AddNewMonitor' => 'Pidat kameru', 'AddNewUser' => 'Pidat uivatele', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Pozor', 'All' => 'Vechny', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Pout', 'ApplyingStateChange' => 'Aplikuji zmnu stavu', 'ArchArchived' => 'Pouze archivovan', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Poet pedvoleb', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Barvy', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Pejmenovat', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/de_de.php b/web/lang/de_de.php index 42708efdb..7841aea6c 100644 --- a/web/lang/de_de.php +++ b/web/lang/de_de.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '8-Bit-Grau', 'Action' => 'Aktion', 'Actual' => 'Original', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Neues Kontrollelement hinzufügen', 'AddNewMonitor' => 'Neuer Monitor', 'AddNewUser' => 'Neuer Benutzer', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alarm', 'All' => 'Alle', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'OK', 'ApplyingStateChange' => 'Aktiviere neuen Status', 'ArchArchived' => 'Nur Archivierte', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Nummerierte Voreinstellungen', 'Off' => 'Aus', 'On' => 'An', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Entfernte Bildfarbe', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Umbenennen', 'Replay' => 'Wiederholung', 'ReplayAll' => 'Alle Ereignisse', diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index e607e2cf0..aaa89f80d 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -77,6 +77,7 @@ $SLANG = array( '8BitGrey' => '8 bit greyscale', 'Action' => 'Action', 'Actual' => 'Aktuel', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Tilfj Ny kontrol', 'AddNewMonitor' => 'Tilfj Ny Monitor', 'AddNewUser' => 'Tilfj Ny Bruger', @@ -93,6 +94,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alarm', 'All' => 'Alle', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Aktiver', 'ApplyingStateChange' => 'Aktivere State ndring', 'ArchArchived' => 'Kun Arkiverede', @@ -520,6 +522,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -588,6 +592,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Farver', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Omdb', 'Replay' => 'Spil Igen', 'ReplayAll' => 'All Events', diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index aae569c88..f74d36450 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -85,6 +85,7 @@ $SLANG = array( '8BitGrey' => '8 bit greyscale', 'Action' => 'Action', 'Actual' => 'Actual', + 'Add' => 'Add', 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => 'Add New Monitor', 'AddNewUser' => 'Add New User', @@ -101,6 +102,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alert', 'All' => 'All', + 'AlreadyInList' => 'Already present in list', 'Apply' => 'Apply', 'ApplyingStateChange' => 'Applying State Change', 'ArchArchived' => 'Archived Only', @@ -520,6 +522,8 @@ $SLANG = array( 'Notes' => 'Notes', 'NumPresets' => 'Num Presets', 'Off' => 'Off', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', + 'OnlyIntegers' => 'An integer number is required', 'On' => 'On', 'OnvifProbe' => 'ONVIF', 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', @@ -588,6 +592,7 @@ $SLANG = array( 'RemoteMethod' => 'Remote Method', 'RemoteProtocol' => 'Remote Protocol', 'Remote' => 'Remote', + 'Remove' => 'Remove', 'Rename' => 'Rename', 'ReplayAll' => 'All Events', 'ReplayGapless' => 'Gapless Events', diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index d8e5fae83..68a593f45 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -27,6 +27,7 @@ $SLANG = array( '8BitGrey' => 'Grises 8 bits', 'Action' => 'Action', 'Actual' => 'Actual', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => 'Agregar Nuevo Monitor', 'AddNewUser' => 'Agregar Nuevo Usuario', @@ -43,6 +44,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alerta', 'All' => 'Todo', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Aplicar', 'ApplyingStateChange' => 'Aplicar Cambio Estado', 'ArchArchived' => 'Solo Archivados', @@ -470,6 +472,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -538,6 +542,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Colours', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Renombrar', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/es_es.php b/web/lang/es_es.php index 51ff81384..ed8c5935f 100644 --- a/web/lang/es_es.php +++ b/web/lang/es_es.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => 'Grises 8 bits', 'Action' => 'Acción', 'Actual' => 'Actual', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Añadir nuevo control', 'AddNewMonitor' => 'Añadir nuevo monitor', 'AddNewUser' => 'Añadir nuevo usuario', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alerta', 'All' => 'Todo', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Aplicar', 'ApplyingStateChange' => 'Aplicando cambio de estado...', 'ArchArchived' => 'Sólo archivados', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Número programa', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Colores de imagen remota', 'RemoteMethod' => 'Método remoto', 'RemoteProtocol' => 'Protocolo remoto', + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Renombrar', 'Replay' => 'Repetir', 'ReplayAll' => 'Todos los eventos', diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index 8a9948f17..aa89ab260 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -77,6 +77,7 @@ $SLANG = array( '8BitGrey' => '8 bit mustvalge', 'Action' => 'Action', 'Actual' => 'Aktuaalne', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Lisa uus Kontroll', 'AddNewMonitor' => 'Lisa uus Monitor', 'AddNewUser' => 'Lisa uus Kasutaja', @@ -93,6 +94,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Hoiatus', 'All' => 'All', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Apply', 'ApplyingStateChange' => 'Applying State Change', 'ArchArchived' => 'Arhiveeritud Ainult', @@ -520,6 +522,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Väljas', 'On' => 'Sees', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -588,6 +592,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Colours', 'RemoteMethod' => 'Remote Method', 'RemoteProtocol' => 'Remote Protocol', + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Nimeta ümber', 'Replay' => 'Kordus esitus', 'ReplayAll' => 'Kõik sündmused', diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php index e4c44c138..7b243e963 100644 --- a/web/lang/fr_fr.php +++ b/web/lang/fr_fr.php @@ -82,6 +82,7 @@ $SLANG = array( '8BitGrey' => 'Gris 8 bits', 'Action' => 'Action', 'Actual' => 'Réel', + 'Add' => 'Ajouter', // Added - 2015-05-14 'AddNewControl' => 'Ajouter contrôle', 'AddNewMonitor' => 'Ajouter caméra', 'AddNewUser' => 'Ajouter utilisateur', @@ -98,6 +99,7 @@ $SLANG = array( 'AlarmScore' => 'Score alarme', // Added - 2015-05-06 'Alert' => 'Alerte', 'All' => 'Tous', + 'AlreadyInList' => 'Déjà présent dans la liste', // Added - 2015-05-14 'Apply' => 'Appliquer', 'ApplyingStateChange' => 'Appl. chgt état', 'ArchArchived' => 'Archivé seul.', @@ -525,6 +527,8 @@ $SLANG = array( 'NumPresets' => 'Nombre', 'Off' => 'Désactiver', 'On' => 'Activer', + 'OnlyAlphaChars' => 'Seuls les caractères alphanumériques sont autorisés', // Added - 2015-05-14 + 'OnlyIntegers' => 'Un nombre entier est requis', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Veuillez fournir un nom d\'utilisateur et un mot de passe pour la caméra sélectionnée.
Si aucun utilisateur n\'a été créé pour la caméra alors l\'utilisateur saisi sera créé avec le mot de passe associé.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'La liste ci-dessous montre les caméras ONVIF détectées et si elles sont déjà utilisées ou disponibles.

Sélectionnez la caméra souhaitée dans la liste ci-dessous.

Veuillez noter que toutes les caméras ne sont pas forcément détectées et que la sauvegarde entraînera l\'écrasement des paramètres déjà configurés pour la caméra en cours.

', // Added - 2015-04-18 @@ -593,6 +597,7 @@ $SLANG = array( 'RemoteImageColours' => 'Nombre de couleurs', 'RemoteMethod' => 'Méthode', // Added - 2009-02-08 'RemoteProtocol' => 'Protocole', // Added - 2009-02-08 + 'Remove' => 'Enlever', // Added - 2015-05-14 'Rename' => 'Renommer', 'Replay' => 'Relire', 'ReplayAll' => 'Tous les événements', diff --git a/web/lang/he_il.php b/web/lang/he_il.php index 9542c21da..4595be865 100644 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => ' 8 ', 'Action' => '', 'Actual' => '', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => ' ', 'AddNewMonitor' => ' ', 'AddNewUser' => ' ', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => '', 'All' => '', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => '', 'ApplyingStateChange' => ' ', 'ArchArchived' => ' ', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => '', 'On' => '', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Colours', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => ' ', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 0834622e8..f6be9e319 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -119,6 +119,7 @@ $SLANG = array( '8BitGrey' => '8 bit szürkeárnyalat', 'Action' => 'Művelet', 'Actual' => 'Valós', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Új vezérlés', 'AddNewMonitor' => 'Új kamera', 'AddNewUser' => 'Új felhasználó', @@ -135,6 +136,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Figyelem', 'All' => 'Mind', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Alkalmaz', 'ApplyingStateChange' => 'Állapot váltása...', 'ArchArchived' => 'Csak archivált', @@ -562,6 +564,8 @@ $SLANG = array( 'NumPresets' => 'Profilok száma', 'Off' => 'Ki', 'On' => 'Be', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -630,6 +634,7 @@ $SLANG = array( 'RemoteImageColours' => 'A kép színe', 'RemoteMethod' => 'Hálózati cím mód', 'RemoteProtocol' => 'Hálózati protokoll', + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Átnevezés', 'Replay' => 'Események visszajátszása', 'ReplayAll' => 'Mindet', diff --git a/web/lang/it_it.php b/web/lang/it_it.php index 594bc1075..a64c5ee29 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -81,6 +81,7 @@ $SLANG = array( '8BitGrey' => '8 bit scala di grigio', 'Action' => 'Azione', 'Actual' => 'Attuale', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Aggiungi nuovo Controllo', 'AddNewMonitor' => 'Aggiungi nuovo Monitor', 'AddNewUser' => 'Aggiungi nuovo Utente', @@ -97,6 +98,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Attenzione', 'All' => 'Tutto', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Applica', 'ApplyingStateChange' => 'Sto applicando le modifiche', 'ArchArchived' => 'Archiviato', @@ -524,6 +526,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -592,6 +596,7 @@ $SLANG = array( 'RemoteImageColours' => 'Colori delle immagini Remote', 'RemoteMethod' => 'Metodo Remoto', // Added - 2009-02-08 'RemoteProtocol' => 'Protocollo Remoto', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Rinomina', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index 9234473e8..9f2320f16 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '8ޯĔZW摜', 'Action' => 'Action', 'Actual' => 'p', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => 'lj', 'AddNewUser' => 'հޒlj', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'x', 'All' => 'S', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Kp', 'ApplyingStateChange' => 'ύXKp', 'ArchArchived' => 'ۑ̂', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Ӱ Ұ װ', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'VO‚', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index cb0d3ee53..ec3c1169f 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '8 bits grijstinten', 'Action' => 'Actie', 'Actual' => 'Aktueel', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Nieuwe controle toevoegen', 'AddNewMonitor' => 'Nieuwe monitor toevoegen', 'AddNewUser' => 'Nieuwe gebruiker toevoegen', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Waarschuwing', 'All' => 'Alle', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Voer uit', 'ApplyingStateChange' => 'Status verandering aan het uitvoeren', 'ArchArchived' => 'Alleen gearchiveerd', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Num Voorkeuren', 'Off' => 'Uit', 'On' => 'Aan', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote foto kleuren', 'RemoteMethod' => 'Remote Methode', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Hernoem', 'Replay' => 'Opnieuw', 'ReplayAll' => 'Alle Gebeurtenissen', diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index 97fe637a6..8a04b8288 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => 'Cz/b (8 bitw)', 'Action' => 'Action', 'Actual' => 'Aktualny', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => 'Dodaj nowy monitor', 'AddNewUser' => 'Dodaj uytkownika', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Gotowosc', 'All' => 'Wszystko', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Zastosuj', 'ApplyingStateChange' => 'Zmieniam stan pracy', 'ArchArchived' => 'Tylko zarchiwizowane', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => 'Kolory zdalnego obrazu', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Zmie nazw', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index 169a7146a..00a8ad499 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -16,6 +16,7 @@ $SLANG = array( '8BitGrey' => 'cinza 8 bits', 'Action' => 'Action', 'Actual' => 'Atual', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => 'Adicionar Monitor', 'AddNewUser' => 'Adicionar Usurio', @@ -32,6 +33,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alerta', 'All' => 'Tudo', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Aplicar', 'ApplyingStateChange' => 'Aplicando mudana de estado', 'ArchArchived' => 'Somente Arquivados', @@ -459,6 +461,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -527,6 +531,7 @@ $SLANG = array( 'RemoteImageColours' => 'Cores de imagem remota', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Renomear', 'Replay' => 'Ver Novamente', 'ReplayAll' => 'All Events', diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index 4572b940a..1d8e7a237 100644 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -47,6 +47,7 @@ $SLANG = array( '8BitGrey' => 'Scală gri ân 8 biţi', 'Action' => 'Action', 'Actual' => 'Real', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Adaugă control nou', 'AddNewMonitor' => 'Adaugă monitor', 'AddNewUser' => 'Adaugă utilizator', @@ -63,6 +64,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Alert', 'All' => 'Toate', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Accept', 'ApplyingStateChange' => 'Aplic schimbarea de stare', 'ArchArchived' => 'Numai arhivate', @@ -490,6 +492,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -558,6 +562,7 @@ $SLANG = array( 'RemoteImageColours' => 'Remote Image Colours', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Rename', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index 95f9c9dbc..aca9c4b82 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -76,6 +76,7 @@ $SLANG = array( '8BitGrey' => '256 ', 'Action' => 'Action', 'Actual' => '', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Add New Control', 'AddNewMonitor' => ' ', 'AddNewUser' => ' ', @@ -92,6 +93,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => '', 'All' => '', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => '', 'ApplyingStateChange' => ' ', 'ArchArchived' => ' ', @@ -519,6 +521,8 @@ $SLANG = array( 'NumPresets' => 'Num Presets', 'Off' => 'Off', 'On' => 'On', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -587,6 +591,7 @@ $SLANG = array( 'RemoteImageColours' => ' ', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => '', 'Replay' => 'Replay', 'ReplayAll' => 'All Events', diff --git a/web/lang/se_se.php b/web/lang/se_se.php index 740646706..d95b251f3 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -77,6 +77,7 @@ $SLANG = array( '8BitGrey' => '8 bit grskala', 'Action' => 'Action', 'Actual' => 'Verklig', + 'Add' => 'Add', // Added - 2015-05-14 'AddNewControl' => 'Ny kontroll', 'AddNewMonitor' => 'Ny bevakare', 'AddNewUser' => 'Ny anvndare', @@ -93,6 +94,7 @@ $SLANG = array( 'AlarmScore' => 'Alarm Score', // Added - 2015-05-06 'Alert' => 'Varning', 'All' => 'Alla', + 'AlreadyInList' => 'Already present in list', // Added - 2015-05-14 'Apply' => 'Lgg till', 'ApplyingStateChange' => 'Aktivera statusndring', 'ArchArchived' => 'Arkivera endast', @@ -520,6 +522,8 @@ $SLANG = array( 'NumPresets' => 'Antal frinstllningar', 'Off' => 'Av', 'On' => 'P', + 'OnlyAlphaChars' => 'Only alphanumeric characters are allowed', // Added - 2015-05-14 + 'OnlyIntegers' => 'An integer number is required', // Added - 2015-05-14 'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.
If no user has been created for the camera then the user given here will be created with the given password.

', // Added - 2015-04-18 'OnvifProbe' => 'ONVIF', // Added - 2015-04-18 'OnvifProbeIntro' => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.

Select the desired entry from the list below.

Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.

', // Added - 2015-04-18 @@ -588,6 +592,7 @@ $SLANG = array( 'RemoteImageColours' => 'Fjrrbildfrger', 'RemoteMethod' => 'Remote Method', // Added - 2009-02-08 'RemoteProtocol' => 'Remote Protocol', // Added - 2009-02-08 + 'Remove' => 'Remove', // Added - 2015-05-14 'Rename' => 'Byt namn', 'Replay' => 'Repris', 'ReplayAll' => 'Alla hndelser', diff --git a/web/skins/classic/css/classic/views/plugin.css b/web/skins/classic/css/classic/views/plugin.css index e986a6ca0..3bffec122 100644 --- a/web/skins/classic/css/classic/views/plugin.css +++ b/web/skins/classic/css/classic/views/plugin.css @@ -23,3 +23,22 @@ vertical-align: top; white-space: nowrap; } + +table.listSetting { + border-spacing: 3px!important; + border-collapse: separate!important; +} + +table.listSetting td { + vertical-align: top!important; + border: 0px!important; + padding: 0px!important +} + +table.listSetting input[type=text] { + width: 96px +} + +table.listSetting select { + width: 100px; +} diff --git a/web/skins/classic/css/flat/views/plugin.css b/web/skins/classic/css/flat/views/plugin.css index 1490026fc..a5bb67caa 100644 --- a/web/skins/classic/css/flat/views/plugin.css +++ b/web/skins/classic/css/flat/views/plugin.css @@ -15,6 +15,7 @@ border: 1px solid #7f7fb2; padding: 3px; text-align: left; + vertical-align: middle; } #pluginSettings th[scope=row] { @@ -22,3 +23,28 @@ vertical-align: top; white-space: nowrap; } + +table.listSetting { + border-spacing: 3px!important; + border-collapse: separate!important; +} + +table.listSetting td { + vertical-align: top!important; + border: 0px!important; + padding: 0px!important +} + +table.listSetting input[type=text] { + width: 96px +} + +table.listSetting input[type=button] { + height: 26px; + font-size: 40%; + padding-top:1px; +} + +table.listSetting select { + width: 100px; +} diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js index 8868c8ce7..a571778a4 100644 --- a/web/skins/classic/js/classic.js +++ b/web/skins/classic/js/classic.js @@ -56,6 +56,7 @@ var popupSizes = { 'onvifprobe': { 'width': 500, 'height': 300 }, 'optionhelp': { 'width': 400, 'height': 320 }, 'options': { 'width': 1000, 'height': 660 }, + 'plugin': { 'addWidth': 50, 'addHeight': 100 }, 'preset': { 'width': 300, 'height': 120 }, 'settings': { 'width': 220, 'height': 225 }, 'state': { 'width': 370, 'height': 134 }, diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js index f6ddf214d..65ce3940d 100644 --- a/web/skins/classic/js/flat.js +++ b/web/skins/classic/js/flat.js @@ -56,6 +56,7 @@ var popupSizes = { 'onvifprobe': { 'width': 500, 'height': 300 }, 'optionhelp': { 'width': 400, 'height': 320 }, 'options': { 'width': 1000, 'height': 660 }, + 'plugin': { 'addWidth': 50, 'addHeight': 100 }, 'preset': { 'width': 300, 'height': 120 }, 'settings': { 'width': 220, 'height': 225 }, 'state': { 'width': 370, 'height': 134 }, diff --git a/web/skins/classic/views/js/plugin.js b/web/skins/classic/views/js/plugin.js index 01ec0c1e7..a3bccfa97 100644 --- a/web/skins/classic/views/js/plugin.js +++ b/web/skins/classic/views/js/plugin.js @@ -1,3 +1,83 @@ +function addOption( name ) +{ + var form = document.pluginForm; + var select = form.elements['dsp_pluginOpt[' + name + ']']; + var str = form.elements['dsp_input_pluginOpt[' + name + ']'].value; + // Do nothing if the input field is empty + if ( str === "" ) + { + return; + } + // Raise an error and exit of non alphanumeric characters in string + if ( !str.match(/^[0-9a-zA-Z]+$/) ) + { + alert(onlyAlphaCharString); + return; + } + var hidden = form.elements['pluginOpt[' + name + ']']; + // Do not add option if already present in list + var list = hidden.value.split( "," ); + if ( list.indexOf( str ) != -1 ) + { + alert(alreadyInList); + return; + } + // Add option to the list + select.options[select.options.length] = new Option(str, str); + // Synchronize hidden field + if ( hidden.value.length > 0 ) + { + hidden.value += ","; + } + hidden.value += str; + // Enable remove button + form.elements['removeBtn[' + name + ']'].disabled = false; +} + +function removeOptionSelected( name ) +{ + var form = document.pluginForm; + var select = form.elements['dsp_pluginOpt[' + name + ']']; + // Remove selected options from list + for ( var i = select.length - 1; i >= 0; i-- ) + { + if ( select.options[i].selected ) + { + select.remove(i); + } + } + // Synchronize hidden field + var hidden = form.elements['pluginOpt[' + name + ']']; + hidden.value = ""; + for ( var i = 0; i < select.length; i++ ) + { + if ( i > 0 ) + { + hidden.value += ","; + } + hidden.value += select.options[i].value; + } + // Disable remove button if the list is empty + if ( select.length == 0 ) + { + form.elements['removeBtn[' + name + ']'].disabled = true; + } +} + +function updateAddBtn( name ) +{ + var form = document.pluginForm; + // Disable add button if the text input is empty + if ( form.elements['dsp_input_pluginOpt[' + name + ']'].value === "") + { + form.elements['addBtn[' + name + ']'].disabled = true; + } + else + { + form.elements['addBtn[' + name + ']'].disabled = false; + } +} + function validateForm( form ) { return( true ); @@ -22,9 +102,10 @@ function saveChanges( element ) function applyChanges() { var form = document.pluginForm; + // Synchronize hidden fields for ( var option in pluginOptionList ) { - // Sync hidden field + //console.log("Option type is '" + form.elements['dsp_pluginOpt[' + option + ']'].type + "'"); if ( form.elements['dsp_pluginOpt[' + option + ']'].type == "checkbox" ) { if ( form.elements['dsp_pluginOpt[' + option + ']'].checked ) @@ -36,17 +117,31 @@ function applyChanges() form.elements['pluginOpt[' + option + ']'].value = "No"; } } - else + // Do not synchronize here lists with multiple selections, this should be done in function addOption or removeOptionSelected + else if ( form.elements['dsp_pluginOpt[' + option + ']'].type != "select-multiple" ) { form.elements['pluginOpt[' + option + ']'].value = form.elements['dsp_pluginOpt[' + option + ']'].value; } + //console.log("Option '" + option + "' synchronized, new value is '" + form.elements['pluginOpt[' + option + ']'].value + "'"); + } + // Disable visible fields if a dependency is missing + for ( var option in pluginOptionList ) + { var enabled = true; - // Disable visible field if a dependency is missing for ( var name in pluginOptionList[option] ) { + //console.log("form.elements['pluginOpt[" + name + "]'].value=" + form.elements['pluginOpt[' + name + ']'].value + " pluginOptionList[" + option + "][" + name + "]=" + pluginOptionList[option][name]); if (form.elements['pluginOpt[' + name + ']'].value != pluginOptionList[option][name]) { form.elements['dsp_pluginOpt[' + option + ']'].disabled = true; + // Handle additionnal controls for list option + if ( typeof form.elements['dsp_input_pluginOpt[' + option + ']'] !== "undefined" ) + { + form.elements['dsp_input_pluginOpt[' + option + ']'].disabled = true; + form.elements['dsp_input_pluginOpt[' + option + ']'].value = ""; + form.elements['addBtn[' + option + ']'].disabled = true; + form.elements['removeBtn[' + option + ']'].disabled = true; + } enabled = false; break; } @@ -55,6 +150,15 @@ function applyChanges() if (enabled) { form.elements['dsp_pluginOpt[' + option + ']'].disabled = false; + // Handle additionnal controls for list option + if ( typeof form.elements['dsp_input_pluginOpt[' + option + ']'] !== "undefined" ) + { + form.elements['dsp_input_pluginOpt[' + option + ']'].disabled = false; + if ( form.elements['dsp_pluginOpt[' + option + ']'].length > 0 ) + { + form.elements['removeBtn[' + option + ']'].disabled = false; + } + } } } } @@ -68,8 +172,8 @@ function limitRange( field, minValue, maxValue ) } else { - alert("Not and integer!"); - field.value = minValue; + alert(onlyIntegerString); + field.value = field.defaultValue; return; } if ( intval < parseInt(minValue) ) diff --git a/web/skins/classic/views/js/plugin.js.php b/web/skins/classic/views/js/plugin.js.php index 5088a273e..0b8f2dbc0 100644 --- a/web/skins/classic/views/js/plugin.js.php +++ b/web/skins/classic/views/js/plugin.js.php @@ -1,17 +1,21 @@ var pluginOptionList = {}; $option ) { ?> -pluginOptionList[''] = {}; +pluginOptionList[''] = {}; -pluginOptionList[''][''] = ''; +pluginOptionList[''][''] = ''; + +var onlyAlphaCharString = ''; +var alreadyInList = ''; +var onlyIntegerString = ''; diff --git a/web/skins/classic/views/plugin.php b/web/skins/classic/views/plugin.php index 872fabb21..9bcf53a98 100644 --- a/web/skins/classic/views/plugin.php +++ b/web/skins/classic/views/plugin.php @@ -45,13 +45,11 @@ $focusWindow = true; $generalOptions=array( 'Enabled'=>array( 'Type'=>'select', - 'Name'=>'Enabled', 'Choices'=>'Yes,No', 'Value'=>'No' ), 'RequireNatDet'=>array( 'Type'=>'select', - 'Name'=>'RequireNatDet', 'Choices'=>'Yes,No', 'Value'=>'No', 'Require'=>array( @@ -63,7 +61,6 @@ $generalOptions=array( ), 'IncludeNatDet'=>array( 'Type'=>'select', - 'Name'=>'IncludeNatDet', 'Choices'=>'Yes,No', 'Value'=>'No', 'Require'=>array( @@ -79,7 +76,6 @@ $generalOptions=array( ), 'ReInitNatDet'=>array( 'Type'=>'select', - 'Name'=>'ReInitNatDet', 'Choices'=>'Yes,No', 'Value'=>'No', 'Require'=>array( @@ -95,7 +91,6 @@ $generalOptions=array( ), 'AlarmScore'=>array( 'Type'=>'integer', - 'Name'=>'AlarmScore', 'Min'=>'1', 'Max'=>'100', 'Value'=>'99', @@ -118,12 +113,26 @@ if(file_exists($plugin_path."/config.php")) { // Set default dependency information if not set in configuration file if(!isset($optionValue['Require'])) + { $optionValue['Require'] = array ( array( 'Name'=>'Enabled', 'Value'=>'Yes' ) ); + } + elseif(is_array($optionValue['Require'])) + { + $optionValue['Require'][] = array ( + 'Name'=>'Enabled', + 'Value'=>'Yes' + ); + } + else + { + // Wrong type + continue; + } $pOptions[$optionKey]=$optionValue; } } @@ -171,11 +180,15 @@ foreach($pOptions as $name => $values) case "select": $sql="INSERT INTO PluginsConfig VALUES ('',?,?,?,?,'','',?,?,?)"; dbQuery($sql, array( $popt['Name'], $popt['Value'], $popt['Type'], $popt['Choices'], $mid, $zid, $plugin ) ); - break; + break; case "integer": $sql="INSERT INTO PluginsConfig VALUES ('',?,?,?,'',?,?,?,?,?)"; dbQuery($sql, array( $popt['Name'], $popt['Value'], $popt['Type'], $popt['Min'], $popt['Max'], $mid, $zid, $plugin ) ); - break; + break; + case "list": + $sql="INSERT INTO PluginsConfig VALUES ('',?,'',?,'','','',?,?,?)"; + dbQuery($sql, array( $popt['Name'], $popt['Type'], $mid, $zid, $plugin ) ); + break; case "checkbox": case "text": default: @@ -301,6 +314,41 @@ foreach($pOptions as $name => $popt) + + + + + + + + +
+ onkeyup="updateAddBtn('');" /> + + +
+ + + + /> +
+ "; }