Merge branch 'UI2' into ui2-button-align

This commit is contained in:
ebolam
2022-09-01 09:02:15 -04:00
committed by GitHub
3 changed files with 18 additions and 4 deletions

View File

@@ -1352,6 +1352,8 @@ def get_model_info(model, directory=""):
break_values = break_values.split(",")
else:
break_values = [layer_count]
if break_values == ['']:
break_values = []
break_values = [int(x) for x in break_values]
break_values += [0] * (gpu_count - len(break_values))
emit('from_server', {'cmd': 'selected_model_info', 'key_value': key_value, 'key':key,
@@ -7243,7 +7245,7 @@ def UI_2_load_story_list(data):
def get_story_length(item_full_path, item, valid_selection):
if not valid_selection:
return [""]
return ["", ""]
with open(item_full_path, "r") as f:
js = json.load(f)
title = js['story_name'] if 'story_name' in js else ".".join(item.split(".")[:-1])
@@ -7251,7 +7253,7 @@ def get_story_length(item_full_path, item, valid_selection):
return [title, len(js['actions'])]
if js['file_version'] == 1:
return [title, len(js['actions'])]
return [0 if js['actions']['action_count'] == -1 else js['actions']['action_count'] ]
return [title, 0 if js['actions']['action_count'] == -1 else js['actions']['action_count'] ]
def valid_story(file):

View File

@@ -485,6 +485,7 @@ input[type="range"]::-ms-fill-upper {
height: 35px;
}
.settings_button > .button_label {
position: relative;
bottom: 3px;
@@ -497,6 +498,14 @@ input[type="range"]::-ms-fill-upper {
right: 2px;
}
.Model_Info .settings_button {
}
#import_story_button {
}
.settings_button[story_gamesaved="true"] {
filter: brightness(40%);
}

View File

@@ -63,7 +63,7 @@
<span class="var_sync_story_story_name fullwidth" contenteditable=true onblur="sync_to_server(this);"></span>
</span>
<span>
<span class="material-icons-outlined cursor" title="Download Story" onclick="document.getElementById('download_iframe').src = 'json';">file_download</span>
<span class="material-icons-outlined cursor" style="padding-top: 8px;" title="Download Story" onclick="document.getElementById('download_iframe').src = 'json';">file_download</span>
</span>
</div>
<div id="text_storyname">
@@ -221,7 +221,10 @@
<div class="bias_header">
<div class="bias_header_phrase">Phrase</div>
<div class="bias_header_score">Score</div>
<div class="bias_header_comp_threshold">Completion Threshold</div>
<div class="bias_header_comp_threshold">
Completion Threshold
<span class="helpicon material-icons-outlined" title="Amount of tokens that must match the phrase before it is force-completed.">help_icon</span>
</div>
</div>
</div>
</div>