rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange group form

Browse Source
This commit is contained in:
SillyLossy
2023-04-29 18:43:40 +03:00
parent d75b1e37e5
commit cb47cdd5d9
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
public/index.html
View File

@ -1545,37 +1545,38 @@
<div id="rm_group_top_bar"> <div id="rm_group_top_bar">
<div id="rm_button_back_from_group" class="menu_button fa-solid fa-left-long"></div> <div id="rm_button_back_from_group" class="menu_button fa-solid fa-left-long"></div>
<input id="rm_group_chat_name" class="text_pole" type="text" name="chat_name" placeholder="Chat Name (Optional)" maxlength="100" /> <input id="rm_group_chat_name" class="text_pole" type="text" name="chat_name" placeholder="Chat Name (Optional)" maxlength="100" />
<div id="group_favorite_button" class="menu_button fa-solid fa-star" title="Add to Favorites"></div>
<input id="rm_group_fav" type="hidden" />
<div id="rm_group_submit" class="menu_button fa-solid fa-check" title="Create"></div>
<div id="rm_group_delete" class="menu_button fa-solid fa-trash-can" title="Delete"></div>
</div> </div>
<div id="rm_group_buttons"> <div id="rm_group_buttons">
<div class="rm_group_settings"> <div class="flex1">
<h5>
Group reply strategy
<a href="/notes#groupreplystrategy" class="notes-link" target="_blank">
<span class="note-link-span">?</span>
</a>
</h5>
<label class="checkbox_label"> <label class="checkbox_label">
<input id="rm_group_fav" type="checkbox" /> <input type="radio" name="rm_group_activation_strategy" value="0" />
Favorite Natural order
</label> </label>
<label class="checkbox_label">
<input type="radio" name="rm_group_activation_strategy" value="1" />
List order
</label>
</div>
<div class="flex1">
<label class="checkbox_label"> <label class="checkbox_label">
<input id="rm_group_allow_self_responses" type="checkbox" /> <input id="rm_group_allow_self_responses" type="checkbox" />
Allow bot responses to self Allow self responses
</label> </label>
<label id="rm_group_automode_label" class="checkbox_label"> <label id="rm_group_automode_label" class="checkbox_label">
<input id="rm_group_automode" type="checkbox" /> <input id="rm_group_automode" type="checkbox" />
Auto Mode Auto Mode
</label> </label>
<h5>
Group reply strategy
<a href="/notes#groupreplystrategy" class="notes-link" target="_blank"><span class="note-link-span">?</span></a>
</h5>
<label>
<input type="radio" name="rm_group_activation_strategy" value="0" />
Natural order
</label>
<label>
<input type="radio" name="rm_group_activation_strategy" value="1" />
List order
</label>
</div> </div>
<div id="rm_group_buttons_expander">&nbsp;</div>
<input id="rm_group_submit" class="menu_button" type="submit" value="Create">
<input id="rm_group_delete" class="menu_button" type="submit" value="Delete">
</div> </div>
<div id="rm_group_add_members_header"> <div id="rm_group_add_members_header">
<h3>Add Members</h3> <h3>Add Members</h3>

25
public/scripts/group-chats.js
View File

@ -66,6 +66,7 @@ let is_group_automode_enabled = false;
let groups = []; let groups = [];
let selected_group = null; let selected_group = null;
let group_generation_id = null; let group_generation_id = null;
let fav_grp_checked = false;
const group_activation_strategy = { const group_activation_strategy = {
NATURAL: 0, NATURAL: 0,
@ -719,7 +720,8 @@ function select_group_chats(chat_id, skipAnimation) {
await editGroup(chat_id); await editGroup(chat_id);
} }
}); });
$(`input[name="rm_group_activation_strategy"][value="${Number(group?.activation_strategy ?? group_activation_strategy.NATURAL)}"]`).prop('checked', true); const replyStrategy = Number(group?.activation_strategy ?? group_activation_strategy.NATURAL);
$(`input[name="rm_group_activation_strategy"][value="${replyStrategy}"]`).prop('checked', true);
if (!skipAnimation) { if (!skipAnimation) {
selectRightMenuWithAnimation('rm_group_chats_block'); selectRightMenuWithAnimation('rm_group_chats_block');
@ -756,7 +758,6 @@ function select_group_chats(chat_id, skipAnimation) {
const groupHasMembers = !!$("#rm_group_members").children().length; const groupHasMembers = !!$("#rm_group_members").children().length;
$("#rm_group_submit").prop("disabled", !groupHasMembers); $("#rm_group_submit").prop("disabled", !groupHasMembers);
$("#rm_group_allow_self_responses").prop("checked", group && group.allow_self_responses); $("#rm_group_allow_self_responses").prop("checked", group && group.allow_self_responses);
$("#rm_group_fav").prop("checked", group && group.fav);
// bottom buttons // bottom buttons
if (chat_id) { if (chat_id) {
@ -778,12 +779,14 @@ function select_group_chats(chat_id, skipAnimation) {
callPopup("<h3>Delete the group?</h3>", "del_group"); callPopup("<h3>Delete the group?</h3>", "del_group");
}); });
$("#rm_group_fav").off(); updateFavButtonState(group?.fav ?? false);
$("#rm_group_fav").on("input", async function () {
$("#group_favorite_button").off('click');
$("#group_favorite_button").on('click', async function () {
updateFavButtonState(!fav_grp_checked);
if (group) { if (group) {
let _thisGroup = groups.find((x) => x.id == chat_id); let _thisGroup = groups.find((x) => x.id == chat_id);
const value = $(this).prop("checked"); _thisGroup.fav = fav_grp_checked;
_thisGroup.fav = value;
await editGroup(chat_id); await editGroup(chat_id);
} }
}); });
@ -830,6 +833,13 @@ function select_group_chats(chat_id, skipAnimation) {
}); });
} }
function updateFavButtonState(state) {
fav_grp_checked = state;
$("#rm_group_fav").val(fav_grp_checked);
$("#group_favorite_button").toggleClass('fav_on', fav_grp_checked);
$("#group_favorite_button").toggleClass('fav_off', !fav_grp_checked);
}
$(document).ready(() => { $(document).ready(() => {
$(document).on("click", ".group_select", async function () { $(document).on("click", ".group_select", async function () {
const id = $(this).data("id"); const id = $(this).data("id");
@ -870,7 +880,6 @@ $(document).ready(() => {
$("#rm_group_submit").click(async function () { $("#rm_group_submit").click(async function () {
let name = $("#rm_group_chat_name").val(); let name = $("#rm_group_chat_name").val();
let allow_self_responses = !!$("#rm_group_allow_self_responses").prop("checked"); let allow_self_responses = !!$("#rm_group_allow_self_responses").prop("checked");
let fav = $("#rm_group_fav").prop("checked");
let activation_strategy = $('input[name="rm_group_activation_strategy"]:checked').val() ?? group_activation_strategy.NATURAL; let activation_strategy = $('input[name="rm_group_activation_strategy"]:checked').val() ?? group_activation_strategy.NATURAL;
const members = $("#rm_group_members .group_member") const members = $("#rm_group_members .group_member")
.map((_, x) => $(x).data("id")) .map((_, x) => $(x).data("id"))
@ -896,7 +905,7 @@ $(document).ready(() => {
allow_self_responses: allow_self_responses, allow_self_responses: allow_self_responses,
activation_strategy: activation_strategy, activation_strategy: activation_strategy,
chat_metadata: {}, chat_metadata: {},
fav: fav, fav: fav_grp_checked,
}), }),
}); });

4
public/style.css
View File

@ -2498,7 +2498,7 @@ body .ui-widget-content {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
width: 100%; width: 100%;
column-gap: 15px; column-gap: 5px;
} }
#rm_button_group_chats h2 { #rm_button_group_chats h2 {
@ -2540,7 +2540,7 @@ body .ui-widget-content {
padding: 0 5px; padding: 0 5px;
} }
.rm_group_settings { #rm_group_buttons > div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }