Tighter display of character top bar. Return some of the buttons

This commit is contained in:
Cohee
2023-06-25 22:44:46 +03:00
parent deb2efc16e
commit 92127615e5
4 changed files with 40 additions and 68 deletions

View File

@ -2465,9 +2465,26 @@
<div class="flex-container flexFlowColumn">
<div class="flex-container flexFlowColumn">
<div class="flex-container justifyContentFlexEnd">
<label for="char-management-dropdown">
<div class="form_create_bottom_buttons_block flexnowrap">
<div id="rm_button_back" class="menu_button fa-solid fa-left-long "></div>
<!-- <div id="renameCharButton" class="menu_button fa-solid fa-user-pen" title="Rename Character"></div> -->
<div id="favorite_button" class="menu_button fa-solid fa-star" title="Add to Favorites"></div>
<input type="hidden" id="fav_checkbox" name="fav" />
<div id="advanced_div" class="menu_button fa-solid fa-book " title="Advanced Definitions"></div>
<div id="world_button" class="menu_button fa-solid fa-globe" title="Character Lore"></div>
<div id="export_button" class="menu_button fa-solid fa-file-export " title="Export and Download"></div>
<!-- <div id="set_chat_scenario" class="menu_button fa-solid fa-scroll" title="Set a chat scenario override"></div> -->
<!-- <div id="set_character_world" class="menu_button fa-solid fa-globe" title="Set a character World Info / Lorebook"></div> -->
<div id="dupe_button" class="menu_button fa-solid fa-clone " title="Duplicate Character"></div>
<label for="create_button" id="create_button_label" class="menu_button fa-solid fa-user-check" title="Create Character">
<input type="submit" id="create_button" name="create_button">
</label>
<div id="delete_button" class="menu_button fa-solid fa-skull " title="Delete Character"></div>
</div>
<label class="flex1" for="char-management-dropdown">
<select id="char-management-dropdown">
<option value="default" disabled selected>Options</option>
<option value="default" disabled selected>More...</option>
<option id="set_character_world">
<i class="fa-solid fa-globe"></i> Link to World Info
</option>
@ -2480,7 +2497,7 @@
<option id="renameCharButton">
Rename
</option>
<option id="dupe_button">
<!--<option id="dupe_button">
Duplicate
</option>
<option id="export_button">
@ -2488,27 +2505,9 @@
</option>
<option id="delete_button">
Delete
</option>
</option>-->
</select>
</label>
<div class="form_create_bottom_buttons_block flexnowrap">
<div id="rm_button_back" class="menu_button fa-solid fa-left-long "></div>
<!-- <div id="renameCharButton" class="menu_button fa-solid fa-user-pen" title="Rename Character"></div> -->
<div id="favorite_button" class="menu_button fa-solid fa-star" title="Add to Favorites"></div>
<input type="hidden" id="fav_checkbox" name="fav" />
<div id="advanced_div" class="menu_button fa-solid fa-book " title="Advanced Definitions"></div>
<div id="world_button" class="menu_button fa-solid fa-globe" title="Character Lore"></div>
<!-- <div id="export_button" class="menu_button fa-solid fa-file-export " title="Export and Download"></div> -->
<!-- <div id="set_chat_scenario" class="menu_button fa-solid fa-scroll" title="Set a chat scenario override"></div> -->
<!-- <div id="set_character_world" class="menu_button fa-solid fa-globe" title="Set a character World Info / Lorebook"></div> -->
<!-- <div id="dupe_button" class="menu_button fa-solid fa-clone " title="Duplicate Character"></div> -->
<label for="create_button" id="create_button_label" class="menu_button fa-solid fa-user-check" title="Create Character">
<input type="submit" id="create_button" name="create_button">
</label>
<!-- <div id="delete_button" class="menu_button fa-solid fa-skull " title="Delete Character"></div> -->
</div>
</div>
<div id="tags_div" class="marginBot5">

View File

@ -276,7 +276,7 @@ let is_mes_reload_avatar = false;
let optionsPopper = Popper.createPopper(document.getElementById('options_button'), document.getElementById('options'), {
placement: 'top-start'
});
let exportPopper = Popper.createPopper(document.getElementById('char-management-dropdown'), document.getElementById('export_format_popup'), {
let exportPopper = Popper.createPopper(document.getElementById('export_button'), document.getElementById('export_format_popup'), {
placement: 'left'
});
let rawPromptPopper = Popper.createPopper(document.getElementById('dialogue_popup'), document.getElementById('rawPromptPopup'), {
@ -6676,7 +6676,7 @@ $(document).ready(function () {
$("#form_create").submit(createOrEditCharacter);
/* $("#delete_button").click(function () {
$("#delete_button").on('click', function () {
popup_type = "del_ch";
callPopup(`
<h3>Delete the character?</h3>
@ -6684,9 +6684,9 @@ $(document).ready(function () {
THIS WILL ALSO DELETE ALL<br>
OF THE CHARACTER'S CHAT FILES.<br><br></b>`
);
}); */
});
$("#rm_info_button").click(function () {
$("#rm_info_button").on('click', function () {
$("#rm_info_avatar").html("");
select_rm_characters();
});
@ -7462,10 +7462,10 @@ $(document).ready(function () {
importCharacter(file);
}
});
/* $("#export_button").click(function (e) {
$("#export_button").on('click', function (e) {
$('#export_format_popup').toggle();
exportPopper.update();
}); */
});
$(document).on('click', '.export_format', async function () {
const format = $(this).data('format');
@ -7547,7 +7547,7 @@ $(document).ready(function () {
select_rm_characters();
});
/* $("#dupe_button").click(async function () {
$("#dupe_button").click(async function () {
const body = { avatar_url: characters[this_chid].avatar };
const response = await fetch('/dupecharacter', {
@ -7559,7 +7559,7 @@ $(document).ready(function () {
toastr.success("Character Duplicated");
getCharacters();
}
}); */
});
$(document).on("click", ".select_chat_block, .bookmark_link, .mes_bookmark", async function () {
let file_name = $(this).hasClass('mes_bookmark')
@ -7757,18 +7757,19 @@ $(document).ready(function () {
case 'renameCharButton':
renameCharacter();
break;
case 'dupe_button':
/*case 'dupe_button':
DupeChar();
break;
case 'export_button':
$('#export_format_popup').toggle();
exportPopper.update();
break;
*/
case 'import_character_info':
await importEmbeddedWorldInfo();
saveCharacterDebounced();
break;
case 'delete_button':
/*case 'delete_button':
popup_type = "del_ch";
callPopup(`
<h3>Delete the character?</h3>
@ -7776,7 +7777,7 @@ $(document).ready(function () {
THIS WILL ALSO DELETE ALL<br>
OF THE CHARACTER'S CHAT FILES.<br><br></b>`
);
break;
break;*/
}
$("#char-management-dropdown").prop('selectedIndex', 0);
});

View File

@ -298,7 +298,7 @@ export function RA_CountCharTokens() {
<div class="neutral_warning">${count_tokens}</div>&nbsp;Tokens (<div class="neutral_warning">${perm_tokens}</div><div>&nbsp;Permanent)</div>
</small>
</div>
<div id="chartokenwarning" class="menu_button whitespacenowrap"><a href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#character-tokens" target="_blank">About Token 'Limits'</a></div>
<div id="chartokenwarning" class="menu_button margin0 whitespacenowrap"><a href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#character-tokens" target="_blank">About Token 'Limits'</a></div>
</div>`);
} //warn if either are over 1024
}

View File

@ -952,7 +952,6 @@ select {
}
#character_cross,
#world_cross,
#select_chat_cross {
position: absolute;
right: 15px;
@ -1037,6 +1036,7 @@ input[type="file"] {
align-items: center;
flex-wrap: wrap;
gap: 10px;
padding: 0 5px;
}
#right-nav-panel-tabs .right_menu_button,
@ -1147,6 +1147,7 @@ input[type="file"] {
text-align: left;
white-space: nowrap;
margin: 0;
font-size: calc(var(--mainFontSize) * 1.25);
}
.selected-right-tab {
@ -1863,7 +1864,7 @@ grammarly-extension {
font-weight: bold;
padding: 5px;
margin: 0;
height: 35px;
height: 32px;
filter: grayscale(0.5);
text-align: center;
font-size: 20px;
@ -2141,22 +2142,6 @@ grammarly-extension {
display: inline;
}
#world_cross {
position: absolute;
right: 15px;
top: 15px;
width: 20px;
height: 20px;
cursor: pointer;
opacity: 0.6;
}
#world_logo {
width: 35px;
height: 35px;
margin-right: 0.5rem;
}
#world_popup h5 {
color: var(--grey70);
}
@ -2225,13 +2210,6 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):not(#lm_button
transform: scale(1);
}
.option_select_right_menu {
width: 284px;
margin-bottom: 35px;
color: var(--white70a);
background-color: var(--black30a);
}
#user_avatar_block {
display: flex;
grid-gap: 10px;
@ -2401,7 +2379,7 @@ input[type="range"]::-webkit-slider-thumb {
#char-management-dropdown,
#tagInput {
height: 35px;
height: 32px;
margin-bottom: 0;
}
@ -2796,12 +2774,6 @@ h5 {
filter: drop-shadow(0 0 2px red);
}
#advanced_book_logo {
width: 35px;
height: 35px;
display: inline-block;
}
#export_character_div {
display: grid;
grid-template-columns: 340px auto;