Skip to content

W
White Rabbit Switch - Software
Commit a7e8e5e8 authored by Benoit Rat's avatar Benoit Rat
Browse files
Options

www: clean and improve sfp port panel in top menu 

Fixing Conflicts from older cherry-pick
	userspace/rootfs_override/var/www/functions.php
parent a6e07816
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 18 deletions
userspace/rootfs_override/var/www/css/style.css
View file @ a7e8e5e8
...@@ -94,6 +94,22 @@ h1, h2, h3, h4, h5, h6, p, ul, ol, li, form, input, textarea { ...@@ -94,6 +94,22 @@ h1, h2, h3, h4, h5, h6, p, ul, ol, li, form, input, textarea {
.topmenu ul li a:hover { .topmenu ul li a:hover {
color: #23b14d; color: #23b14d;
} }
#sfp_panel .port img
{
width:40px;
height:40px;
border:0
}
#sfp_panel .status img
{
width:15px;
height:15px;
border:0
}
.content { .content {
width: 800px; width: 800px;
float: left; float: left;
......
userspace/rootfs_override/var/www/functions.php
View file @ a7e8e5e8
...@@ -53,46 +53,52 @@ function wrs_header_ports(){ ...@@ -53,46 +53,52 @@ function wrs_header_ports(){
}else{ }else{
$ports = shell_exec("cat /tmp/ports.conf"); $ports = shell_exec("cat /tmp/ports.conf");
} }
$ports = explode(" ", $ports); $ports = explode(" ", $ports);
// We parse and show the information comming from each endpoint. // We parse and show the information comming from each endpoint.
echo "<table border='0' align='center' vspace='1'>"; echo "<table border='0' align='center' vspace='1'>";
echo '<tr><th><h1 align=center>White-Rabbit Switch Manager</h1></th></tr>'; echo '<tr><th><h1 align=center>White-Rabbit Switch Manager</h1></th></tr>';
echo '</table>'; echo '</table>';
echo "<table border='0' align='center' vspace='15'>"; echo "<table id='sfp_panel' border='0' align='center' vspace='15'>";
echo '<tr>'; echo '<tr class="port">';
$cont = 1; $cont = 0;
for($i=1; $i<18*4; $i=$i+4){ for($i=1; $i<18*4; $i=$i+4){
if (strstr($ports[($i-1)],"up")){ if (strstr($ports[($i-1)],"up")){
if (!strcmp($ports[($i)],"Master")){ if (!strcmp($ports[($i)],"Master")){
echo '<th>'."<IMG SRC='img/master.png' align=left , width=40 , hight=40 , border=0 , alt='master', title='wr".$cont."'>".'</th>'; $mode="master";
}else{ }else{
echo '<th>'."<IMG SRC='img/slave.png' align=left , width=40 , hight=40 , border=0 , alt='slave', title='wr".$cont."'>".'</th>'; $mode="slave";
} }
}else{
echo '<th>'."<IMG SRC='img/linkdown.png' align=left , width=40 , hight=40 , border=0 , alt='down', title='wr".$cont."'>".'</th>';
} }
else $mode="linkdown";
$desc=sprintf("#%02d: wr%d (%s)",$cont+1,$cont,$mode);
echo '<th>'."<img class='".$mode."' src='img/".$mode.".png' alt='".$desc."', title='".$desc."'>".'</th>';
$cont++; $cont++;
} }
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr class="status">';
for($i=1; $i<18*4; $i=$i+4){ for($i=1; $i<18*4; $i=$i+4){
if (!strstr($ports[($i+1)],"NoLock")){ if (!strstr($ports[($i+1)],"NoLock")){
echo '<th>'."<IMG SRC='img/locked.png' align=center , width=15 , hight=15 , border=0 , alt='locked', title = 'locked'>"; $mode="locked";
}else{ }else{
echo '<th>'."<IMG SRC='img/unlocked.png' align=center , width=15 , hight=15 , border=0 , alt='unlocked', title = 'unlocked'>"; $mode="unlocked";
} }
echo '<th>'."<img class='syntonization ".$mode."' SRC='img/".$mode.".png' alt='syntonization: ".$mode."', title = 'syntonization: ".$mode."'>";
if (!strstr($ports[($i+2)],"Uncalibrated")){ if (!strstr($ports[($i+2)],"Uncalibrated")){
echo "<IMG SRC='img/check.png' align=center , width=15 , hight=15 , border=0 , alt='check', title = 'calibrated'>".'</th>'; $mode="calibrated";
$img="check.png";
}else{ }else{
echo "<IMG SRC='img/uncheck.png' align=center , width=15 , hight=15 , border=0 , alt='uncheck', title = 'uncalibrated'>".'</th>'; $mode="uncalibrated";
$img="uncheck.png";
} }
echo "<img class='calibration ".$mode."' SRC='img/".$img."' alt='".$mode."', title = '".$mode."'>".'</th>';
} }
echo '</tr>'; echo '</tr>';
...@@ -185,7 +191,6 @@ function wrs_interface_setup(){ ...@@ -185,7 +191,6 @@ function wrs_interface_setup(){
return (strcmp($interfaces[0],"#")) ? "dhcp" : "static"; return (strcmp($interfaces[0],"#")) ? "dhcp" : "static";
} }
/* /*
* It checks whether the filesystem is writable or not. * It checks whether the filesystem is writable or not.
* *
...@@ -768,7 +773,6 @@ function wrs_management(){ ...@@ -768,7 +773,6 @@ function wrs_management(){
} }
/** /**
* Download file * Download file
* *
...@@ -815,7 +819,6 @@ function wrs_management(){ ...@@ -815,7 +819,6 @@ function wrs_management(){
return((connection_status() == 0) && !connection_aborted()); return((connection_status() == 0) && !connection_aborted());
} }
/* /*
* This function configures the PTP daemon. * This function configures the PTP daemon.
* *
...@@ -904,6 +907,7 @@ function wrs_ptp_configuration(){ ...@@ -904,6 +907,7 @@ function wrs_ptp_configuration(){
header('Location: ptp.php'); header('Location: ptp.php');
exit; exit;
} }
echo '</center>'; echo '</center>';
...@@ -1158,7 +1162,6 @@ function parse_ppsi_conf_file(){ ...@@ -1158,7 +1162,6 @@ function parse_ppsi_conf_file(){
return $file; return $file;
} }
/* /*
* Obtains the content the switch mode from wrsw_hal.conf file * Obtains the content the switch mode from wrsw_hal.conf file
* *
...@@ -1316,7 +1319,6 @@ function wrs_modify_endpoint_mode($endpoint, $mode){ ...@@ -1316,7 +1319,6 @@ function wrs_modify_endpoint_mode($endpoint, $mode){
//We move the file to /wr/etc/ //We move the file to /wr/etc/
copy('/tmp/'.$GLOBALS['wrswhalconf'], $GLOBALS['etcdir'].$GLOBALS['wrswhalconf']); copy('/tmp/'.$GLOBALS['wrswhalconf'], $GLOBALS['etcdir'].$GLOBALS['wrswhalconf']);
}else{ }else{
echo '<br>Wrong parameters for endpoint-mode'; echo '<br>Wrong parameters for endpoint-mode';
} }
......
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