Merge pull request #50 from dr-dolomite/development-socat

NSA Mode Bandwidth Parsing and SMS Layout Fixes

simpleadmin/www/index.html

@@ -925,9 +925,10 @@
 
                     // Calculate the LTE bandwidth
                     this.bandwidth =
+                      "UL " +
                       this.calculate_lte_bw(lte_bw_ul) +
-                      " MHz, " +
-                      "NR " +
+                      " MHz / " +
+                      "DL " +
                       this.calculate_lte_bw(lte_bw_dl) +
                       " MHz";
 
@@ -1003,7 +1004,7 @@
 
                     // Calculate the NR bandwidth
                     this.bandwidth +=
-                      " / " + this.calculate_nr_bw(nr_bw).toString() + " MHz";
+                      " / NR " + this.calculate_nr_bw(nr_bw).toString() + " MHz";
 
                     // Parse the PCIs
                     this.pcc_pci = lines[28].split(",")[5].replace(/"/g, "");

simpleadmin/www/network.html

@@ -589,7 +589,7 @@
               this.prefNetwork = settings.prefNetwork;
               this.nrModeControl = settings.nrModeControl;
               this.bands = settings.bands;
-            });
+            })
           },
           lockSelectedBands() {
             // Get the updated this.currentNetworkMode = selectedMode; and this.updatedLockedBands = newCheckedValues;

simpleadmin/www/sms.html

@@ -77,7 +77,6 @@
 						</div>
 					</div>
 				</nav>
-
 				<div class="row mt-5 mb-4">
 					<div class="col">
 						<div class="card">
@@ -130,7 +129,7 @@
 										</div>
 									</div>
 									<form>
-                    <div class="col-md-4 my-4">
+										<!-- <div class="col-md-4 my-4">
 											<label for="PhoneNumber" class="form-label"
 												>Send SMS</label
 											>
@@ -141,10 +140,10 @@
 												aria-label="Phone Number"
 												x-model="phoneNumber"
 											/>
-                    </div>
+										</div> -->
+
+										<!-- <div class="col-md-8 mb-3">
 										
-                    <div class="col-md-8 mb-3">
-                      <!-- Text Area Here for SMS Input -->
 											<textarea
 												class="form-control"
 												id="smsInputBox"
@@ -152,13 +151,17 @@
 												placeholder="Enter SMS here (!!!CURRENTLY UNDER DEVELOPMENT!!!)"
 												x-model="messageToSend"
 											></textarea>
+										</div> -->
+									</form>
 								</div>
+							</div>
+							<div class="card-footer">
 								<div
 								class="d-grid gap-2 d-md-flex justify-content-md-start"
 							>
-                      <button class="btn btn-primary me-md-2" type="button" @click="sendSMS()" :disabled="true" >
+								<!-- <button class="btn btn-primary me-md-2" type="button" @click="sendSMS()" :disabled="true" >
 									Send SMS
-                      </button>
+								</button> -->
 								<button
 									class="btn btn-success"
 									type="button"
@@ -174,8 +177,6 @@
 									Delete All SMS
 								</button>
 							</div>
-                  </form>
-                </div>
 							</div>
 						</div>
 					</div>