Commit 09ec4214 authored by Eric - kg6wxc's avatar Eric - kg6wxc
Browse files

Enhacement - admin.php css files map_display.php leaflet-hash.js

Added a "Back to Map" link on the admin interface page(s)

Moved the sizing for map div to the css file.

Added rounding to the zoom level in the URL.
parent c8b27b46
......@@ -26,6 +26,9 @@ a.normalTextLink {
/*text-decoration: inherit;*/
text-decoration: none;
}
.center {
text-align: center;
}
.linkButton {
background: none;
color: blue;
......
......@@ -72,6 +72,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo "<center><input type='submit' value='Submit'></center>\n";
echo "</form>\n";
echo "<br>\n";
echo "<p class='center'><a href='../map_display.php'>Back to the Map</a></p>\n";
echo "<br>\n";
if (isset($_POST['first_login']) && isset($_POST['user']) && isset($_POST['passwd'])) {
$user = $_POST['user'];
......@@ -95,6 +96,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo "<center>Password: <input type='password' name='password' value=''></center><br>\n";
echo "<center>" . "<input type='submit' value='Submit'></center></form>\n";
echo "<br>\n";
echo "<p class='center'><a href='../map_display.php'>Back to the Map</a></p>\n";
echo "</body>\n";
echo "</html>\n";
}
......@@ -140,6 +142,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo "<center>Password: <input type='password' name='password' value=''></center><br>\n";
echo "<center>" . "<input type='submit' value='Submit'></center></form>";
echo "<br>";
echo "<p class='center'><a href='../map_display.php'>Back to the Map</a></p>\n";
echo "</body>\n";
echo "</html>\n";
die;
......@@ -176,6 +179,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo "<center>Password: <input type='password' name='password' value=''></center><br>\n";
echo "<center>" . "<input type='submit' value='Submit'></center></form>";
echo "<br>";
echo "<p class='center'><a href='../map_display.php'>Back to the Map</a></p>\n";
echo "</body>\n";
echo "</html>\n";
}}
......@@ -428,6 +432,8 @@ EOD;
echo "</span>\n";
// echo "<br>\n";
echo "Running on " . $_SERVER['HTTP_HOST'] . "\n";
echo "<br>\n";
echo "<a href='../map_display.php'>Back to the Map</a>\n";
// The links at the lower part of the "header"
echo "<div class='admin_nav_links' id='admin_nav_links'>\n";
......@@ -535,6 +541,7 @@ EOD;
echo "</div>\n";
echo "</div> <!-- wrapper close -->\n";
echo "<a href='../map_display.php'>Back to the Map</a>\n";
echo "</body>\n";
echo "</html>\n";
}
......
......@@ -9,13 +9,14 @@ body {
}
/*** This will change the size of the map "container" ***/
#meshmap {
width: 1200px;
height: 700px;
margin: 5px auto;
width: 100%;
}
/*** this is the size of the map itself ***/
#mapid {
width: 100%;
height: 95%;
height: 100%;
}
h1 {
color: navy;
......
......@@ -41,7 +41,7 @@
formatHash: function(map) {
var center = map.getCenter(),
zoom = map.getZoom(),
zoom = Math.round(map.getZoom()),
precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
return "#" + [zoom,
......
......@@ -335,17 +335,6 @@ if (!$mesh) {
echo "<script src='javascripts/leaflet-hash.js'></script>\n";
echo "<script src='javascripts/L.Control.SlideMenu.js'></script>\n";
echo "<link href='css/L.Control.SlideMenu.css' rel='stylesheet'>\n";
/*
echo "<link href='css/meshmap.css' rel='stylesheet'>\n";
echo "<link href='css/leaflet.css' rel='stylesheet'>\n";
echo "<script src='javascripts/leaflet.js'></script>\n";
echo "<script src='javascripts/leaflet.polylineoffset.js'></script>\n";
echo "<script src='javascripts/Leaflet.fullscreen.min.js'></script>\n";
echo "<link href='css/leaflet.fullscreen.css' rel='stylesheet'>\n";
echo "<script src='javascripts/leaflet.groupedlayercontrol.min.js'></script>\n";
echo "<link href='css/leaflet.groupedlayercontrol.min.css' rel='stylesheet'>\n";
echo "<script src='javascripts/leaflet-hash.js'></script>\n";
*/
echo "\n";
echo "</head>\n";
......@@ -367,7 +356,7 @@ if (isset($USER_SETTINGS['map_iFrame_Enabled']) && ($USER_SETTINGS['map_iFrame_E
}
else
{
echo "<div id='meshmap' style='width: 1200px; height: 700px;'>\n"; // Closing tag at end of primary routine
echo "<div id='meshmap'>\n"; // Closing tag at end of primary routine
if (isset($USER_SETTINGS['pageLogo']))
{
echo "<MapTitle>";
......@@ -426,7 +415,7 @@ if (isset($GLOBALS['hide_admin'])) {
echo "<strong><a style=\"float: right;\" href=\"admin/admin.php\">Admin</a>\n";
}
echo "<div id='mapid' style='width: 100%; height: 95%;'>\n";
echo "<div id='mapid'>\n";
echo "</div>\n";
//$numNodes = count($NodeList); // WXC change: this was giving the wrong number.
......
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