Added a new icon for adding nodes

ProjectMeshnet · Jun 21, 2013 · 521a56b · 521a56b
1 parent fd11a5e
commit 521a56b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/res/css/custom.css b/res/css/custom.css
@@ -5,7 +5,19 @@
 	height:700px;
 }
 
+.leaflet-control-geoloc {
+	background-image: url(/res/img/location.png);
+	background-position: 
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
+}
 
+.leaflet-control-node {
+	background-image: url(/res/img/node.png);
+	background-position: 
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
+}
 
 
 
@@ -92,11 +104,6 @@
 	background: #F7F7F7;
 }
 
-.leaflet-control-geoloc {
-	background-image: url(/res/img/location.png);
-	-webkit-border-radius: 5px 5px 5px 5px;
-	border-radius: 5px 5px 5px 5px;
-}
 
 #inputform i {
 	font-size: 10px;

diff --git a/res/img/node.png b/res/img/node.png
diff --git a/res/js/loadmap.js.tmpl b/res/js/loadmap.js.tmpl
@@ -22,6 +22,10 @@ var geolocControl = new L.control({
 	position: 'topright'
 });
 
+var addNode = new L.control({
+	position: 'topright'
+});
+
 $(document).ready(function() {
 	$.ajaxSetup({cache:true});
 
@@ -31,10 +35,17 @@ $(document).ready(function() {
 		return div;
 	};
 
+	addNode.onAdd = function (map) {
+		var div = L.DomUtil.create('div', 'leaflet-control-zoom leaflet-control');
+		div.innerHTML = '<a class="leaflet-control-node" href="#" onclick="merp(); return false;" title="Add node"></a>';
+		return div;
+	};
+
 	// Populate the map with nodes from /api/all.
 	addNodes();
 
 	map.addControl(geolocControl);
+	map.addControl(addNode);
 	map.addControl(new L.Control.Scale());
 
 	//map.locate({setView: true, maxZoom: 3});

diff --git a/res/webpages/index.html.tmpl b/res/webpages/index.html.tmpl
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title>{{.Name}}</title>
-		<link rel="shortcut icon" href="/res/img/favicon.png">
+		<link rel="shortcut icon" href="res/img/favicon.png">
 		<!-- CDN w/o local fallbacks will need to be addressed -->
 		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/2.3.1/flatly/bootstrap.min.css">
 		<link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.min.css" rel="stylesheet">
@@ -17,7 +17,7 @@
 		<script type="text/javascript" src="res/js/leaflet.markercluster.js"></script>
 	</head>
 	<body>
-		<div id="map"></div>
+		<div id="map"></div>	
 		<script type="text/javascript" src="res/js/loadmap.js"></script>
 	</body>
 </html>