diff --git a/metadata/dbms/dbms.css b/metadata/dbms/dbms.css
index 99c1d26..4da0b47 100644
--- a/metadata/dbms/dbms.css
+++ b/metadata/dbms/dbms.css
@@ -1,7 +1,9 @@
/*Переменные для настройки цветов*/
:root{
- --header-color: #505050;
- --back-color: 3a3a3a;
+ /*--header-color: #505050;*/
+ --header-color: #fdfdfd;
+ /*--back-color: #3a3a3a;*/
+ --back-color: #ffffff;
}
diff --git a/metadata/dbms/tabs.js b/metadata/dbms/tabs.js
index 9faa1f5..bf2e43e 100644
--- a/metadata/dbms/tabs.js
+++ b/metadata/dbms/tabs.js
@@ -5,7 +5,7 @@ class tcTab
this.bColor="";
-
+ if(typeof config == 'undefined' || config == null) config = {};
if(typeof config.float == 'undefined'){ config.float='left'; }
this.id=0;
@@ -99,7 +99,7 @@ class tcTabs
addTab(config)
{
- var tab=new tcTab(config)
+ let tab=new tcTab(config)
tab.par=this
this.btt.appendChild(tab.div);
diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index 6c88591..96bfcab 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -169,7 +169,7 @@ function loadContent(url,obj)
function alert2(text)
{
var win=new TWin();
- win.TWin(10,10);
+ win.BuildGUI(10,10);
win.setCaption(document.createTextNode("Alert"));
var html='\n\
\n\
@@ -1060,7 +1060,7 @@ class TWin
this.pBarCnt=0; //Прогресс бар
this.pBarDiv=null; //Прогресс бар
- var fnResizeListener=null;
+ this.fnResizeListener=null;
}
addResizeListener(func)
@@ -1071,7 +1071,7 @@ class TWin
onResize(x,y)
{
- var win=this;
+ let win=this;
return function(e){
if(!e) e = window.event;
win.dx=e.pageX || e.x
@@ -1085,10 +1085,10 @@ class TWin
};
document.onmousemove = function(e) {
if(!e) e = window.event;
- var x2 = e.pageX || e.x;
- var y2 = e.pageY || e.y;
- var w=parseInt(win.div.style.width)-(win.dx-x2)*x;
- var h=parseInt(win.div.style.height)-(win.dy-y2)*y;
+ let x2 = e.pageX || e.x;
+ let y2 = e.pageY || e.y;
+ let w=parseInt(win.div.style.width)-(win.dx-x2)*x;
+ let h=parseInt(win.div.style.height)-(win.dy-y2)*y;
if(w<0)w=0;
if(h<0)h=0;
win.setWidth(w+"px");
@@ -1348,7 +1348,12 @@ class TWin
if(this.tbl.offsetWidth>this.div.offsetWidth) this.div.style.width=this.tbl.offsetWidth+"px"
};
- getWidth(){return parseInt(this.tbl.offsetWidth);};
+ getWidth(){
+ if(this.tbl!=null)
+ return parseInt(this.tbl.offsetWidth);
+ else
+ return 0;
+ };
setHeight(h)
{
diff --git a/metadata/tree/tree.php b/metadata/tree/tree.php
index 9e4ff1e..9859a17 100644
--- a/metadata/tree/tree.php
+++ b/metadata/tree/tree.php
@@ -67,7 +67,7 @@
// Соединяемся с базой данных
$db=null;
try
- { $db = new PDO($db_connstr, $db_login, $db_password);
+ { $db = new PDO($db_connection, $db_login, $db_password);
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (Exception $e)
{
diff --git a/metadata/update/get.php b/metadata/update/get.php
index e9a37e6..6cba1a8 100644
--- a/metadata/update/get.php
+++ b/metadata/update/get.php
@@ -12,7 +12,7 @@ require_once("../include/class_table.php");
require_once("../../config.php");
try
-{ $db = new PDO($db_connstr, $db_login, $db_password);
+{ $db = new PDO($db_connection, $db_login, $db_password);
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (Exception $e)
{ echo 'Ошибка соединения: ' . $e->getMessage();
diff --git a/metadata/update/set.php b/metadata/update/set.php
index 95698da..ac7ef87 100644
--- a/metadata/update/set.php
+++ b/metadata/update/set.php
@@ -47,7 +47,7 @@
}
try
- { $db = new PDO($db_connstr, $db_login, $db_password);
+ { $db = new PDO($db_connection, $db_login, $db_password);
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (Exception $e)
{ echo 'Ошибка соединения: ' . $e->getMessage();
diff --git a/metadata/update/test.php b/metadata/update/test.php
index 700e676..0452c95 100644
--- a/metadata/update/test.php
+++ b/metadata/update/test.php
@@ -6,7 +6,7 @@ require_once("../include/class_table.php");
require_once("../../config.php");
try
-{ $db = new PDO($db_connstr, $db_login, $db_password);
+{ $db = new PDO($db_connection, $db_login, $db_password);
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (Exception $e)
{ echo 'Ошибка соединения: ' . $e->getMessage();