Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rrivera/during post gr3 mini global runs2 #102

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Rrivera/during post gr3 mini global runs2 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71a7fdf
logbook and ECL improvments (still not totally functional), using 'ca…
rrivera747 Dec 12, 2024
f022bce
Fixed bug in date/timezone handling for ECL
rrivera747 Dec 18, 2024
a2443f4
Improvements to Chat web app and look and feel of Remote Subsystem Sq…
rrivera747 Dec 20, 2024
0563224
Color change to Subsystem Launch; Logbook html now working with ECL S…
rrivera747 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions WebGUI/css/SubsystemLaunch.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


body {
padding:0;
margin:0;
background-color:white;
padding: 0;
margin: 0;
background-color:rgb(78 58 58);
}

/* make links have a hand cursor */
Expand Down Expand Up @@ -43,7 +43,7 @@
color: black;
text-weight: bold;
text-shadow: 0px 1px 0px rgba(255,255,255,.3),
0px -1px 0px rgba(0,0,0,.7);
0px -1px 0px rgba(0,0,0,.7);
}

.progressBar {
Expand All @@ -57,7 +57,7 @@
#runDiv {
height: 60px;
margin-bottom: 0px;
color: rgb(136, 102, 102);
color: white; /* rgb(136, 102, 102); */
font-size: 20px;
font-family: "Comfortaa", arial;
}
Expand Down Expand Up @@ -198,6 +198,15 @@
cursor: pointer;
}

.subsystem_detail {
font-size: 14px;
text-align: left;
font-family: 'Inconsolata', monospace;
}
.subsystem_console {
font-family: 'Inconsolata', monospace;
}

.subsystem_configAlias_select_info {
float: right;
background-color: darkblue;
Expand Down
9 changes: 6 additions & 3 deletions WebGUI/css/SubsystemSquares.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
}

.subsystem_square {
background-color: green;
background-color:rgb(6 176 6); /* green; */
margin: 5px; /* must match _MARGIN/2 in js */
float: left;
border-radius: 5px;
cursor: pointer;
overflow-x: auto;
overflow-y: hidden;
overflow-y: hidden;
}

.subsystem_name, .subsystem_console {
Expand All @@ -50,14 +50,17 @@
.subsystem_name {
font-weight: bold;
margin-top: 5px;
font-size: 20px;
}
.subsystem_console {
white-space: nowrap;
font-size: 12px;
font-size: 14px;
}
.subsystem_status {
position: relative;
margin-left: 5px;
font-size: 20px;
white-space: nowrap;
}

/* ===================== end Subsystem status div section */
Expand Down
7 changes: 5 additions & 2 deletions WebGUI/html/Chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@
//============================================================
//redrawChatWindow ~
// refreshes chat window, called when window is resized
function redrawChatWindow() {
function redrawChatWindow()
{

Debug.log("Chat redrawChat to " + window.innerWidth + " - " + window.innerHeight);

Expand Down Expand Up @@ -725,7 +726,9 @@
if(_lastReceivedChat != _chatHistoryArray[0][i].getAttribute('value')) //avoid accidental request duplication (timer conflict)
{
str += "<div class='chatEntry' style='color:" + getColorForUser(_chatHistoryArray[1][i].getAttribute('value')) + "'>" +
"<b>(" + formatTime(_chatHistoryArray[2][i].getAttribute('value')) + ") " +
"<b><label style='width:85px; display:inline-block; font-family:monospace; font-weight:normal;'>(" +
formatTime(_chatHistoryArray[2][i].getAttribute('value')) +
")</label> " +
_chatHistoryArray[1][i].getAttribute('value') + ":</b> " +
convertForClient(_chatHistoryArray[0][i].getAttribute('value')) + "</div>"; //important to only have one /div> per entry for truncate

Expand Down
Loading
Loading