Merge branch 'contentEditablew-AF-Panel' of https://github.com/sillytavern/sillytavern into pr/Cohee1207/2711
| @@ -553,7 +553,7 @@ | |||
| 553 | </div> | 553 | </div> |
| 554 | </div> | 554 | </div> |
| 555 | </div> | 555 | </div> |
| 556 | <div data-newbie-hidden class="inline-drawer wide100p"> | 556 | <div class="inline-drawer wide100p"> |
| 557 | <div class="inline-drawer-toggle inline-drawer-header"> | 557 | <div class="inline-drawer-toggle inline-drawer-header"> |
| 558 | <b data-i18n="Utility Prompts">Utility Prompts</b> | 558 | <b data-i18n="Utility Prompts">Utility Prompts</b> |
| 559 | <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div> | 559 | <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div> |
| @@ -3077,10 +3077,10 @@ | |||
| 3077 | <i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset for Instruct Mode." data-i18n="[title]Auto-select this preset for Instruct Mode"></i> | 3077 | <i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset for Instruct Mode." data-i18n="[title]Auto-select this preset for Instruct Mode"></i> |
| 3078 | <i data-newbie-hidden data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> | 3078 | <i data-newbie-hidden data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> |
| 3079 | <i data-newbie-hidden data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> | 3079 | <i data-newbie-hidden data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> |
| 3080 | <i data-newbie-hidden data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> | 3080 | <i data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> |
| 3081 | <i data-newbie-hidden data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> | 3081 | <i data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> |
| 3082 | <i data-newbie-hidden data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> | 3082 | <i data-newbie-hidden data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> |
| 3083 | <i data-newbie-hidden id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> | 3083 | <i id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> |
| 3084 | </div> | 3084 | </div> |
| 3085 | <div class="flex-container"> | 3085 | <div class="flex-container"> |
| 3086 | <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select> | 3086 | <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select> |
| @@ -3220,10 +3220,10 @@ | |||
| 3220 | <i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset on API connection." data-i18n="[title]Auto-select this preset on API connection"></i> | 3220 | <i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset on API connection." data-i18n="[title]Auto-select this preset on API connection"></i> |
| 3221 | <i data-newbie-hidden data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> | 3221 | <i data-newbie-hidden data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> |
| 3222 | <i data-newbie-hidden data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> | 3222 | <i data-newbie-hidden data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> |
| 3223 | <i data-newbie-hidden data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> | 3223 | <i data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> |
| 3224 | <i data-newbie-hidden data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> | 3224 | <i data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> |
| 3225 | <i data-newbie-hidden data-preset-manager-restore="instruct" class=" menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> | 3225 | <i data-newbie-hidden data-preset-manager-restore="instruct" class=" menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> |
| 3226 | <i data-newbie-hidden data-preset-manager-delete="instruct" class=" menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> | 3226 | <i data-preset-manager-delete="instruct" class=" menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> |
| 3227 | </div> | 3227 | </div> |
| 3228 | 3228 | ||
| 3229 | <div class="flex-container"> | 3229 | <div class="flex-container"> |
| @@ -3235,7 +3235,7 @@ | |||
| 3235 | </small> | 3235 | </small> |
| 3236 | </label> | 3236 | </label> |
| 3237 | <div data-newbie-hidden> | 3237 | <div data-newbie-hidden> |
| 3238 | <input type="text" contenteditable="true" id="instruct_activation_regex" class="text_pole textarea_compact autoSetHeight" maxlength="5000" rows="1" placeholder="e.g. /llama(-)?[3|3.1]/i"></input> | 3238 | <input type="text" id="instruct_activation_regex" class="text_pole textarea_compact autoSetHeight" maxlength="5000" rows="1" placeholder="e.g. /llama(-)?[3|3.1]/i"></input> |
| 3239 | </div> | 3239 | </div> |
| 3240 | <div data-newbie-hidden> | 3240 | <div data-newbie-hidden> |
| 3241 | <label> | 3241 | <label> |
| @@ -3335,9 +3335,9 @@ | |||
| 3335 | </div> | 3335 | </div> |
| 3336 | </div> | 3336 | </div> |
| 3337 | <div id="InstructSequencesColumn" class="flex-container flexNoGap flexFlowColumn flex1"> | 3337 | <div id="InstructSequencesColumn" class="flex-container flexNoGap flexFlowColumn flex1"> |
| 3338 | <div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn"> | 3338 | <div data-newbie-hidden class="wide100p flexFlowColumn"> |
| 3339 | <h4 class="standoutHeader title_restorable"> | 3339 | <h4 class="standoutHeader title_restorable"> |
| 3340 | <b><span data-i18n="Instruct Mode Sequences">Instruct Sequences</span><small>(Saves to Template)</small></b> | 3340 | <b><span data-i18n="Instruct Mode Sequences">Instruct Sequences</span> <small>(Saves to Template)</small></b> |
| 3341 | </h4> | 3341 | </h4> |
| 3342 | <div class="flex-container"> | 3342 | <div class="flex-container"> |
| 3343 | <div class="flexAuto" title="Inserted before a System prompt." data-i18n="[title]Inserted before a System prompt."> | 3343 | <div class="flexAuto" title="Inserted before a System prompt." data-i18n="[title]Inserted before a System prompt."> |