Commit graph

299 commits

Author SHA1 Message Date
Marvin W 5cb88e8d06 Use server side resolving only, add proper support for nexthop resolving (#81)
* Revert "Use resolved data if gateway was already resolved (#78)"

This reverts commit 44bb8e9d3d.

* Revert "proportions: lookup gateway name"

This reverts commit 94662cb3dc.

* Revert "infobox/node: change mac used to lookup nodes"

This reverts commit 2ca2604403.

* Revert "infobox/node: resolve nexthop and gateway from data"

This reverts commit 9e7049c9e3.

* Resolve nexthop full chain if possible

requires hopglass/hopglass-server#79

* Correctly handle sidecase when nodes on route report inconsistent gateway
2017-01-07 18:43:04 +01:00
Marvin W 44bb8e9d3d Use resolved data if gateway was already resolved (#78)
This is now very dirty, I think the old approach was better (although it requires a server side change)
2016-12-10 11:45:21 +01:00
Milan Pssler 94662cb3dc proportions: lookup gateway name 2016-11-19 11:01:25 +01:00
Milan Pssler 2ca2604403 infobox/node: change mac used to lookup nodes 2016-11-19 10:57:24 +01:00
Milan Paessler 0171ebe7e1 infobox/node: non-clickable mac adresses should be black 2016-11-19 02:27:21 +01:00
Milan Paessler 9e7049c9e3 infobox/node: resolve nexthop and gateway from data
not perfect yet: the mac address doesn't always match
2016-11-19 02:17:08 +01:00
Milan Paessler 7d145141c1 infobox/node: handle unknown model when showing router img 2016-11-19 02:05:28 +01:00
Milan Pssler 5a5ce1d346 forcegraph: decrease line radius to increase click accuracy 2016-11-17 23:06:30 +01:00
Milan Pssler 224240c1c4 forcegraph: bidirectional links 2016-11-17 19:47:56 +01:00
Milan Pssler 7eb0675be0 fix meshclients for orange nodes 2016-11-06 17:13:22 +01:00
Milan Pssler 1641bc2437 router pics hopglass changes
- don't use display block on the table, instead make the close button
  position absolute
- show the old style heading when no source is defined
- clean up the indention and some small things
2016-11-06 00:11:49 +01:00
Moorviper 84aee48229 Router pics (#37)
* add a padding to sidebar for better use on mobile devices

* allow other things as text in attributeEntry

Now it is possible to use pictures and other stuff in this function

* Show Router-Pic with double fallback

3 Möglichkeiten
1. in config wird externe Quelle angegeben
2. wenn nicht wird in ./nodes/ geseucht
3. ansonsten Knotenname + Knotenname in erster Zeile

extern via:
cdn

"hwImg": [
  { "thumbnail": "https://cdn.rawgit.com/Moorviper/meshviewer_hwpics/master/nodes/{MODELHASH}.svg",
    "caption": "Knoten {MODELHASH}"
  }
 ]

aktueller nicht cdn:
"hwImg": [
  { "thumbnail": "https://rawgit.com/Moorviper/meshviewer_hwpics/master/nodes/{MODELHASH}.svg",
    "caption": "Knoten {MODELHASH}"
  }
 ]
2016-11-05 23:03:46 +01:00
Milan Pssler 5599be5cd6 re-add uplink detection, this time generic
fixes l2tp uplink detection
2016-11-05 21:54:47 +01:00
Daniel Krah 808b8c1986 Count Clients in a Mesh (#61)
This functions count all clients in a meshcloud.

It count over wireless and cable links not over VPN links via l2tp or fastd.
2016-11-05 21:24:38 +01:00
Marvin W cb065d8d07 Fully resolve gateway names in hopglass (#57)
Depends on hopglass/hopglass-server#56
2016-08-05 19:47:25 +02:00
Marvin W bf2e858c24 Make sure hopglass does not break when server reports nodes without hostname. (#58) 2016-08-01 23:25:29 +02:00
Milan Paessler 46de672dc9 main: support for ffmap-backend vpn link notation 2016-07-23 16:33:49 +00:00
Daniel Krah 07d5e3f636 check IPv4/IPv6 (#56) 2016-07-23 14:52:49 +00:00
codedust cfd778dadb Fix number of decimal places being displayed in the CPU load bar (#54) 2016-07-23 14:49:35 +00:00
Milan Paessler 8f7b1e15ce Revert "Router pics (#37)"
This reverts commit 8435885e5c.
2016-07-04 12:45:19 +02:00
Marvin W 760cca6806 Properly handle link types (#47)
* Properly handle link types

* fixup! Properly handle link types
2016-07-04 11:29:16 +02:00
Marvin W 1b332508a0 Shorten device name in sidebar stats (#46)
This way, version codes on TP-Link devices and processor names are visible
2016-07-04 10:58:26 +02:00
Moorviper 8435885e5c Router pics (#37)
* add a padding to sidebar for better use on mobile devices

* allow other things as text in attributeEntry

Now it is possible to use pictures and other stuff in this function

* Show Router-Pic with double fallback

3 Möglichkeiten
1. in config wird externe Quelle angegeben
2. wenn nicht wird in ./nodes/ geseucht
3. ansonsten Knotenname + Knotenname in erster Zeile

extern via:
cdn

"hwImg": [
  { "thumbnail": "https://cdn.rawgit.com/Moorviper/meshviewer_hwpics/master/nodes/{MODELHASH}.svg",
    "caption": "Knoten {MODELHASH}"
  }
 ]

aktueller nicht cdn:
"hwImg": [
  { "thumbnail": "https://rawgit.com/Moorviper/meshviewer_hwpics/master/nodes/{MODELHASH}.svg",
    "caption": "Knoten {MODELHASH}"
  }
 ]
2016-07-04 10:57:04 +02:00
eberhab f80ea1ca8f infobox: added wifi channel, airtime and batctl nexthop (#38)
* infobox: added wifi channel, airtime and batctl nexthop

* simplify

* kill all semicolons

* update data locations

I'd suggest that channel information go under nodeinfo. Airtime and nexthop are changing variables which should go under statistics.

* filter out nodes with faulty nodeinfo

* additional nexthop key

The nexthop to the batman gateway has now been made available in gluon master where it will be called "gateway_nexthop" the "nexthop" key is also currently in use and should eventually be removed

* sidebar/node: cosmetic changes to gateway/nexthop

* remove data validity check

* move wifi helper function to sidebar/node

* cosmetics
2016-06-08 23:23:56 +02:00
Johannes Rudolph 2bbdd1e077 main: filter duplicate nodes from different data sources
* add jquery

* filter duplicate nodes by online state

* remove old stuff

* remove debug output

* remove curly braces
2016-06-05 22:55:26 +02:00
Moritz 2da97bca16 meshstats: show offline nodes (#39) 2016-06-03 00:43:08 +02:00
Milan Paessler 4c6ba69dd3 meshstats: don't count undefined as gateway 2016-06-02 23:17:06 +02:00
Milan Pässler 93355f28ba meshstats: dynamic gateway count 2016-06-02 22:44:42 +02:00
Marvin W 9719385076 map: dynamically select maxLayerZoom (#27)
Fixes clients/names being hidden accidentally (in certain conditions). Also added auto-zoom-out to ensure zoom is in bounds
2016-05-22 12:30:31 +02:00
Milan Pässler 81379a8263 meshstats: fix NaN client count 2016-05-22 00:26:36 +02:00
Xaver Maierhofer 31d1464805 clean scss (#21)
* [TASK] CGL - Formation

* [TASK] Generic font fallback

* [TASK] Remove swp file
2016-05-19 17:47:32 +02:00
PetaByteBoy // Milan Pässler 075076a2fe infobox/*infos: fix iframe height option 2016-04-24 20:10:53 +02:00
Milan Pässler 2f28c51da1 forcegraph, main: l2tp support 2016-04-24 01:20:01 +02:00
Milan Pässler 2a78af4208 proportions: correct use of online vs all nodes 2016-04-22 01:05:32 +02:00
anoy 8497a5f833 reimplement feature 'encoded url' (#16)
change symbol names for better readability
beautify location-sidebar
cleanup sourcecode

* change symbols to unicode-names

* reimplement feature 'encoded url'
2016-04-21 22:34:21 +02:00
Marvin W 51c1c57e48 Save selected layer in local storage (#17) 2016-04-21 22:32:22 +02:00
anoy 31545c758d infobox/location: beautify location-sidebar
and cleanup sourcecode
2016-04-02 22:47:57 +02:00
PetaByteBoy // Milan Pässler 5fce722f24 Merge pull request #12 from yayachiken/master
Fixed client-dots and labels not showing on zoom levels >= 19
2016-03-28 23:30:58 +02:00
Milan Pässler 08e00d4b91 infobox/node: nodeinfos {NODE_NAME} support 2016-03-28 22:58:45 +02:00
PetaByteBoy // Milan Pässler 1f07f50530 Merge pull request #13 from yayachiken/new-stats-patch
stats: Fix inaccuracies if lat or long is missing
2016-03-24 13:05:12 +01:00
David Kolossa 40dd7d2a0a stats: Fix inaccuracies if lat or long is missing
* please also note that freifunk-gluon/gluon#703 exists.
2016-03-24 00:46:42 +01:00
PetaByteBoy // Milan Pässler 54801ded8f Merge pull request #11 from eberhab/master
Added support for iframes in config
2016-03-23 13:42:27 +01:00
Benjamin 961a18fec4 infobox: added support for iframes 2016-03-23 13:41:02 +01:00
David Kolossa 78de449b88 map: fixed display errors on high zoom levels
* client dots and labels only showed up on zoom
  levels up to 18
2016-03-23 13:14:58 +01:00
PetaByteBoy // Milan Pässler f8701ca0e3 Merge pull request #9 from viisauksena/patch-1
patch: allow hiding of statistic elements and add cients/gw statistics
2016-03-22 17:42:59 +01:00
viisauksena fc2a1e3872 proportions: allow hiding of statistics and add gateway client statistics
Update proportions.js: enable onclick hiding of Statistics <H2> and add clients per GW <H2>
hiding works by clicking on H2 element, so you can have the overview you like
[need to add some hidden line in scss/main.scss also]
clients per GW is based on nodes.json and the offered clientcount by the nodes directly (so this is only rough idea of reality, for alfred this means extra timedifferences upto 30 minutes)

update main.scss: to allow hiding of statistics element
add this to allow statistics element hiding

use consistent var table and dict Names
change gwTable and gwDict (and gw2 ...) to
gwNodes and gwClients
2016-03-22 04:52:16 +01:00
ffggrz.de 8d22417789 added fixed center option
added option to fix the map on a specific coordinate
2016-03-16 00:39:09 +01:00
Milan Pässler 2eace51bfe add configurable linkinfos 2016-03-08 20:01:38 +01:00
Milan Pässler a7c18b3a0a infobox/node: eliminate duplicate 'vor' 2016-03-05 14:21:33 +01:00
Milan Pässler 2e414cd5b8 infobox/node: unseen status orange 2016-03-05 13:48:49 +01:00