Merge branch 'UI2' of https://github.com/GuiAworld/KoboldAI into UI2

static/koboldai.css

@@ -419,6 +419,12 @@ input[type="range"]::-ms-fill-upper {
   width: var(--flyout_menu_width);
 }
 
+.SideMenu .flyout_menu_contents {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: calc(100vh - 40px);
+}
+
 .settings_menu {
 	padding-left: 30px;
 	padding-top: 7px;
@@ -582,6 +588,14 @@ input[type="range"]::-ms-fill-upper {
   width: var(--flyout_menu_width);
 }
 
+.rightSideMenu .flyout_menu_contents {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: calc(100vh - 150px);
+}
+
+
+
 table.server_vars {
 	border: 1px solid #959595;
 }
@@ -671,37 +685,53 @@ body {
 }
 
 @media only screen and (min-aspect-ratio: 7/5) {
+/* ------------------- Desktop Mode --------------------------- */
 .main-grid {
 	transition: margin-left .5s;
 	display: grid;
 	height: 98vh;
-	margin-left: var(--flyout_menu_closed_width);
+	margin-left: var(--flyout_menu_width);
+	margin-right: var(--flyout_menu_closed_width);
 	grid-template-areas: "menuicon gamescreen options lefticon"
 						 "menuicon inputrow inputrow lefticon";
-	grid-template-columns: 420px auto 400px 20px;
+	grid-template-columns: 30px auto 30% 30px;
 	grid-template-rows: auto 100px;
 }
+.main-grid.settings_pinned {
+	margin-left: var(--flyout_menu_width);
+}
+.main-grid.story_pinned {
+	margin-left: var(--flyout_menu_closed_width);
+	margin-right: var(--flyout_menu_width);
+	grid-template-areas: "menuicon options gamescreen lefticon"
+						 "menuicon inputrow inputrow lefticon";
+	grid-template-columns: 30px 30% auto 30px;
+}
+.main-grid.settings_pinned.story_pinned {
+	margin-left: var(--flyout_menu_width);
+	margin-right: var(--flyout_menu_width);
+	grid-template-areas: "menuicon gamescreen options lefticon"
+						 "menuicon inputrow inputrow lefticon";
+	grid-template-columns: 30px auto 30% 30px;
+}
 }
 
 @media only screen and (max-aspect-ratio: 7/5) {
+/* mobile */
 .main-grid {
 	transition: margin-left .5s;
 	display: grid;
 	height: 98vh;
 	margin-left: var(--flyout_menu_closed_width);
 	grid-template-areas: "menuicon gamescreen lefticon"
-					     "menuicon mobile_options lefticon"
+					     "menuicon options lefticon"
 						 "menuicon inputrow lefticon";
 	grid-template-columns: 30px auto 20px;
 	grid-template-rows: auto min-content 100px;
 }
 }
 
-@media only screen and (min-aspect-ratio: 7/5) {
+
-.main-grid.pinned {
-	margin-left: calc(-var(--flyout_menu_width));
-}
-}
 
 /* ---------------------------------- GAME SCREEN ----------------------------------*/
 .gamescreen {
@@ -748,7 +778,6 @@ body {
 	display: none;
   }
 
-@media only screen and (min-aspect-ratio: 7/5) {
 .sequence_area {
 	margin-top: 10px;
 	grid-area: options;
@@ -757,16 +786,6 @@ body {
 	box-shadow: 4px 0 8px 0 rgba(0, 0, 0, 0.2), 5px 0px 25px 0 rgba(0, 0, 0, 0.19);
 	overflow-y: scroll;
 }
-}
-
-@media only screen and (max-aspect-ratio: 7/5) {
-.sequence_area {
-	margin-top: 5px;
-	grid-area: mobile_options;
-	background-color: var(--gamescreen_background);
-	overflow-y: hidden;
-}
-}
 
 @media only screen and (max-aspect-ratio: 7/5) {
 .sequences {
@@ -1219,6 +1238,7 @@ body.NotConnected {
 
 .cursor {
 	cursor: pointer;
+<<<<<<< HEAD
 }
 
 .flout_menu_contents {

static/koboldai.js

@@ -1879,41 +1879,62 @@ String.prototype.toHHMMSS = function () {
 }
 
 function toggle_flyout(x) {
-	if (document.getElementById("SideMenu").classList.contains("open")) {
+	if (document.getElementById("SideMenu").classList.contains("pinned")) {
-		x.classList.remove("change");
+		//do nothing
-		document.getElementById("SideMenu").classList.remove("open");
-		document.getElementById("main-grid").classList.remove("menu-open");
-		//if pinned
-		if (document.getElementById("SideMenu").classList.contains("pinned")) {
-			document.getElementById("menu_pin").classList.remove("hidden");
-		} else {
-			document.getElementById("menu_pin").classList.add("hidden");
-		}
 	} else {
-		x.classList.add("change");
+		if (document.getElementById("SideMenu").classList.contains("open")) {
-		document.getElementById("SideMenu").classList.add("open");
+			x.classList.remove("change");
-		document.getElementById("main-grid").classList.add("menu-open");
+			document.getElementById("SideMenu").classList.remove("open");
-		document.getElementById("menu_pin").classList.remove("hidden");
+			document.getElementById("main-grid").classList.remove("menu-open");
-	}
+		} else {
+			x.classList.add("change");
+			document.getElementById("SideMenu").classList.add("open");
+			document.getElementById("main-grid").classList.add("menu-open");
+			document.getElementById("menu_pin").classList.remove("hidden");
+		}
+}
 }
 
 function toggle_flyout_right(x) {
-	if (document.getElementById("rightSideMenu").classList.contains("open")) {
+	if (document.getElementById("rightSideMenu").classList.contains("pinned")) {
-		document.getElementById("rightSideMenu").classList.remove("open");
+		//do nothing
-		x.setAttribute("data-glyph", "chevron-left");
 	} else {
-		document.getElementById("rightSideMenu").classList.add("open");
+		if (document.getElementById("rightSideMenu").classList.contains("open")) {
-		x.setAttribute("data-glyph", "chevron-right");
+			x.classList.remove("change");
+			document.getElementById("rightSideMenu").classList.remove("open");
+			document.getElementById("main-grid").classList.remove("story_menu-open");
+		} else {
+			x.classList.add("change");
+			document.getElementById("rightSideMenu").classList.add("open");
+			document.getElementById("main-grid").classList.add("story_menu-open");
+			document.getElementById("story_menu_pin").classList.remove("hidden");
+		}
 	}
 }
 
-function toggle_pin_flyout() {
+function toggle_settings_pin_flyout() {
 	if (document.getElementById("SideMenu").classList.contains("pinned")) {
 		document.getElementById("SideMenu").classList.remove("pinned");
-		document.getElementById("main-grid").classList.remove("pinned");
+		document.getElementById("main-grid").classList.remove("settings_pinned");
+		document.getElementById("setting_menu_icon").classList.remove("hidden");
 	} else {
+		document.getElementById("setting_menu_icon").classList.remove("change");
+		document.getElementById("setting_menu_icon").classList.add("hidden");
 		document.getElementById("SideMenu").classList.add("pinned");
-		document.getElementById("main-grid").classList.add("pinned");
+		document.getElementById("main-grid").classList.add("settings_pinned");
+	}
+}
+
+function toggle_story_pin_flyout() {
+	if (document.getElementById("rightSideMenu").classList.contains("pinned")) {
+		document.getElementById("rightSideMenu").classList.remove("pinned");
+		document.getElementById("main-grid").classList.remove("story_pinned");
+		document.getElementById("story_menu_icon").classList.remove("hidden");
+	} else {
+		document.getElementById("rightSideMenu").classList.add("pinned");
+		document.getElementById("main-grid").classList.add("story_pinned");
+		document.getElementById("story_menu_icon").classList.remove("change");
+		document.getElementById("story_menu_icon").classList.add("hidden");
 	}
 }
 

templates/index_new.html

@@ -20,14 +20,14 @@
 	<!------------ Left Flyout Menu--------------------->
 	<div id="SideMenu" class="SideMenu pinned">
 		<!------------ Menu Pin --------------------->
-		<span id="menu_pin" class="oi menu_pin" onclick="toggle_pin_flyout()" data-glyph="pin"></span>
+		<span id="menu_pin" class="oi menu_pin" onclick="toggle_settings_pin_flyout()" data-glyph="pin"></span>
 		{% include 'settings flyout.html' %}
 	</div>
 
 	<!------------ Main Screen--------------------->
-	<div id="main-grid" class="main-grid pinned">
+	<div id="main-grid" class="main-grid settings_pinned">
 		<!------------ Left Menu Icon--------------------->
-		<div class="menu_icon" onclick="toggle_flyout(this)"> 
+		<div id="setting_menu_icon" class="menu_icon hidden changed" onclick="toggle_flyout(this)"> 
 			<div class="menubar1"></div>
 			<div class="menubar2"></div>
 			<div class="menubar3"></div>
@@ -57,7 +57,12 @@
 			<button type="button" class="btn action_button retry" onclick="socket.emit('retry', {});"><span class="oi" data-glyph="loop-circular"></span></button>
 		</div>
 		<!------------ Right Menu Icon--------------------->
-		<span class="oi right_menu_icon" data-glyph="chevron-left" onclick="toggle_flyout_right(this)"></span>
+		<div id="story_menu_icon" class="right_menu_icon" onclick="toggle_flyout_right(this)"> 
+			<div class="menubar1"></div>
+			<div class="menubar2"></div>
+			<div class="menubar3"></div>
+		</div>
+		<!----<span class="oi right_menu_icon" data-glyph="chevron-left" onclick="toggle_flyout_right(this)"></span>--->
 		<!------------ Padding Image--------------------->
 		<div class="paddingimage">
 			<img src="/static/padding_image.png" alt="Padding Image">
@@ -66,6 +71,7 @@
 	
 	<!------------ Right Flyout Menu--------------------->
 	<div id="rightSideMenu" class="rightSideMenu">
+		<span id="story_menu_pin" class="oi story_menu_pin" onclick="toggle_story_pin_flyout()" data-glyph="pin"></span>
 		{% include 'story flyout.html' %}
 	</div>
 	

templates/settings flyout.html

@@ -32,56 +32,58 @@
 	<span class="setting_menu_button" onclick="show_setting_menu(this);">User</span>
 	<span style="float: right;margin-right: 30px;" onclick="window.open('https://github.com/KoboldAI/KoboldAI-Client/wiki');">Help</span>
 </div>
+<div class="flyout_menu_contents">
 
-<div id="setting_menu_model" class="settings_category_area">
+	<div id="setting_menu_model" class="settings_category_area">
-	<div id="Model_Info">
+		<div id="Model_Info">
-		<div>
+			<div>
-			Running Model: <span class="var_sync_model_model">ReadOnly</span>
+				Running Model: <span class="var_sync_model_model">ReadOnly</span>
-			<select id=presets class="var_sync_model_selected_preset settings_select presets" onchange='sync_to_server(this)'><option>Preset</option></select>
+				<select id=presets class="var_sync_model_selected_preset settings_select presets" onchange='sync_to_server(this)'><option>Preset</option></select>
+			</div>
+			<div><button class="btn action_button" onclick="socket.emit('load_model_button', {});">Load Model</button></div>
 		</div>
-		<div><button class="btn action_button" onclick="socket.emit('load_model_button', {});">Load Model</button></div>
+		<div class="setting_tile_area">
-	</div>
+		{% with menu='Model' %}
-	<div class="setting_tile_area">
+			{% include 'settings item.html' %}
-	{% with menu='Model' %}
+		{% endwith %}
-		{% include 'settings item.html' %}
-	{% endwith %}
-	</div>
-</div>
-<div id="setting_menu_story" class="hidden settings_category_area">
-	<div id="Story_Info">
-		<div><b>Story Name: </b><span class="var_sync_story_story_name" contenteditable=true onblur="sync_to_server(this);"></span></div>
-		<div>
-			<button id="load_story" class="btn action_button" onclick="socket.emit('load_story_list', '');">Load Story</button>
-			<button id="save_story" class="btn action_button var_sync_alt_story_gamesaved" onclick='socket.emit("save_story", null, (response) => {save_as_story(response);});'>Save Story</button>
-			<!---<button id="download_story" class="btn action_button" onclick="document.getElementById('download_iframe').src = 'json';">Download Story</button>--->
-			<a class='cursor' onclick="document.getElementById('download_iframe').src = 'json';">Download Story</a>
 		</div>
 	</div>
-	<div class="setting_tile_area">
+	<div id="setting_menu_story" class="hidden settings_category_area">
-	{% with menu='Story' %}
+		<div id="Story_Info">
-		{% include 'settings item.html' %}
+			<div><b>Story Name: </b><span class="var_sync_story_story_name" contenteditable=true onblur="sync_to_server(this);"></span></div>
-	{% endwith %}
+			<div>
+				<button id="load_story" class="btn action_button" onclick="socket.emit('load_story_list', '');">Load Story</button>
+				<button id="save_story" class="btn action_button var_sync_alt_story_gamesaved" onclick='socket.emit("save_story", null, (response) => {save_as_story(response);});'>Save Story</button>
+				<!---<button id="download_story" class="btn action_button" onclick="document.getElementById('download_iframe').src = 'json';">Download Story</button>--->
+				<a class='cursor' onclick="document.getElementById('download_iframe').src = 'json';">Download Story</a>
+			</div>
+		</div>
+		<div class="setting_tile_area">
+		{% with menu='Story' %}
+			{% include 'settings item.html' %}
+		{% endwith %}
+		</div>
+		<h4>
+			<span id="bias_open" class="oi" data-glyph="chevron-bottom" onclick='this.classList.add("hidden"); 
+																				 document.getElementById("bias_close").classList.remove("hidden"); 
+																				 document.getElementById("biasing").classList.add("hidden");'> Biasing:</span>
+			<span id="bias_close" class="oi hidden" data-glyph="chevron-right" onclick='this.classList.add("hidden"); 
+																				 document.getElementById("bias_open").classList.remove("hidden"); 
+																				 document.getElementById("biasing").classList.remove("hidden");'> Biasing:</span>
+		</h4>
+		<div id="biasing">
+			<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>
+		</div>
 	</div>
-	<h4>
+	<div id="setting_menu_user" class="hidden settings_category_area">
-		<span id="bias_open" class="oi" data-glyph="chevron-bottom" onclick='this.classList.add("hidden"); 
+		<div class="setting_tile_area">
-																			 document.getElementById("bias_close").classList.remove("hidden"); 
+		{% with menu='User' %}
-																			 document.getElementById("biasing").classList.add("hidden");'> Biasing:</span>
+			{% include 'settings item.html' %}
-		<span id="bias_close" class="oi hidden" data-glyph="chevron-right" onclick='this.classList.add("hidden"); 
+		{% endwith %}
-																			 document.getElementById("bias_open").classList.remove("hidden"); 
-																			 document.getElementById("biasing").classList.remove("hidden");'> Biasing:</span>
-	</h4>
-	<div id="biasing">
-		<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>
 	</div>
 </div>
-<div id="setting_menu_user" class="hidden settings_category_area">
-	<div class="setting_tile_area">
-	{% with menu='User' %}
-		{% include 'settings item.html' %}
-	{% endwith %}
-	</div>
-</div>

templates/story flyout.html

@@ -26,7 +26,7 @@
 	<span class="story_menu_button" onclick="show_story_menu(this, 'story_menu_notes');">Notes</span>
 	<span class="story_menu_button" onclick="show_story_menu(this, 'story_menu_wi');">World Info</span>
 </div>
-<div class="flout_menu_contents">
+<div class="flyout_menu_contents">
 	<div id="story_menu_memory" class="story_category_area">
 		<div id="Memory">
 			Memory:<br/>