upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/zerotier: merge version 1.3.2 from master

Browse source
This commit is contained in:
Franco Fichtner 2018-06-18 21:41:50 +02:00
parent 725bd0f6b5
commit 17e878ec50
3 changed files with 48 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/zerotier/Makefile
View file

@ -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

8
net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt
View file

@ -98,10 +98,10 @@ POSSIBILITY OF SUCH DAMAGE.
<table id="grid-networks" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="dialogNetwork">
<thead>
<tr>
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="networkId" data-width="20em" data-type="string" data-visible="true">{{ lang._('Network Id') }}</th>
<th data-column-id="description" data-width="30em" data-type="string" data-visible="true">{{ lang._('Local Description') }}</th>
<th data-column-id="commands" data-formatter="commandsWithInfo" data-visible="true" data-sortable="false">{{ lang._('Commands') }}</th>
<th data-column-id="enabled" data-width="11%" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="networkId" data-width="32%" data-type="string" data-visible="true">{{ lang._('Network Id') }}</th>
<th data-column-id="description" data-width="46%" data-type="string" data-visible="true">{{ lang._('Local Description') }}</th>
<th data-column-id="commands" data-width="11%" data-formatter="commandsWithInfo" data-visible="true" data-sortable="false">{{ lang._('Commands') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
</tr>
</thead>

75
net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt
View file

@ -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);
});
});
</script>
@ -65,15 +72,15 @@ POSSIBILITY OF SUCH DAMAGE.
<td style="width:78%">
<table class="table">
<tr>
<td><b>{{ lang._("physical") }}</b></td>
<td><b>{{ lang._('physical') }}</b></td>
<td colspan="4">{{ config["physical"] ? 'true' : 'false' }}</td>
</tr>
<tr>
<td><b>{{ lang._("settings") }}</b></td>
<td><b>{{ lang._("portMappingEnabled") }}</b></td>
<td><b>{{ lang._("primaryPort") }}</b></td>
<td><b>{{ lang._("softwareUpdate") }}</b></td>
<td><b>{{ lang._("softwareUpdateChannel") }}</b></td>
<td><b>{{ lang._('settings') }}</b></td>
<td><b>{{ lang._('portMappingEnabled') }}</b></td>
<td><b>{{ lang._('primaryPort') }}</b></td>
<td><b>{{ lang._('softwareUpdate') }}</b></td>
<td><b>{{ lang._('softwareUpdateChannel') }}</b></td>
</tr>
<tr>
<td>&nbsp;</td>
@ -89,7 +96,7 @@ POSSIBILITY OF SUCH DAMAGE.
{% endif %}
</tr>
{% elsefor %}
<tr><td>{{ lang._("Unable to retrieve Zerotier information. Is the service enabled and is there internet connectivity?") }}</td></tr>
<tr><td>{{ lang._('Unable to retrieve Zerotier information. Is the service enabled and is there internet connectivity?') }}</td></tr>
{% endfor %}
</tbody>
</table>
@ -106,11 +113,11 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<th colspan="2">
<i class="fa fa-chevron-down" style="cursor: pointer;" data-toggle="collapse" data-target="#{{ network['nwid'] | e }}"></i>
{{ lang._("Network Id") }} : {{ network['nwid'] | e }} ({{ network['name'] | e }})
{{ lang._('Network Id') }} : {{ network['nwid'] | e }} ({{ network['name'] | e }})
{% if networksFirstRow == true %}
{% set networksFirstRow = false %}
<div class="pull-right">
<i class="fa fa-expand" id="network_details_collapse_all" style="cursor: pointer;" data-toggle="tooltip" title="{{ lang._("collapse/expand all") }}"></i> &nbsp;
<i class="fa fa-expand" id="network_details_collapse_all" style="cursor: pointer;" data-toggle="tooltip" title="{{ lang._('collapse/expand all') }}"></i> &nbsp;
</div>
{% endif %}
</th>
@ -133,7 +140,7 @@ POSSIBILITY OF SUCH DAMAGE.
{% if key == "assignedAddresses" %}
<thead>
<tr>
<td>{{ lang._("Addresses") }}</td
<td>{{ lang._('Addresses') }}</td
</tr>
</thead>
<tbody>
@ -145,17 +152,17 @@ POSSIBILITY OF SUCH DAMAGE.
{% endfor %}
{% else %}
<tr>
<td>{{ lang._("No addresses currently defined.") }}</td>
<td>{{ lang._('No addresses currently defined.') }}</td>
</tr>
{% endif %}
<tbody>
{% elseif key == "routes" %}
<thead>
<tr>
<td>{{ lang._("target") }}</td>
<td>{{ lang._("via") }}</td>
<td>{{ lang._("metric") }}</td>
<td>{{ lang._("flags") }}</td>
<td>{{ lang._('target') }}</td>
<td>{{ lang._('via') }}</td>
<td>{{ lang._('metric') }}</td>
<td>{{ lang._('flags') }}</td>
</tr>
</thead>
<tbody>
@ -170,7 +177,7 @@ POSSIBILITY OF SUCH DAMAGE.
</tr>
{% endfor %}
{% else %}
<tr><td colspan="4">{{ lang._("No routes currently defined.") }}</td></tr>
<tr><td colspan="4">{{ lang._('No routes currently defined.') }}</td></tr>
{% endif %}
</tbody>
{% endif %}
@ -186,7 +193,7 @@ POSSIBILITY OF SUCH DAMAGE.
</div>
</div>
{% 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 %}
</section>
</div>
@ -204,11 +211,11 @@ POSSIBILITY OF SUCH DAMAGE.
<tr>
<th colspan="2">
<i class="fa fa-chevron-down" style="cursor: pointer;" data-toggle="collapse" data-target="#{{ peer['address'] | e }}"></i>
{{ lang._("Peer") }} : {{ peer['address'] | e }} ({{ peer['role'] | e }})
{{ lang._('Peer') }} : {{ peer['address'] | e }} ({{ peer['role'] | e }})
{% if peersFirstRow == true %}
{% set peersFirstRow = false %}
<div class="pull-right">
<i class="fa fa-expand" id="peer_details_collapse_all" style="cursor: pointer;" data-toggle="tooltip" title="{{ lang._("collapse/expand all") }}"></i> &nbsp;
<i class="fa fa-expand" id="peer_details_collapse_all" style="cursor: pointer;" data-toggle="tooltip" title="{{ lang._('collapse/expand all') }}"></i> &nbsp;
</div>
{% endif %}
</th>
@ -231,14 +238,14 @@ POSSIBILITY OF SUCH DAMAGE.
{% if key == "paths" %}
<thead>
<tr>
<td>{{ lang._("active") }}</td>
<td>{{ lang._("address") }}</td>
<td>{{ lang._("expired") }}</td>
<td>{{ lang._("lastReceive") }}</td>
<td>{{ lang._("lastSend") }}</td>
<td>{{ lang._("linkQuality") }}</td>
<td>{{ lang._("preferred") }}</td>
<td>{{ lang._("trustedPathId") }}</td>
<td>{{ lang._('active') }}</td>
<td>{{ lang._('address') }}</td>
<td>{{ lang._('expired') }}</td>
<td>{{ lang._('lastReceive') }}</td>
<td>{{ lang._('lastSend') }}</td>
<td>{{ lang._('linkQuality') }}</td>
<td>{{ lang._('preferred') }}</td>
<td>{{ lang._('trustedPathId') }}</td>
</tr>
</thead>
<tbody>
@ -251,14 +258,18 @@ POSSIBILITY OF SUCH DAMAGE.
<td>{{ path["expired"] ? 'true' : 'false' }}</td>
<td>{{ path["lastReceive"] | e }}</td>
<td>{{ path["lastSend"] | e }}</td>
<td>{{ path["linkQuality"] | e }}</td>
<td>
{% if path["linkQuality"] is defined %}
{{ path["linkQuality"] | e }}
{% endif %}
<td>
<td>{{ path["preferred"] | e }}</td>
<td>{{ path["trustedPathId"] | e }}</td>
</tr>
{% endfor %}
{% else %}
<tr>
<td colspan="4">{{ lang._("No routes currently defined.") }}</td>
<td colspan="4">{{ lang._('No routes currently defined.') }}</td>
</tr>
{% endif %}
</tbody>
@ -275,7 +286,7 @@ POSSIBILITY OF SUCH DAMAGE.
</div>
</div>
{% 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 %}
</section>
</div>