From 17e878ec50fcd48f9dab076908413ba60d647050 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 18 Jun 2018 21:41:50 +0200 Subject: [PATCH] net/zerotier: merge version 1.3.2 from master --- net/zerotier/Makefile | 2 +- .../app/views/OPNsense/Zerotier/index.volt | 8 +- .../app/views/OPNsense/Zerotier/overview.volt | 75 +++++++++++-------- 3 files changed, 48 insertions(+), 37 deletions(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index a052ecc4d..7cd0926b5 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= zerotier -PLUGIN_VERSION= 1.3.1 +PLUGIN_VERSION= 1.3.2 PLUGIN_COMMENT= Virtual Networks That Just Work PLUGIN_DEPENDS= zerotier PLUGIN_MAINTAINER= dharrigan@gmail.com diff --git a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt index 8fde2ac38..55eb6159e 100644 --- a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt +++ b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt @@ -98,10 +98,10 @@ POSSIBILITY OF SUCH DAMAGE. - - - - + + + + diff --git a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt index 291a674b9..b12d07914 100644 --- a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt +++ b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt @@ -35,11 +35,18 @@ POSSIBILITY OF SUCH DAMAGE. $("#network_details_collapse_all").click(function() { $(".network_details").collapse('toggle'); }); - }); - $(document).ready(function() { + $("#peer_details_collapse_all").click(function() { $(".peer_details").collapse('toggle'); }); + + // update history on tab state and implement navigation + if(window.location.hash != "") { + $('a[href="' + window.location.hash + '"]').click() + } + $('.nav-tabs a').on('shown.bs.tab', function (e) { + history.pushState(null, null, e.target.hash); + }); }); @@ -65,15 +72,15 @@ POSSIBILITY OF SUCH DAMAGE. @@ -133,7 +140,7 @@ POSSIBILITY OF SUCH DAMAGE. {% if key == "assignedAddresses" %} - {{ lang._('Addresses') }} @@ -145,17 +152,17 @@ POSSIBILITY OF SUCH DAMAGE. {% endfor %} {% else %} - + {% endif %} {% elseif key == "routes" %} - - - - + + + + @@ -170,7 +177,7 @@ POSSIBILITY OF SUCH DAMAGE. {% endfor %} {% else %} - + {% endif %} {% endif %} @@ -186,7 +193,7 @@ POSSIBILITY OF SUCH DAMAGE. {% elsefor %} - {{ lang._("Unable to retrieve Zerotier network information. Is the service enabled, do you have enabled networks and is there internet connectivity?") }} + {{ lang._('Unable to retrieve Zerotier network information. Is the service enabled, do you have enabled networks and is there internet connectivity?') }} {% endfor %} @@ -204,11 +211,11 @@ POSSIBILITY OF SUCH DAMAGE. @@ -231,14 +238,14 @@ POSSIBILITY OF SUCH DAMAGE. {% if key == "paths" %} - - - - - - - - + + + + + + + + @@ -251,14 +258,18 @@ POSSIBILITY OF SUCH DAMAGE. - + {% endfor %} {% else %} - + {% endif %} @@ -275,7 +286,7 @@ POSSIBILITY OF SUCH DAMAGE. {% elsefor %} - {{ lang._("Unable to retrieve Zerotier peer information. Is the service enabled and is there internet connectivity?") }} + {{ lang._('Unable to retrieve Zerotier peer information. Is the service enabled and is there internet connectivity?') }} {% endfor %}
{{ lang._('Enabled') }}{{ lang._('Network Id') }}{{ lang._('Local Description') }}{{ lang._('Commands') }}{{ lang._('Enabled') }}{{ lang._('Network Id') }}{{ lang._('Local Description') }}{{ lang._('Commands') }} {{ lang._('ID') }}
- + - - - - - + + + + + @@ -89,7 +96,7 @@ POSSIBILITY OF SUCH DAMAGE. {% endif %} {% elsefor %} - + {% endfor %}
{{ lang._("physical") }}{{ lang._('physical') }} {{ config["physical"] ? 'true' : 'false' }}
{{ lang._("settings") }}{{ lang._("portMappingEnabled") }}{{ lang._("primaryPort") }}{{ lang._("softwareUpdate") }}{{ lang._("softwareUpdateChannel") }}{{ lang._('settings') }}{{ lang._('portMappingEnabled') }}{{ lang._('primaryPort') }}{{ lang._('softwareUpdate') }}{{ lang._('softwareUpdateChannel') }}
 
{{ lang._("Unable to retrieve Zerotier information. Is the service enabled and is there internet connectivity?") }}
{{ lang._('Unable to retrieve Zerotier information. Is the service enabled and is there internet connectivity?') }}
@@ -106,11 +113,11 @@ POSSIBILITY OF SUCH DAMAGE.
- {{ lang._("Network Id") }} : {{ network['nwid'] | e }} ({{ network['name'] | e }}) + {{ lang._('Network Id') }} : {{ network['nwid'] | e }} ({{ network['name'] | e }}) {% if networksFirstRow == true %} {% set networksFirstRow = false %}
-   +  
{% endif %}
{{ lang._("Addresses") }}
{{ lang._("No addresses currently defined.") }}{{ lang._('No addresses currently defined.') }}
{{ lang._("target") }}{{ lang._("via") }}{{ lang._("metric") }}{{ lang._("flags") }}{{ lang._('target') }}{{ lang._('via') }}{{ lang._('metric') }}{{ lang._('flags') }}
{{ lang._("No routes currently defined.") }}
{{ lang._('No routes currently defined.') }}
- {{ lang._("Peer") }} : {{ peer['address'] | e }} ({{ peer['role'] | e }}) + {{ lang._('Peer') }} : {{ peer['address'] | e }} ({{ peer['role'] | e }}) {% if peersFirstRow == true %} {% set peersFirstRow = false %}
-   +  
{% endif %}
{{ lang._("active") }}{{ lang._("address") }}{{ lang._("expired") }}{{ lang._("lastReceive") }}{{ lang._("lastSend") }}{{ lang._("linkQuality") }}{{ lang._("preferred") }}{{ lang._("trustedPathId") }}{{ lang._('active') }}{{ lang._('address') }}{{ lang._('expired') }}{{ lang._('lastReceive') }}{{ lang._('lastSend') }}{{ lang._('linkQuality') }}{{ lang._('preferred') }}{{ lang._('trustedPathId') }}
{{ path["expired"] ? 'true' : 'false' }} {{ path["lastReceive"] | e }} {{ path["lastSend"] | e }}{{ path["linkQuality"] | e }} + {% if path["linkQuality"] is defined %} + {{ path["linkQuality"] | e }} + {% endif %} + {{ path["preferred"] | e }} {{ path["trustedPathId"] | e }}
{{ lang._("No routes currently defined.") }}{{ lang._('No routes currently defined.') }}