Commit f2a51faf authored by Brent Schuetze's avatar Brent Schuetze
Browse files

Working on layout for controller

parent 9a45bef1
......@@ -340,7 +340,7 @@ function rulesUpdate(isUserTriggered: boolean) {
let scm: ServerControl = new ServerControl(control_id, ServerControlType.RULES);
sendServerControlMessage(scm, isUserTriggered);
}
const rulesButton : Nexus.Button = Nexus.Add.Button("#buttonRules", {
const rulesButton : Nexus.Button = Nexus.Add.Button("#buttonListRules", {
"size": [CFG.buttonWidth, CFG.buttonHeight],
"mode": "button",
});
......@@ -355,7 +355,7 @@ function helpMessage(isUserTriggered: boolean) {
let scm: ServerControl = new ServerControl(control_id, ServerControlType.HELP);
sendServerControlMessage(scm, isUserTriggered);
}
const helpButton : Nexus.Button = Nexus.Add.Button("#buttonHelp", {
const helpButton : Nexus.Button = Nexus.Add.Button("#buttonCommands", {
"size": [CFG.buttonWidth, CFG.buttonHeight],
"mode": "button",
});
......
......@@ -309,7 +309,7 @@ function rulesUpdate(isUserTriggered) {
let scm = new ServerControl(control_id, ServerControlType.RULES);
sendServerControlMessage(scm, isUserTriggered);
}
const rulesButton = Nexus.Add.Button("#buttonRules", {
const rulesButton = Nexus.Add.Button("#buttonListRules", {
"size": [CFG.buttonWidth, CFG.buttonHeight],
"mode": "button",
});
......@@ -323,7 +323,7 @@ function helpMessage(isUserTriggered) {
let scm = new ServerControl(control_id, ServerControlType.HELP);
sendServerControlMessage(scm, isUserTriggered);
}
const helpButton = Nexus.Add.Button("#buttonHelp", {
const helpButton = Nexus.Add.Button("#buttonCommands", {
"size": [CFG.buttonWidth, CFG.buttonHeight],
"mode": "button",
});
......
......@@ -303,7 +303,6 @@ export class ForwardRule {
let parsedInverse = false;
if (parts.length >= 6) {
// Includes an inverse
console.log("HERERERERERERERERERERER", parts, parts[5]);
if (parts[5] == "normal") {
parsedInverse = false;
}
......
......@@ -186,44 +186,161 @@
border: 1px;
padding: 1px;
}
#compositionSurround {
grid-column: 1 / span 21;
grid-row: 6 / span 8;
}
#compositionHeading {
grid-column: 1 / span 21;
grid-row: 6;
}
#loadCompositionHeading {
grid-column: 4 / span 3;
grid-row: 7;
}
#startCompositionHeading {
grid-column: 7 / span 3;
grid-row: 7;
}
#stopCompositionHeading {
grid-column: 10 / span 3;
grid-row: 7;
}
#resetCompositionHeading {
grid-column: 13 / span 3;
grid-row: 7;
}
#clearCompositionHeading {
grid-column: 16 / span 3;
grid-row: 7;
}
#compositionDefinitionHeading {
grid-column: 1 / span 21;
grid-row: 11;
}
#compositionDiv {
grid-column: 1 / span 21;
grid-row: 12 / span 4;
width: calc(100% - 50px);
height: calc(100% - 35px);
overflow-y: auto;
padding: 4px;
/* overflow: hidden; */
}
#compositionTextArea {
width: calc(100% - 12px);
height: calc(100% - 24px);
resize: none;
display: block;
margin-left: auto;
margin-right: auto;
}
.ymlTextArea {
background: rgb(43, 43, 61);
}
#rulesSurround {
grid-column: 1 / span 12;
grid-row: 1 / span 5;
}
#rulesHeading {
grid-column: 1 / span 12;
grid-row: 1;
}
#createRuleHeading {
grid-column: 1 / span 3;
grid-row: 2;
}
#buttonCreateRule {
grid-column: 1 / span 3;
grid-row: 1 / span 3;
grid-row: 3 / span 3;
}
#deleteRuleHeading {
grid-column: 4 / span 3;
grid-row: 2;
}
#buttonDeleteRule {
grid-column: 4 / span 3;
grid-row: 1 / span 3;
grid-row: 3 / span 3;
}
#buttonUsers {
#deleteAllRulesHeading {
grid-column: 7 / span 3;
grid-row: 1 / span 3;
grid-row: 2;
}
#buttonPaths {
#buttonDeleteAllRules {
grid-column: 7 / span 3;
grid-row: 3 / span 3;
}
#listRulesHeading {
grid-column: 10 / span 3;
grid-row: 2;
}
#buttonListRules {
grid-column: 10 / span 3;
grid-row: 1 / span 3;
grid-row: 3 / span 3;
}
#buttonRules {
#helpSurround {
grid-column: 13 / span 9;
grid-row: 1 / span 5;
}
#helpHeading {
grid-column: 13 / span 9;
grid-row: 1;
}
#usersHeading {
grid-column: 13 / span 3;
grid-row: 1 / span 3;
grid-row: 2;
}
#buttonHelp {
#buttonUsers {
grid-column: 13 / span 3;
grid-row: 3 / span 3;
}
#pathsHeading {
grid-column: 16 / span 3;
grid-row: 2;
}
#buttonPaths {
grid-column: 16 / span 3;
grid-row: 1 / span 3;
grid-row: 3 / span 3;
}
#commandsHeading {
grid-column: 19 / span 3;
grid-row: 2;
}
#buttonCommands {
grid-column: 19 / span 3;
grid-row: 3 / span 3;
}
#messageLogSurround {
grid-column: 22 / span 15;
grid-row: 1 / span 13;
}
#messageLogHeading {
grid-column: 22 / span 15;
grid-row: 1;
}
#messageLog#messageLog {
grid-column: 1 / span 36;
grid-row: 13;
width: 100%;
height: 100%;
overflow-y: scroll;
grid-column: 22 / span 15;
grid-row: 2 / span 12;
display: block;
margin-left: auto;
margin-right: auto;
width: calc(100% - 62px);
height: calc(100% - 59px);
overflow-y: auto;
padding: 4px;
padding-left: 20px;
background-color: rgb(25, 25, 36);
/* padding-left: 20px; */
background-color: rgb(43, 43, 61);
}
.message {
color: beige;
font-size: 12pt;
}
#serverController .surround {
border: 1px solid white;
height: 100%;
width: 100%;
background-color: rgb(25, 25, 36);
}
.heading1 {
text-align: center;
......
......@@ -37,12 +37,37 @@
<div id="rackGap"></div>
<div id="serverControllerWrapper">
<div id="serverController">
<div class="surround" id="rulesSurround"></div>
<div class="heading1" id="rulesHeading">Rules</div>
<div class="heading2" id="createRuleHeading">Create</div>
<div id="buttonCreateRule"></div>
<div class="heading2" id="deleteRuleHeading">Remove</div>
<div id="buttonDeleteRule"></div>
<div class="heading2" id="deleteAllRulesHeading">Remove All</div>
<div id="buttonDeleteAllRules"></div>
<div class="heading2" id="listRulesHeading">List</div>
<div id="buttonListRules"></div>
<div class="surround" id="helpSurround"></div>
<div class="heading1" id="helpHeading">Help</div>
<div class="heading2" id="usersHeading">Users</div>
<div id="buttonUsers"></div>
<div class="heading2" id="pathsHeading">Paths</div>
<div id="buttonPaths"></div>
<div id="buttonRules"></div>
<div id="buttonHelp"></div>
<div class="heading2" id="commandsHeading">Commands</div>
<div id="buttonCommands"></div>
<div class="surround" id="compositionSurround"></div>
<div class="heading1" id="compositionHeading">Composition Control</div>
<div class="heading2" id="loadCompositionHeading">Load</div>
<div class="heading2" id="startCompositionHeading">Start</div>
<div class="heading2" id="stopCompositionHeading">Stop</div>
<div class="heading2" id="resetCompositionHeading">Reset</div>
<div class="heading2" id="clearCompositionHeading">Clear</div>
<div class="heading1" id="compositionDefinitionHeading">Composition Data</div>
<div class="" id="compositionDiv">
<textarea class="ymlTextArea message" id="compositionTextArea"></textarea>
</div>
<div class="surround" id="messageLogSurround"></div>
<div class="heading1" id="messageLogHeading">Message Log</div>
<div id="messageLog"></div>
</div>
</div>
......
......@@ -353,7 +353,6 @@ export class ForwardRule {
let parsedInverse: boolean = false;
if (parts.length >= 6) {
// Includes an inverse
console.log("HERERERERERERERERERERER", parts, parts[5]);
if (parts[5] == "normal") {
parsedInverse = false;
} else if (parts[5] == "inverse") {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment