("+key+")"+
+ m.bindLabel(((alias && alias.hostname)?alias.hostname:node.nodeinfo.hostname)+"
("+key+")"+
"
| Cl | Ch | Tx |
|---|
"+
"| 2.4G | "+wifi24+" | "+ch24+" | "+tx24+" |
"+
"| 5G | "+wifi5+" | "+ch5+" | "+tx5+" |
"+
"
"+
"
"
- )
+ );
if(currentNode && currentNode == key){
- className += ' select'
- map.setView(m.getLatLng(),config.map.zoom)
- bar.setSelected(key)
+ className += ' select';
+ map.setView(m.getLatLng(),config.map.zoom);
+ m.options.draggable = true;
+ bar.setSelected(key,m,function(){
+ m.dragging.disable();
+ m._icon.classList.remove("select");
+ });
}
- m.setIcon(leaflet.divIcon({className: className}))
+ m.setIcon(L.divIcon({className: className}));
m.on("click", function(){
- window.location.href = "#map/"+key
- currentNode = key
- render()
- })
- return m
- })
- layernodes = leaflet.featureGroup(nodes).addTo(map)
- }
+ window.location.href = "#map/"+key;
+ currentNode = key;
+ render();
+ });
+ return m;
+ });
+ layernodes = L.featureGroup(nodes).addTo(map);
+ };
return {
storageNotify: function(d){
- data = d
- bar.storageNotify(d)
- render()
+ data = d;
+ bar.storageNotify(d);
+ render();
},
controller: function(){
- currentNode = arguments[0]
- el.innerHTML = ""
- el.appendChild(sideBarEl)
- el.appendChild(mapEl)
+ currentNode = arguments[0];
+ el.innerHTML = "";
+ el.appendChild(sideBarEl);
+ el.appendChild(mapEl);
}
- }
- }
-})
+ };
+ };
+});
diff --git a/js/controller/nodes.js b/js/controller/nodes.js
index aa699ac..146e61b 100644
--- a/js/controller/nodes.js
+++ b/js/controller/nodes.js
@@ -1,13 +1,13 @@
define(function(){
- var data
+ var data;
return function(el,config){
return {
storageNotify: function(d){
- data = d
+ data = d;
},
controller: function(){
- el.innerHTML = "Not implemented"
+ el.innerHTML = "Not implemented";
}
- }
- }
-})
+ };
+ };
+});
diff --git a/js/controller/sidebar.js b/js/controller/sidebar.js
index 7982187..745e919 100644
--- a/js/controller/sidebar.js
+++ b/js/controller/sidebar.js
@@ -1,100 +1,143 @@
define(["helper/lib"],function(){
- var data,nodeid,current
+ var data,
+ nodeid,
+ cleanFunction,
+ marker;
return function(el,config){
- var sidebar = document.createElement("div")
- sidebar.classList.add("sidebar")
- sidebar.classList.add("hidden")
- el.appendChild(sidebar)
+ var close = function(){
+ window.location.href = "#map";
+ nodeid = undefined;
+ render();
+ };
- var controll = document.createElement("div")
- controll.classList.add("icon")
- sidebar.appendChild(controll)
+ var sidebar = document.createElement("div");
+ sidebar.classList.add("sidebar");
+ sidebar.classList.add("hidden");
+ el.appendChild(sidebar);
- var close = document.createElement('i')
- close.innerHTML = "\uf00d"
- controll.appendChild(close)
- close.addEventListener("click",function(){
- window.location.href = "#map"
- nodeid = undefined
- render()
- })
+ var controll = document.createElement("div");
+ controll.classList.add("icon");
+ sidebar.appendChild(controll);
- var content = document.createElement("div")
- content.classList.add("content")
- sidebar.appendChild(content)
+ var iconClose = document.createElement('i');
+ iconClose.innerHTML = "\uf00d";
+ controll.appendChild(iconClose);
+ iconClose.addEventListener("click",close);
- var lblNodeid = document.createElement("h4")
- content.appendChild(lblNodeid)
+ var content = document.createElement("div");
+ content.classList.add("content");
+ sidebar.appendChild(content);
+
+ var lblNodeid = document.createElement("h4");
+ content.appendChild(lblNodeid);
- var inHostname = document.createElement("input")
- content.appendChild(inHostname)
+ var inHostname = document.createElement("input");
+ content.appendChild(inHostname);
- var table = document.createElement("table")
- table.classList.add("table")
- table.innerHTML = "
| Cl | Ch | Tx |
|---|
"
- var row24 = document.createElement("tr")
- row24.innerHTML = "
2.4 Ghz | "
- var cellClient24 = document.createElement("td")
- row24.appendChild(cellClient24)
- var cellCh24 = document.createElement("td")
- row24.appendChild(cellCh24)
- var cellTx24 = document.createElement("td")
- row24.appendChild(cellTx24)
- table.appendChild(row24)
+ var table = document.createElement("table");
+ table.classList.add("table");
+ table.innerHTML = "
| Cl | Ch | Tx |
|---|
";
+ var row24 = document.createElement("tr");
+ row24.innerHTML = "
2.4 Ghz | ";
+ var cellClient24 = document.createElement("td");
+ row24.appendChild(cellClient24);
+ var cellCh24 = document.createElement("td");
+ row24.appendChild(cellCh24);
+ var cellTx24 = document.createElement("td");
+ row24.appendChild(cellTx24);
+ table.appendChild(row24);
- var row5 = document.createElement("tr")
- row5.innerHTML = "
5 Ghz | "
- var cellClient5 = document.createElement("td")
- row5.appendChild(cellClient5)
- var cellCh5 = document.createElement("td")
- row5.appendChild(cellCh5)
- var cellTx5 = document.createElement("td")
- row5.appendChild(cellTx5)
- table.appendChild(row5)
+ var row5 = document.createElement("tr");
+ row5.innerHTML = "
5 Ghz | ";
+ var cellClient5 = document.createElement("td");
+ row5.appendChild(cellClient5);
+ var cellCh5 = document.createElement("td");
+ row5.appendChild(cellCh5);
+ var cellTx5 = document.createElement("td");
+ row5.appendChild(cellTx5);
+ table.appendChild(row5);
- content.appendChild(table)
+ content.appendChild(table);
- var btnSave = document.createElement("button")
- var saveIcon = document.createElement('i')
- saveIcon.classList.add("icon")
- saveIcon.innerHTML = "\uf0c7"
- btnSave.appendChild(saveIcon)
- btnSave.innerHTML += " save"
- content.appendChild(btnSave)
+ var btnSave = document.createElement("button");
+ var saveIcon = document.createElement('i');
+ saveIcon.classList.add("icon");
+ saveIcon.innerHTML = "\uf0c7";
+ btnSave.appendChild(saveIcon);
+ btnSave.innerHTML += " Save";
+ content.appendChild(btnSave);
- btnSave.addEventListener("click",function(a) {
- console.log(inHostname.value)
- })
+ if (navigator.geolocation) {
+ var btnGps = document.createElement("button");
+ var gpsIcon = document.createElement('i');
+ gpsIcon.classList.add("icon");
+ gpsIcon.innerHTML = "\uf124";
+ btnGps.appendChild(gpsIcon);
+ content.appendChild(btnGps);
+
+ var setToGps = function(position){
+ var pos = [position.coords.latitude,position.coords.longitude];
+ marker.setLatLng(pos);
+ marker._map.setView(pos);
+ };
+ btnGps.addEventListener("click",function() {
+ navigator.geolocation.getCurrentPosition(setToGps);
+ });
+ }
+
+ btnSave.addEventListener("click",function() {
+ if(data.aliases[nodeid] === undefined)
+ data.aliases[nodeid] = {};
+ alias = data.aliases[nodeid];
+ if(alias.location === undefined){
+ alias.location = {};
+ }
+ pos = marker.getLatLng();
+ alias.location.latitude = pos.lat;
+ alias.location.longitude = pos.lng;
+ alias.hostname = inHostname.value;
+ send('POST',config.api+'/aliases/alias/'+nodeid,alias).then(function(){
+ close();
+ });
+ });
var render = function(){
if(nodeid !== undefined){
- node = data.nodes[nodeid]
- sidebar.classList.remove("hidden")
- lblNodeid.innerHTML = "Nodeid:"+nodeid
- inHostname.value = (data.aliases[nodeid] !== undefined && data.aliases[nodeid].hostname !==undefined)?data.aliases[nodeid].hostname:node.nodeinfo.hostname
+ var node = data.nodes[nodeid];
+ var alias = data.aliases[nodeid];
+ sidebar.classList.remove("hidden");
+ lblNodeid.innerHTML = "Nodeid:"+nodeid;
+ inHostname.value = ((alias && alias.hostname)?alias.hostname:node.nodeinfo.hostname);
- cellClient24.innerHTML = (node.statistics !== undefined && node.statistics.clients !== undefined)?node.statistics.clients.wifi24:'-'
- cellClient5.innerHTML = (node.statistics !== undefined && node.statistics.clients !== undefined)?node.statistics.clients.wifi5:'-'
- cellCh24.innerHTML = (node.nodeinfo.wireless && node.nodeinfo.wireless.channel24)?node.nodeinfo.wireless.channel24:'-'
- cellCh5.innerHTML = (node.nodeinfo.wireless && node.nodeinfo.wireless.channel5)?node.nodeinfo.wireless.channel5:'-'
- cellTx24.innerHTML = (node.nodeinfo.wireless && node.nodeinfo.wireless.txpower24)?node.nodeinfo.wireless.txpower24:'-'
- cellTx5.innerHTML = (node.nodeinfo.wireless && node.nodeinfo.wireless.txpower5)?node.nodeinfo.wireless.txpower5:'-'
+ cellClient24.innerHTML = (node.statistics !== undefined && node.statistics.clients !== undefined)?node.statistics.clients.wifi24:'-';
+ cellClient5.innerHTML = (node.statistics !== undefined && node.statistics.clients !== undefined)?node.statistics.clients.wifi5:'-';
+ cellCh24.innerHTML = (alias && alias.wireless && alias.wireless.channel24)?alias.wireless.channel24:((node.nodeinfo.wireless && node.nodeinfo.wireless.channel24)?node.nodeinfo.wireless.channel24:'-');
+ cellCh5.innerHTML = (alias && alias.wireless && alias.wireless.channel5)?alias.wireless.channel5:((node.nodeinfo.wireless && node.nodeinfo.wireless.channel5)?node.nodeinfo.wireless.channel5:'-');
+ cellTx24.innerHTML = (alias && alias.wireless && alias.wireless.txpower24)?alias.wireless.txpower24:((node.nodeinfo.wireless && node.nodeinfo.wireless.txpower24)?node.nodeinfo.wireless.txpower24:'-');
+ cellTx5.innerHTML = (alias && alias.wireless && alias.wireless.txpower5)?alias.wireless.txpower5:((node.nodeinfo.wireless && node.nodeinfo.wireless.txpower5)?node.nodeinfo.wireless.txpower5:'-');
}else{
- sidebar.classList.add("hidden")
+ sidebar.classList.add("hidden");
+ if(cleanFunction !== undefined){
+ cleanFunction();
+ cleanFunction = undefined;
+ }
+ //marker.options.icon.options
}
- }
+ };
return {
storageNotify: function(d){
- data = d
- render()
+ data = d;
+ render();
},
- setSelected: function(id){
- nodeid = id
- render()
+ setSelected: function(id,m,c){
+ nodeid = id;
+ marker = m;
+ cleanFunction = c;
+ render();
}
- }
- }
-})
+ };
+ };
+});
diff --git a/js/helper/lib.js b/js/helper/lib.js
index 3b00f89..aa118a0 100644
--- a/js/helper/lib.js
+++ b/js/helper/lib.js
@@ -20,31 +20,31 @@ function send(method,url,data) {
}
}).then(function(data){
if(data[0]=='{')
- return JSON.parse(data)
- return data
+ return JSON.parse(data);
+ return data;
});
}
function localStorageTest() {
- var test = 'test'
+ var test = 'test';
try {
- localStorage.setItem(test, test)
- localStorage.removeItem(test)
- return true
+ localStorage.setItem(test, test);
+ localStorage.removeItem(test);
+ return true;
} catch(e) {
- return false
+ return false;
}
}
function sshUrl(nodeid){
if(internal.nodes[nodeid]){
- node = internal.nodes[nodeid]
- ip ='z-'
+ node = internal.nodes[nodeid];
+ ip ='z-';
for(var i=0;i
node.nodeinfo.network.addresses[i][0])
- ip = node.nodeinfo.network.addresses[i]
+ ip = node.nodeinfo.network.addresses[i];
}
- return 'SSH'
+ return 'SSH';
}
- return ''
+ return '';
}
diff --git a/js/helper/router.js b/js/helper/router.js
index 400d6cb..aacf102 100644
--- a/js/helper/router.js
+++ b/js/helper/router.js
@@ -4,8 +4,7 @@ define(function(){
mode: null,
root: '/',
config: function(options) {
- this.mode = options && options.mode && options.mode == 'history'
- && !!(history.pushState) ? 'history' : 'hash';
+ this.mode = options && options.mode && options.mode == 'history' && !!(history.pushState) ? 'history' : 'hash';
this.root = options && options.root ? '/' + this.clearSlashes(options.root) + '/' : '/';
return this;
},
@@ -33,7 +32,9 @@ define(function(){
return this;
},
remove: function(param) {
- for(var i=0, r; i