n0rdye/puzzle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color, messages, logs, object groups

Browse Source 
color fixed scrollbar;
messages fixes & added date type;
object groups changed button layout;
logs fixes & added logs delition
This commit is contained in:
N0rdye
2023-10-06 01:21:59 +05:00
parent 72e973cd71
commit c998dbb68e
8 changed files with 199 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
views/admin/objects/object_colors.ejs
View File

@ -1,7 +1,7 @@
<div id="admin_colors" style="display: flex;justify-content: space-between;margin-top: 4vh;">
<div id="obj_color_div" style="justify-content: space-between; width: 50vw;display: flex;">
<label for="obj_colors" style="min-width: 10vw;float: left;">цвет объекта</label>
<div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;"></div>
<div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 4.5vh;"></div>
</div>
<div id="inp">
<input type="color" id="new_color" style="margin: auto;">
@ -24,6 +24,7 @@
color_div.classList.add("color_palette");
color_div.id=`color_${value["color"]}`;
color_div.setAttribute("color_id",`${value["id"]}`)
color_div.setAttribute("color",`${value["color"]}`)
color_div.setAttribute("onclick",`clear_palette();document.getElementById('color_${value["color"]}').style.border = "1px blue solid";cur_color = 'color_${value["color"]}';`)
color_div.title = `#${value["color"]}`;
div.append(color_div);
@ -48,17 +49,23 @@
});
}
function del_color(){
let color_id = document.getElementById(cur_color).getAttribute("color_id")
msg("Удалить этот цвет?",{type:"ask",res:(out)=>{if(out){
$.post( "/admin/colors/delete", {id:color_id})
.done(function( res ) {
if(res["out"] == "good"){
msg("цвет удалён");
obj_colors_load();
console.log(res["body"]);
}
});
}}})
if(document.getElementById(cur_color) == null){
msg("Цвет не выбран",{type:"warning"});
}
else{
let color_id = document.getElementById(cur_color).getAttribute("color_id")
let color = document.getElementById(cur_color).getAttribute("color")
msg("Удалить этот цвет?",{type:"ask",res:(out)=>{if(out){
$.post( "/admin/colors/delete", {id:color_id,color:color})
.done(function( res ) {
if(res["out"] == "good"){
msg("цвет удалён");
obj_colors_load();
console.log(res["body"]);
}
});
}}})
}
}
</script>

18
views/admin/objects/object_edit.ejs
View File

@ -45,16 +45,16 @@
}
</style>
<h1>Изменение объектов</h1>
<div style="display: flex;justify-content: space-between;padding-block: 1vw;">
<h1>Изменение объектов</h1>
<div id="find_obj_btns">
<button onclick="edit_get_objs(true)" class="btn_blue">Найти по имени</button>
<button onclick='gids = [];edit_get_objs();' class="btn_blue">Сбосить</button>
</div>
</div>
<div>
<div id="objs_in_group"></div>
</div>
<div style="display: flex;justify-content: space-between;float: right;">
<div id="find_obj_btns">
<button onclick="edit_get_objs(true)" class="btn_blue">найти по имени</button>
<button onclick='gids = [];edit_get_objs();' class="btn_blue">очистить</button>
</div>
</div>
<script>
// load_groups(()=>{
@ -304,10 +304,10 @@
`<td>${divs["width"]}</td>`+
`<td>${divs["cost"]}</td>`+
`<td><a href='${divs["link"]}'>${divs["link"]}</a></td>`+
`<td>${divs["color"]}</td>`+
`<td><input type='checkbox' id='obj_edit_color_check' ${(divs["color"] == true)? "checked":""} onclick='return false' onkeydown='return false'/></td>`+
`<td><button onclick='${divs["edit"]}' class='btn_blue'>Выбрать</button></td>`+
"</tr>";
obj_list.append(obj)
// console.log("obj");