diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css index 94ac7a0d8d..00281d82d4 100644 --- a/evennia/web/webclient/static/webclient/css/webclient.css +++ b/evennia/web/webclient/static/webclient/css/webclient.css @@ -225,7 +225,8 @@ div {margin:0px;} z-index: 10; background-color: #fefefe; border: 1px solid #888; - color: black; + color: lightgray; + background-color: #2c2c2c; } @@ -263,11 +264,12 @@ div {margin:0px;} cursor: move; font-weight: bold; font-size: 16px; - background-color: #d9d9d9; + color: white; + background-color: #595959; } .dialogclose { - color: #aaa; + color: #d5d5d5; float: right; font-size: 28px; font-weight: bold; diff --git a/evennia/web/webclient/static/webclient/js/plugins/options.js b/evennia/web/webclient/static/webclient/js/plugins/options.js index d45c0c76bc..114cd6cf0e 100644 --- a/evennia/web/webclient/static/webclient/js/plugins/options.js +++ b/evennia/web/webclient/static/webclient/js/plugins/options.js @@ -10,13 +10,11 @@ let options_plugin = (function () { // addOptionsUI var addOptionsUI = function () { var content = [ // TODO dynamically create this based on the options{} hash - '

Output display

', '', '
', '', '
', '
', - '

Notifications

', '', '
', '', diff --git a/evennia/web/webclient/static/webclient/js/plugins/splithandler.js b/evennia/web/webclient/static/webclient/js/plugins/splithandler.js index 0df944bd19..21517a620e 100644 --- a/evennia/web/webclient/static/webclient/js/plugins/splithandler.js +++ b/evennia/web/webclient/static/webclient/js/plugins/splithandler.js @@ -30,11 +30,11 @@ let splithandler_plugin = (function () { } function addSplitDialog () { - plugins['popups'].createDialog('splitdialog', 'Split Dialog', ''); + plugins['popups'].createDialog('splitdialog', 'Split Pane', ''); } function addPaneDialog () { - plugins['popups'].createDialog('panedialog', 'Pane Dialog', ''); + plugins['popups'].createDialog('panedialog', 'Assign Pane Options', ''); } // @@ -183,28 +183,27 @@ let splithandler_plugin = (function () { var dialog = $("#splitdialogcontent"); dialog.empty(); - dialog.append("

Split?

"); - dialog.append(' top/bottom
'); - dialog.append(' side-by-side
'); - - dialog.append("

Split Which Pane?

"); + var selection = ''+ pane +'
'); + selection = selection + ''; } + selection = "Pane to split: " + selection + " "; + dialog.append(selection); - dialog.append("

New Pane Names

"); - dialog.append(''); - dialog.append(''); + dialog.append(' top/bottom '); + dialog.append(' side-by-side
'); - dialog.append("

New First Pane Flow

"); - dialog.append('append
'); - dialog.append('replace
'); + dialog.append('Pane 1: '); + dialog.append('line feed '); + dialog.append('append '); + dialog.append('replace content
'); - dialog.append("

New Second Pane Flow

"); - dialog.append('append
'); - dialog.append('replace
'); + dialog.append('Pane 2: '); + dialog.append('line feed '); + dialog.append('append '); + dialog.append('replace content
'); - dialog.append('
Split It
'); + dialog.append('
Split
'); $("#splitclose").bind("click", onSplitDialogClose); @@ -214,7 +213,7 @@ let splithandler_plugin = (function () { // // Close "Split Controls" Dialog var onSplitDialogClose = function () { - var pane = $("input[name=pane]:checked").attr("value"); + var pane = $("select[name=pane]").val(); var direction = $("input[name=direction]:checked").attr("value"); var new_pane1 = $("input[name=new_pane1]").val(); var new_pane2 = $("input[name=new_pane2]").val(); @@ -249,39 +248,44 @@ let splithandler_plugin = (function () { // // Draw "Pane Controls" dialog var onPaneControlDialog = function () { - var dialog = $("#splitdialogcontent"); + var dialog = $("#panedialogcontent"); dialog.empty(); - dialog.append("

Set Which Pane?

"); + var selection = ''+ pane +'
'); + selection = selection + ''; } + selection = "Assign to pane: " + selection + "
"; + dialog.append(selection); - dialog.append("

Which content types?

"); + var multiple = ''+ known_types[type] +'
'); + multiple = multiple + ''; } + multiple = "Content types: " + multiple + "
"; + dialog.append(multiple); - dialog.append('
Make It So
'); + dialog.append('
Assign
'); $("#paneclose").bind("click", onPaneControlDialogClose); - plugins['popups'].togglePopup("#splitdialog"); + plugins['popups'].togglePopup("#panedialog"); } // // Close "Pane Controls" dialog var onPaneControlDialogClose = function () { - var pane = $("input[name=pane]:checked").attr("value"); + var pane = $("select[name=assign-pane]").val(); + var types = $("select[name=assign-type]").val(); - var types = new Array; - $('#splitdialogcontent input[type=checkbox]:checked').each(function() { - types.push( $(this).attr('value') ); - }); + // var types = new Array; + // $('#splitdialogcontent input[type=checkbox]:checked').each(function() { + // types.push( $(this).attr('value') ); + // }); set_pane_types( pane, types ); - plugins['popups'].closePopup("#splitdialog"); + plugins['popups'].closePopup("#panedialog"); } // // helper function sending text to a pane @@ -291,6 +295,10 @@ let splithandler_plugin = (function () { if ( pane['update_method'] == 'replace' ) { text_div.html(txt) + } else if ( pane['update_method'] == 'linefeed' ) { + text_div.append("
" + txt + "
"); + var scrollHeight = text_div.parent().prop("scrollHeight"); + text_div.parent().animate({ scrollTop: scrollHeight }, 0); } else { text_div.append(txt); var scrollHeight = text_div.parent().prop("scrollHeight");