Compare commits

..

No commits in common. "master" and "fed" have entirely different histories.
master ... fed

3 changed files with 49 additions and 163 deletions

View File

@ -44,6 +44,7 @@
</div> </div>
<div id="chat-renunciation-win" class="popup-window"> <div id="chat-renunciation-win" class="popup-window">
<!-- header will actually be rewritten before showing the window to include chat nickname -->
<h1 id="chat-renunciation-win-title" class="popup-window-msg">||||||||||</h1> <h1 id="chat-renunciation-win-title" class="popup-window-msg">||||||||||</h1>
<button class="popup-window-btn-yes" id="chat-renunciation-win-yes">{%w pres.list-rooms.yes-leave %}</button> <button class="popup-window-btn-yes" id="chat-renunciation-win-yes">{%w pres.list-rooms.yes-leave %}</button>
<button class="popup-window-btn-no" id="chat-renunciation-win-no">{%w pres.list-rooms.no-leave %}</button> <button class="popup-window-btn-no" id="chat-renunciation-win-no">{%w pres.list-rooms.no-leave %}</button>

View File

@ -1,166 +1,51 @@
/* Общие стили */
body {
font-family: 'Roboto', sans-serif;
background-color: #f7f9fc;
color: #333;
margin: 0;
padding: 0;
box-sizing: border-box;
}
/* Панель навигации */
.panel {
background-color: #007bff;
padding: 10px;
color: white;
display: flex;
align-items: center;
}
.panel-thing {
margin-right: 20px;
text-decoration: none;
color: white;
}
.panel-header-txt {
font-size: 18px;
font-weight: bold;
}
/* Стили динамических блоков */
.dynamic-block-list {
display: flex;
flex-direction: column;
align-items: center;
padding: 20px;
}
.dynamic-block-list-el-container {
width: 100%;
max-width: 600px;
margin-top: 20px;
}
/* Кнопка добавления */
.button-add {
width: 50px;
height: 50px;
cursor: pointer;
transition: transform 0.2s;
}
.button-add:hover {
transform: scale(1.1);
}
/* Всплывающие окна */
.popup-window {
background-color: white;
border-radius: 8px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
padding: 20px;
max-width: 500px;
margin: 0 auto;
}
.popup-window-msg {
font-size: 20px;
margin-bottom: 15px;
color: #333;
}
.popup-window-btn-yes, .popup-window-btn-no {
padding: 10px 20px;
border: none;
border-radius: 5px;
font-size: 16px;
cursor: pointer;
}
.popup-window-btn-yes {
background-color: #28a745;
color: white;
margin-right: 10px;
}
.popup-window-btn-no {
background-color: #dc3545;
color: white;
}
/* Таблица ввода */
table.id-str-input-table {
width: 100%;
border-collapse: collapse;
margin-bottom: 20px;
}
.id-str-input-td1, .id-str-input-td2 {
border: none;
padding: 10px;
}
.id-str-input-td1 {
text-align: left;
padding-right: 10px;
font-weight: bold;
color: #555;
white-space: nowrap;
}
.id-str-input-td2 {
width: 100%;
}
.one-line-input {
width: 100%;
padding: 8px 12px;
border: 1px solid #ccc;
border-radius: 4px;
font-size: 14px;
}
/* Стили комнат */
.CL-my-chat-box {
display: flex;
flex-direction: row;
position: relative;
padding: 10px;
background-color: #e0f7fa;
border-radius: 8px;
margin-bottom: 10px;
align-items: center;
min-height: 40px;
width: 100%;
}
/* Текст внутри блока комнаты */
.CL-my-chat-box-nickname, .CL-my-chat-box-name, .CL-my-chat-box-my-role {
margin-left: 8px;
justify-self: flex-start;
}
/* Крестик в правом верхнем углу */
.CL-my-chat-box-leave-btn {
position: absolute;
top: 8px;
right: 8px;
width: 16px;
height: 16px;
background: url('/assets/img/close.svg') no-repeat center;
background-size: cover;
cursor: pointer;
border: none;
transition: transform 0.2s;
}
.CL-my-chat-box-leave-btn:hover {
transform: scale(1.2);
}
/* Дизайн списка комнат остается таким же */
#CL-bacbe { #CL-bacbe {
margin-top: 6px; margin-top: 6px;
margin-bottom: 4px; margin-bottom: 4px;
} }
.CL-my-chat-box {
display: flex;
flex-direction: row;
}
.CL-my-chat-box-nickname {
margin-left: 8px;
justify-self: flex-start;
}
.CL-my-chat-box-name {
margin-left: 14px;
justify-self: flex-start;
}
.CL-my-chat-box-my-role {
margin-left: auto;
justify-self: flex-end;
}
.CL-my-chat-box-leave-btn {
margin-left: 10px;
margin-right: 8px;
justify-self: flex-end;
width: 16px;
cursor: pointer;
}
/* The morbid thing */
table.id-str-input-table {
width: 100%;
border-collapse: collapse; /* Combine borders */
}
.id-str-input-td1, .id-str-input-td2 {
border: none;
}
.id-str-input-td1 {
text-align: left;
padding-right: 5px;
white-space: nowrap; /* Prevent text wrap, keeping it in one line */
overflow: hidden; /* Hide overflow content */
text-overflow: ellipsis; /* Show ellipsis for overflowing text */
}
.id-str-input-td2 {
width: 100%;
}

View File

@ -76,7 +76,7 @@ namespace iu9cawebchat {
int ret = sqlite3_prepare_v2(connection.hand, req_statement.c_str(), -1, &stmt_obj, NULL); int ret = sqlite3_prepare_v2(connection.hand, req_statement.c_str(), -1, &stmt_obj, NULL);
if (ret != 0) { if (ret != 0) {
int err_pos = -1; int err_pos = sqlite3_error_offset(connection.hand);
een9_THROW("Compilation of request\n" + req_statement + "\nfailed" + een9_THROW("Compilation of request\n" + req_statement + "\nfailed" +
((err_pos >= 0) ? " with offset " + std::to_string(err_pos) : "")); ((err_pos >= 0) ? " with offset " + std::to_string(err_pos) : ""));
} }