luci-mod-status: add missing cbi-section class to routing view

[project/luci.git] / modules / luci-mod-status / htdocs / luci-static / resources / view / status / routes.js

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
index 91adae2434e00b2561ee362df0d0a740b86fd001..5e8bb525660aabed1cd5b735c088bca6b381f6c5 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
@@ -87,7 +87,7 @@ return view.extend({
                    res = [];
 
                for (var i = 0; i < lines.length; i++) {
-                       var m = lines[i].match(/^([0-9a-f:.]+) (.+) (\S+)$/),
+                       var m = lines[i].match(/^([0-9a-f:.]+) (.+) (\S+) *$/),
                            addr = m ? m[1] : null,
                            flags = m ? m[2].trim().split(/\s+/) : [],
                            state = (m ? m[3] : null) || 'FAILED';
@@ -175,7 +175,7 @@ return view.extend({
 
                var neigh4tbl = E('table', { 'class': 'table' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
-                               E('th', { 'class': 'th' }, [ _('IPv4 address') ]),
+                               E('th', { 'class': 'th' }, [ _('IP address') ]),
                                E('th', { 'class': 'th' }, [ _('MAC address') ]),
                                E('th', { 'class': 'th' }, [ _('Interface') ])
                        ])
@@ -185,7 +185,7 @@ return view.extend({
                        E('tr', { 'class': 'tr table-titles' }, [
                                E('th', { 'class': 'th' }, [ _('Network') ]),
                                E('th', { 'class': 'th' }, [ _('Target') ]),
-                               E('th', { 'class': 'th' }, [ _('IPv4 gateway') ]),
+                               E('th', { 'class': 'th' }, [ _('Gateway') ]),
                                E('th', { 'class': 'th' }, [ _('Metric') ]),
                                E('th', { 'class': 'th' }, [ _('Table') ]),
                                E('th', { 'class': 'th' }, [ _('Protocol') ])
@@ -201,7 +201,7 @@ return view.extend({
 
                var neigh6tbl = E('table', { 'class': 'table' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
-                               E('th', { 'class': 'th' }, [ _('IPv6 address') ]),
+                               E('th', { 'class': 'th' }, [ _('IP address') ]),
                                E('th', { 'class': 'th' }, [ _('MAC address') ]),
                                E('th', { 'class': 'th' }, [ _('Interface') ])
                        ])
@@ -225,43 +225,47 @@ return view.extend({
                        ])
                ]);
 
-               cbi_update_table(neigh4tbl, this.parseNeigh(ip4neigh, networks, false));
-               cbi_update_table(route4tbl, this.parseRoute(ip4route, networks, false));
-               cbi_update_table(rule4tbl, this.parseRule(ip4rule, networks, false));
-               cbi_update_table(neigh6tbl, this.parseNeigh(ip6neigh, networks, true));
-               cbi_update_table(route6tbl, this.parseRoute(ip6route, networks, true));
-               cbi_update_table(rule6tbl, this.parseRule(ip6rule, networks, false));
+               cbi_update_table(neigh4tbl, this.parseNeigh(ip4neigh, networks, false),
+                       E('em', _('No entries available'))
+               );
+               cbi_update_table(route4tbl, this.parseRoute(ip4route, networks, false),
+                       E('em', _('No entries available'))
+               );
+               cbi_update_table(rule4tbl, this.parseRule(ip4rule, networks, false),
+                       E('em', _('No entries available'))
+               );
+               cbi_update_table(neigh6tbl, this.parseNeigh(ip6neigh, networks, true),
+                       E('em', _('No entries available'))
+               );
+               cbi_update_table(route6tbl, this.parseRoute(ip6route, networks, true),
+                       E('em', _('No entries available'))
+               );
+               cbi_update_table(rule6tbl, this.parseRule(ip6rule, networks, false),
+                       E('em', _('No entries available'))
+               );
 
                var view = E([], [
-                       E('style', { 'type': 'text/css' }, [
-                               '.cbi-tooltip-container, span.jump { border-bottom:1px dotted #00f;cursor:pointer }',
-                               'ul { list-style:none }',
-                               '.references { position:relative }',
-                               '.references .cbi-tooltip { left:0!important;top:1.5em!important }',
-                               'h4>span { font-size:90% }'
-                       ]),
-
                        E('h2', {}, [ _('Routing') ]),
                        E('p', {}, [ _('The following rules are currently active on this system.') ]),
                        E('div', {}, [
-                               E('div', { 'data-tab': 'ipv4routing', 'data-tab-title': _('IPv4 Routing') }, [
-                                       E('h3', {}, [ _('ARP') ]),
+                               E('div', { 'class': 'cbi-section', 'data-tab': 'ipv4routing', 'data-tab-title': _('IPv4 Routing') }, [
+                                       E('h3', {}, [ _('IPv4 Neighbours') ]),
                                        neigh4tbl,
 
-                                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes')),
+                                       E('h3', {}, [ _('Active IPv4 Routes') ]),
                                        route4tbl,
 
-                                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Rules')),
+                                       E('h3', {}, [ _('Active IPv4 Rules') ]),
                                        rule4tbl
                                ]),
-                               E('div', { 'data-tab': 'ipv6routing', 'data-tab-title': _('IPv6 Routing') }, [
+                               E('div', { 'class': 'cbi-section', 'data-tab': 'ipv6routing', 'data-tab-title': _('IPv6 Routing') }, [
                                        E('h3', {}, [ _('IPv6 Neighbours') ]),
                                        neigh6tbl,
 
-                                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes')),
+                                       E('h3', {}, [ _('Active IPv6 Routes') ]),
                                        route6tbl,
 
-                                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Rules')),
+                                       E('h3', {}, [ _('Active IPv6 Rules') ]),
                                        rule6tbl
                                ])
                        ])