From d4fc19b54df4fb6e502e0f04332b520a090e0705 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Fri, 29 Oct 2021 16:47:43 +0600
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/tools.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index a52b779..74e98e2 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -230,8 +230,8 @@ function confirm2(title,text,okFunc,cancelFunc)
 			</tr>\n\
 			<tr style="height: 10px;">\n\
 				<td style="width: 100%;">&nbsp;</td>\n\
-				<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;">'+trt('Ok')+'</button></td>\n\
-				\<td><button class="button-secondary" id="'+win.uid+'_cancel" style="width: 80px;">'+trt('Cancel')+'</button></td>\n\
+				<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;margin:1px;">'+trt('Ok')+'</button></td>\n\
+				\<td><button class="button-secondary" id="'+win.uid+'_cancel" style="width: 80px;margin:1px;">'+trt('Cancel')+'</button></td>\n\
 			</tr>\n\
 		</table>';
 

From 9b11fb813ab7e6d38c7b37ea8f66986b23f8455d Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Mon, 8 Nov 2021 17:08:32 +0600
Subject: [PATCH 2/2] =?UTF-8?q?+=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20f4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/editrecord.js | 2 +-
 metadata/dbms/login.js      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js
index 6052f92..8b0bf69 100644
--- a/metadata/dbms/editrecord.js
+++ b/metadata/dbms/editrecord.js
@@ -1454,7 +1454,7 @@ class EdtRec
 			if((value=="")&&(maybenull==0)) return false;
 			return isInt(value)
 		}else
-		if(type=="f8")
+		if(type=="f8" || type=="f4")
 		{
 			if((value=="")&&(maybenull==0)) return false;
 			return isFloat(value);
diff --git a/metadata/dbms/login.js b/metadata/dbms/login.js
index b02d9de..9692a6f 100644
--- a/metadata/dbms/login.js
+++ b/metadata/dbms/login.js
@@ -61,7 +61,7 @@ class DBMSUser
 				{							
 					if(findNode(node,'#cdata-section').nodeValue=="0") //if not logged
 					{
-						alert(trt('Invalid_username_and_or_password'));	
+						alert2(trt('Attention'),trt('Invalid_username_and_or_password'));	
 					}else
 					{
 						//location.reload();
@@ -76,8 +76,7 @@ class DBMSUser
 				{
 					//if(findNode(node,'#cdata-section').nodeValue=="1") //if register
 					//{
-					//	alert(trt('New_user_is_registered')+'\n'+trt('The_password_has_been_sent_to_you_by_Email'));
-					//	location.reload();
+					//	alert2(trt('Attention'),trt('New_user_is_registered')+'\n'+trt('The_password_has_been_sent_to_you_by_Email'),function(){ location.reload(); });
 					//}
 				}
 			}