Commit 30f38b2a authored by Eric - kg6wxc's avatar Eric - kg6wxc
Browse files

Merge branch 'bugfix-spiderfyIndicator' into 'master'

bugfix: move spiderfy active message into the correct <div> tag. :man_facepalming:

See merge request !25
parents 17fc47f1 74429f66
...@@ -325,7 +325,7 @@ if (isset($USER_SETTINGS['map_iFrame_Enabled']) && ($USER_SETTINGS['map_iFrame_E ...@@ -325,7 +325,7 @@ if (isset($USER_SETTINGS['map_iFrame_Enabled']) && ($USER_SETTINGS['map_iFrame_E
echo $GLOBALS['map_div_embedded']; echo $GLOBALS['map_div_embedded'];
}else { }else {
echo "<div id='meshmap'>\n"; // Closing tag at end of primary routine echo "<div id='meshmap'>\n"; // Closing tag at end of primary routine
echo "<div id='mapid'></div>\n"; echo "<div id='mapid'><div id='spiderfyActive'>SPIDERFY ACTIVE</div></div>\n";
} }
}else { }else {
echo "<div id='meshmap'>\n"; // Closing tag at end of primary routine echo "<div id='meshmap'>\n"; // Closing tag at end of primary routine
...@@ -377,7 +377,7 @@ if (isset($GLOBALS['hide_admin'])) { ...@@ -377,7 +377,7 @@ if (isset($GLOBALS['hide_admin'])) {
} }
if (isset($USER_SETTINGS['map_iFrame_Enabled']) && !($USER_SETTINGS['map_iFrame_Enabled'])) { if (isset($USER_SETTINGS['map_iFrame_Enabled']) && !($USER_SETTINGS['map_iFrame_Enabled'])) {
echo "<div id='mapid'></div>\n"; echo "<div id='mapid'><div id='spiderfyActive'>SPIDERFY ACTIVE</div></div>\n";
} }
//$numNodes = count($NodeList); // WXC change: this was giving the wrong number. //$numNodes = count($NodeList); // WXC change: this was giving the wrong number.
...@@ -570,7 +570,7 @@ $scaling = <<<EOD ...@@ -570,7 +570,7 @@ $scaling = <<<EOD
EOD; EOD;
echo $scaling; echo $scaling;
echo "<div id='spiderfyActive'>SPIDERFY ACTIVE</div>\n";
echo "</body>\n"; echo "</body>\n";
echo "</html>\n"; echo "</html>\n";
?> ?>
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