Merge pull request #305 from one-some/UI2

Fix error when trying to search for something that doesnt exist in finder
This commit is contained in:
ebolam
2022-11-23 15:15:29 -05:00
committed by GitHub
4 changed files with 24 additions and 16 deletions

View File

@@ -616,15 +616,14 @@ class model_settings(settings):
self.oaiapikey = "" # API key to use for OpenAI API calls
self.configname = None
self.online_model = ''
self.welcome_default = """ <div id='UI2defaultwelcome'>
<img id='welcome-logo' src='static/Welcome_Logo.png' draggable='False'>
<div class='welcome_text'>
<div id="welcome-text-content">Please load a model from the left.<br/>
If you encounter any issues, please click the Download debug dump link in the Home tab on the left flyout and attach the downloaded file to your error report on <a href='https://github.com/ebolam/KoboldAI/issues'>Github</a>, <a href='https://www.reddit.com/r/KoboldAI/'>Reddit</a>, or <a href='https://discord.gg/XuQWadgU9k'>Discord</a>.
A redacted version (without story text) is available.
</div>
</div>
</div>""" # Custom Welcome Text
self.welcome_default = """<style>#welcome_container { display: block; } #welcome_text { display: flex; height: 100%; } .welcome_text { align-self: flex-end; }</style>
<div id='welcome-logo-container'><img id='welcome-logo' src='static/Welcome_Logo.png' draggable='False'></div>
<div class='welcome_text'>
<div id="welcome-text-content">Please load a model from the left.<br/>
If you encounter any issues, please click the Download debug dump link in the Home tab on the left flyout and attach the downloaded file to your error report on <a href='https://github.com/ebolam/KoboldAI/issues'>Github</a>, <a href='https://www.reddit.com/r/KoboldAI/'>Reddit</a>, or <a href='https://discord.gg/XuQWadgU9k'>Discord</a>.
A redacted version (without story text) is available.
</div>
</div>""" # Custom Welcome Text
self.welcome = self.welcome_default
self.koboldai_vars = koboldai_vars

View File

@@ -1231,6 +1231,7 @@ body {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: calc((1em*var(--game_screen_font_size_adjustment)) + var(--font_size_adjustment));
line-height: 1.42857143;
position: relative;
}
#story_prompt[story_prompt_in_ai="true"] {
@@ -2441,17 +2442,20 @@ body {
}
#welcome-logo {
display: block;
top: 0px;
text-align: center;
margin-top: 20px;
margin-left: auto;
margin-right: auto;
width: 50%;
max-width: 720px;
filter: drop-shadow(5px 5px 5px #222);
}
#welcome-logo-container {
width: 100%;
height: 100%;
position: absolute;
display: flex;
justify-content: center;
align-items: center;
}
#welcome-text-content {
display: inline-block;
align-self: flex-end;

View File

@@ -5325,6 +5325,7 @@ process_cookies();
return;
} else if (finder_mode === "ui") {
let index = finder_selection_index >= 0 ? finder_selection_index : 0;
if (!actions[index]) return;
actions[index].click();
}
} else if (event.key === "ArrowUp") {

View File

@@ -47,7 +47,11 @@
<!------------ Game Text Screen--------------------->
<div class="gamescreen" id="gamescreen">
<div id="disconnect_message"><center><h1>Disconnected</h1></center></div>
<div id="welcome_container" class="welcome_container"><div id="welcome_text" class="var_sync_model_welcome" draggable="False"></div></div>
<div id="welcome_container" class="welcome_container">
<div id="welcome_text" class="var_sync_model_welcome" draggable="False"></div>
</div>
<div class="gametext" id="Selected Text" contenteditable=false onblur="select_game_text(null);" onclick="select_game_text(null);" onkeyup="select_game_text(event);">
<span id="story_prompt" class="var_sync_story_prompt var_sync_alt_story_prompt_in_ai rawtext hidden" chunk="-1"></span></div><!--don't move the /div down or it'll cause odd spacing issues in the UI--->
</div>