diff --git a/views/admin.ejs b/views/admin.ejs index aab10d8..b309f6b 100644 --- a/views/admin.ejs +++ b/views/admin.ejs @@ -62,7 +62,7 @@ $.cookie("auto_log",check); } - setTimeout(()=>{ - loaded() - },1000); + // setTimeout(()=>{ + // loaded() + // },1000); \ No newline at end of file diff --git a/views/admin/objects/object_creation.ejs b/views/admin/objects/object_creation.ejs index d2b4a39..f405097 100644 --- a/views/admin/objects/object_creation.ejs +++ b/views/admin/objects/object_creation.ejs @@ -70,17 +70,17 @@
-
+
-
+
см
-
+
-
+
см
diff --git a/views/admin/objects/object_edit.ejs b/views/admin/objects/object_edit.ejs index 5e1f3fe..3c8fcad 100644 --- a/views/admin/objects/object_edit.ejs +++ b/views/admin/objects/object_edit.ejs @@ -25,6 +25,24 @@ margin: auto 0px; /* height: 25px; */ } + .object *{ + font-size: calc(var(--main-font-size)/1.6); + } + .object td{ + border: 1px #777777 solid; + padding: 0.5vw; + } + .object{ + table-layout: fixed; + border-collapse: collapse; + border: 1px solid #B9B9B9; + } + .obj_table_labels{ + background-color: #B9B9B9; + } + .obj_table_divs{ + background-color: #ffffff; + }

Изменение объектов

@@ -53,6 +71,10 @@ menu.getAttribute("gid"), menu.getAttribute("colors"), menu.getAttribute("obj_id")); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } function edit_get_objs(by_name = false){ @@ -176,6 +198,11 @@ }); } + + img_cache(()=>{ + loaded() + }) + function edit_load_objs(callback,by_name = false){ // let select = document.getElementById("group_select"); if(!by_name){ @@ -209,12 +236,14 @@ function make_obj(img,value,list_id){ let obj_list = document.getElementById(list_id); - let obj = document.createElement('div'); - let name_text = document.createElement('div'); - let img_elm = document.createElement('img'); + // let obj = document.createElement('div'); + // let name_text = document.createElement('div'); + // let img_elm = document.createElement('img'); + let obj = document.createElement("table"); + obj.title = `название:${value["name"].split("~")[0].replaceAll("$"," ")}\nцена:${value["cost"]}\nширина:${value["width"]}\nвысота${value["height"]}\nименение цвета:${Boolean(value["colors"])}\nартикуль:${value["name"]}`; obj.id = `object_${value["id"]}`; - obj.setAttribute("onclick",`set_edit(${value["id"]})`) + // obj.setAttribute("onclick",`set_edit(${value["id"]})`) obj.classList.add(value["name"]); obj.classList.add("object"); obj.setAttribute("name",value["name"].split("~")[0].replaceAll("$"," ")) @@ -226,10 +255,61 @@ obj.setAttribute("cost",value["cost"]) obj.setAttribute("colors",Boolean(value["colors"])) obj.setAttribute("gid",value["gid"]) - // name_text.innerText = value["name"].split("~")[0].replaceAll("$"," "); - img_elm.src = img; - obj.append(img_elm) - obj.append(name_text) + // // name_text.innerText = value["name"].split("~")[0].replaceAll("$"," "); + // img_elm.src = img; + // obj.append(img_elm) + // obj.append(name_text) + + + obj.style.width = "80vw"; + obj.style.wordBreak = "break-all"; + + + let divs = { + name : value["name"].split("~")[0].replaceAll("$"," "), + object : value["name"], + height : value["height"], + width : value["width"], + cost : value["cost"], + link : img, + color : Boolean(value["colors"]), + edit : `set_edit(${value["id"]})` + } + + let labels = { + name : "Название", + object : "Объект", + height : "Высота", + width : "Ширина", + cost : "Цена", + link : "Ссылка на изображение", + color : "Меняет цвет", + edit : "Радактировать" + } + + + obj.innerHTML = + ""+ + `${labels["name"]}`+ + `${labels["object"]}`+ + `${labels["height"]}`+ + `${labels["width"]}`+ + `${labels["cost"]}`+ + `${labels["link"]}`+ + `${labels["color"]}`+ + `${labels["edit"]}`+ + ""+ + ""+ + `${divs["name"]}`+ + `${divs["object"]}`+ + `${divs["height"]}`+ + `${divs["width"]}`+ + `${divs["cost"]}`+ + `${divs["link"]}`+ + `${divs["color"]}`+ + ``+ + ""; + obj_list.append(obj) // console.log("obj");