From 897b49e48cecd00dc2b178242ab92d2af5010412 Mon Sep 17 00:00:00 2001 From: Noel Wuyts Date: Tue, 5 May 2015 16:08:11 +0200 Subject: [PATCH] port directive --- luciexpress/htdocs/index.html | 53 +- luciexpress/htdocs/js/config.js | 11 +- luciexpress/htdocs/js/navigation.js | 7 +- luciexpress/htdocs/js/tr.js | 4 +- .../lib/css/awesome-bootstrap-checkbox.css | 222 ++ luciexpress/htdocs/lib/js/translations.js | 2 +- luciexpress/htdocs/plugins/core/plugin.json | 3 +- .../plugins/core/widgets/core.modal.html | 9 +- .../htdocs/plugins/core/widgets/core.modal.js | 19 +- .../plugins/core/widgets/luci.input.port.html | 13 + .../plugins/core/widgets/luci.input.port.js | 39 + .../plugins/core/widgets/theme_picker.html | 3 +- .../plugins/core/widgets/theme_picker.js | 3 +- .../widgets/uci.firewall.nat.rule.edit.html | 130 +- .../widgets/uci.firewall.nat.rule.edit.js | 4 +- .../htdocs/plugins/internet/internet.js | 35 + .../pages/internet.dns.html | 0 .../pages/internet.dns.js | 0 .../pages/internet.exposed_host.html | 0 .../pages/internet.exposed_host.js | 0 .../internet/pages/internet.firewall.html | 19 + .../internet/pages/internet.firewall.js | 23 + .../internet/pages/internet.port_mapping.html | 27 + .../internet/pages/internet.port_mapping.js | 73 + .../htdocs/plugins/internet/plugin.json | 19 + luciexpress/htdocs/plugins/router/plugin.json | 49 +- luciexpress/htdocs/plugins/router/router.js | 23 +- .../inteno-red/widgets/luci.navbar.html | 10 +- .../css/bootstrap.min.css | 2885 ++++++++--------- .../fonts/vodafonelt-webfont.woff | Bin .../img/activation/boxes/easybox-2.5.jpg | Bin .../img/activation/boxes/easybox-password.jpg | Bin .../img/activation/boxes/mic.jpg | Bin .../img/activation/boxes/plugDSL-804.jpg | Bin .../img/activation/easybox-804-reskin-old.png | Bin .../img/activation/easybox-804-reskin.png | Bin .../img/buttons/button-add.png | Bin .../img/buttons/button-delete.png | Bin .../img/buttons/button-edit.png | Bin .../img/buttons/button-left.png | Bin .../img/buttons/button-reload.png | Bin .../img/buttons/button-right.png | Bin .../img/checkbox/check-white.png | Bin .../img/icons/arrow-down.png | Bin .../img/icons/arrow-up.png | Bin .../img/logo/easybox-804-reskin-old.png | Bin .../img/logo/easybox-804-reskin.png | Bin .../img/overview/game.png | Bin .../img/overview/game@2x.png | Bin .../img/overview/icon-small-arrow-up.png | Bin .../img/overview/icon-small-arrow.png | Bin .../img/overview/incoming.png | Bin .../img/overview/incomingl@2x.png | Bin .../img/overview/laptop.png | Bin .../img/overview/laptop@2x.png | Bin .../img/overview/map.jpg | Bin .../img/overview/miseedcall@2x.png | Bin .../img/overview/missedcall.png | Bin .../img/overview/network.png | Bin .../img/overview/network@2x.png | Bin .../img/overview/outgoing.png | Bin .../img/overview/outgoing@2x.png | Bin ...background-bot-2nd-international-spain.jpg | Bin .../overview-background-top-left-vdsl.jpg | Bin .../img/overview/phone.png | Bin .../img/overview/phone@2x.png | Bin .../img/overview/phone_U1.png | Bin .../img/overview/phone_U1@2x.png | Bin .../img/overview/phone_U2.png | Bin .../img/overview/schedule.png | Bin .../img/overview/schedule@2x.png | Bin .../img/overview/signal_full.png | Bin .../img/overview/signal_full@2x.png | Bin .../img/overview/smartphone.png | Bin .../img/overview/smartphone@2x.png | Bin .../img/overview/tablet.png | Bin .../img/overview/tablet@2x.png | Bin .../img/overview/tv.png | Bin .../img/overview/tv@2x.png | Bin .../img/overview/vox-2.5-804.jpg | Bin .../img/overview/wifi.png | Bin .../img/overview/wifi@2x.png | Bin .../img/overview/wps.png | Bin .../img/overview/wps@2x.png | Bin .../{vodaphone => vodafone}/img/vf-logo.png | Bin .../themes/{vodaphone => vodafone}/index.html | 0 luciexpress/htdocs/themes/vodafone/theme.json | 11 + .../widgets/vodafone.navbar.html} | 0 .../widgets/vodafone.navbar.js} | 14 +- .../vodafone/widgets/vodafone.top_bar.html | 26 + .../widgets/vodafone.top_bar.js} | 12 +- .../vodaphone/widgets/vodaphone.top_bar.html | 23 - luciexpress/po/en.mo | Bin 907 -> 1159 bytes luciexpress/po/en.po | 871 ++++- luciexpress/po/template.pot | 435 +-- luciexpress/share/menu.d/internet.json | 2 +- ...us.vodaphone.json => status.vodafone.json} | 2 +- 97 files changed, 3196 insertions(+), 1885 deletions(-) create mode 100644 luciexpress/htdocs/lib/css/awesome-bootstrap-checkbox.css create mode 100644 luciexpress/htdocs/plugins/core/widgets/luci.input.port.html create mode 100644 luciexpress/htdocs/plugins/core/widgets/luci.input.port.js create mode 100644 luciexpress/htdocs/plugins/internet/internet.js rename luciexpress/htdocs/plugins/{router => internet}/pages/internet.dns.html (100%) rename luciexpress/htdocs/plugins/{router => internet}/pages/internet.dns.js (100%) rename luciexpress/htdocs/plugins/{router => internet}/pages/internet.exposed_host.html (100%) rename luciexpress/htdocs/plugins/{router => internet}/pages/internet.exposed_host.js (100%) create mode 100644 luciexpress/htdocs/plugins/internet/pages/internet.firewall.html create mode 100644 luciexpress/htdocs/plugins/internet/pages/internet.firewall.js create mode 100644 luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.html create mode 100644 luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.js create mode 100644 luciexpress/htdocs/plugins/internet/plugin.json rename luciexpress/htdocs/themes/{vodaphone => vodafone}/css/bootstrap.min.css (53%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/fonts/vodafonelt-webfont.woff (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/boxes/easybox-2.5.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/boxes/easybox-password.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/boxes/mic.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/boxes/plugDSL-804.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/easybox-804-reskin-old.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/activation/easybox-804-reskin.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-add.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-delete.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-edit.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-left.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-reload.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/buttons/button-right.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/checkbox/check-white.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/icons/arrow-down.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/icons/arrow-up.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/logo/easybox-804-reskin-old.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/logo/easybox-804-reskin.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/game.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/game@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/icon-small-arrow-up.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/icon-small-arrow.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/incoming.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/incomingl@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/laptop.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/laptop@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/map.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/miseedcall@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/missedcall.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/network.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/network@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/outgoing.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/outgoing@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/overview-background-bot-2nd-international-spain.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/overview-background-top-left-vdsl.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/phone.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/phone@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/phone_U1.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/phone_U1@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/phone_U2.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/schedule.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/schedule@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/signal_full.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/signal_full@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/smartphone.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/smartphone@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/tablet.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/tablet@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/tv.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/tv@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/vox-2.5-804.jpg (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/wifi.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/wifi@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/wps.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/overview/wps@2x.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/img/vf-logo.png (100%) rename luciexpress/htdocs/themes/{vodaphone => vodafone}/index.html (100%) create mode 100644 luciexpress/htdocs/themes/vodafone/theme.json rename luciexpress/htdocs/themes/{vodaphone/widgets/vodaphone.navbar.html => vodafone/widgets/vodafone.navbar.html} (100%) rename luciexpress/htdocs/themes/{vodaphone/widgets/vodaphone.navbar.js => vodafone/widgets/vodafone.navbar.js} (78%) create mode 100644 luciexpress/htdocs/themes/vodafone/widgets/vodafone.top_bar.html rename luciexpress/htdocs/themes/{vodaphone/widgets/vodaphone.top_bar.js => vodafone/widgets/vodafone.top_bar.js} (86%) delete mode 100644 luciexpress/htdocs/themes/vodaphone/widgets/vodaphone.top_bar.html rename luciexpress/share/menu.d/{status.vodaphone.json => status.vodafone.json} (85%) diff --git a/luciexpress/htdocs/index.html b/luciexpress/htdocs/index.html index e05485b20..a3a57dfde 100644 --- a/luciexpress/htdocs/index.html +++ b/luciexpress/htdocs/index.html @@ -4,38 +4,39 @@ LuCi Express - - - - - - - + + + + + + + + - - + +
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/luciexpress/htdocs/js/config.js b/luciexpress/htdocs/js/config.js index bd2ff31af..6ddf21c6e 100644 --- a/luciexpress/htdocs/js/config.js +++ b/luciexpress/htdocs/js/config.js @@ -21,7 +21,7 @@ */ angular.module("luci") -.factory('$config', function($rootScope){ +.factory('$config', function(){ return { mode: "basic", // basic or expert supported //model: "Inteno DG301", @@ -42,14 +42,13 @@ angular.module("luci") themes: [ "default", "inteno-red", - "vodaphone" + "vodafone" ], plugins: [ "core", - "phone", - "settings", - "status", - "router", + "phone", + "internet", + "router", "wifi" ], rpc: { diff --git a/luciexpress/htdocs/js/navigation.js b/luciexpress/htdocs/js/navigation.js index 05fa7bf83..60e209404 100644 --- a/luciexpress/htdocs/js/navigation.js +++ b/luciexpress/htdocs/js/navigation.js @@ -24,7 +24,7 @@ // provides a service for managing all pages // pages register with this service, and menus can query it to get the navigation tree angular.module("luci") -.provider('$navigation', function navigationProvider($stateProvider){ +.provider('$navigation', function navigationProvider(){ var data = { children: {}, children_list: [] @@ -77,9 +77,8 @@ angular.module("luci") Object.assign(o.children, children); item = o; } - obj.children_list = Object.keys(obj.children).map(function(key){ - return obj.children[key]; - }); + obj.children_list = Object.keys(obj.children).map(function (key) { + return obj.children[key]; }); obj.children_list.sort(function(a, b){ return a.index - b.index; }); diff --git a/luciexpress/htdocs/js/tr.js b/luciexpress/htdocs/js/tr.js index b5ef04ddc..12cd678d1 100644 --- a/luciexpress/htdocs/js/tr.js +++ b/luciexpress/htdocs/js/tr.js @@ -22,14 +22,14 @@ // service for managing session data angular.module("luci") -.factory('$tr', function(gettextCatalog, $localStorage) { +.factory('$tr', function(gettextCatalog) { return function(str){ return gettextCatalog.getString(str); } }); angular.module("luci") -.factory('$languages', function($config, gettextCatalog, $localStorage, $window) { +.factory('$languages', function($config, gettextCatalog, $localStorage) { gettextCatalog.currentLanguage = $localStorage.getItem("language") || "se"; return { getLanguages: function(){ diff --git a/luciexpress/htdocs/lib/css/awesome-bootstrap-checkbox.css b/luciexpress/htdocs/lib/css/awesome-bootstrap-checkbox.css new file mode 100644 index 000000000..40c02807e --- /dev/null +++ b/luciexpress/htdocs/lib/css/awesome-bootstrap-checkbox.css @@ -0,0 +1,222 @@ +.checkbox { + padding-left: 20px; +} +.checkbox label { + display: inline-block; + vertical-align: middle; + position: relative; + padding-left: 5px; +} +.checkbox label::before { + content: ""; + display: inline-block; + position: absolute; + width: 17px; + height: 17px; + left: 0; + margin-left: -20px; + border: 1px solid #cccccc; + border-radius: 3px; + background-color: #fff; + -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out; + -o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out; + transition: border 0.15s ease-in-out, color 0.15s ease-in-out; +} +.checkbox label::after { + display: inline-block; + position: absolute; + width: 16px; + height: 16px; + left: 0; + top: 0; + margin-left: -20px; + padding-left: 3px; + padding-top: 1px; + font-size: 11px; + color: #555555; +} +.checkbox input[type="checkbox"] { + opacity: 0; + z-index: 1; +} +.checkbox input[type="checkbox"]:focus + label::before { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.checkbox input[type="checkbox"]:checked + label::after { + font-family: 'FontAwesome'; + content: "\f00c"; +} +.checkbox input[type="checkbox"]:disabled + label { + opacity: 0.65; +} +.checkbox input[type="checkbox"]:disabled + label::before { + background-color: #eeeeee; + cursor: not-allowed; +} +.checkbox.checkbox-circle label::before { + border-radius: 50%; +} +.checkbox.checkbox-inline { + margin-top: 0; +} +.checkbox-primary input[type="checkbox"]:checked + label::before { + background-color: #337ab7; + border-color: #337ab7; +} +.checkbox-primary input[type="checkbox"]:checked + label::after { + color: #fff; +} +.checkbox-danger input[type="checkbox"]:checked + label::before { + background-color: #d9534f; + border-color: #d9534f; +} +.checkbox-danger input[type="checkbox"]:checked + label::after { + color: #fff; +} +.checkbox-info input[type="checkbox"]:checked + label::before { + background-color: #5bc0de; + border-color: #5bc0de; +} +.checkbox-info input[type="checkbox"]:checked + label::after { + color: #fff; +} +.checkbox-warning input[type="checkbox"]:checked + label::before { + background-color: #f0ad4e; + border-color: #f0ad4e; +} +.checkbox-warning input[type="checkbox"]:checked + label::after { + color: #fff; +} +.checkbox-success input[type="checkbox"]:checked + label::before { + background-color: #5cb85c; + border-color: #5cb85c; +} +.checkbox-success input[type="checkbox"]:checked + label::after { + color: #fff; +} +.radio { + padding-left: 20px; +} +.radio label { + display: inline-block; + vertical-align: middle; + position: relative; + padding-left: 5px; +} +.radio label::before { + content: ""; + display: inline-block; + position: absolute; + width: 30px; + height: 30px; + left: 0; + margin-left: -20px; + margin-top: -5px; + border: 1px solid #cccccc; + border-radius: 50%; + background-color: #fff; + -webkit-transition: border 0.15s ease-in-out; + -o-transition: border 0.15s ease-in-out; + transition: border 0.15s ease-in-out; +} +.radio label::after { + display: inline-block; + position: absolute; + content: " "; + width: 24px; + height: 24px; + left: 3px; + top: 3px; + margin-left: -20px; + margin-top: -5px; + border-radius: 50%; + background-color: #555555; + -webkit-transform: scale(0, 0); + -ms-transform: scale(0, 0); + -o-transform: scale(0, 0); + transform: scale(0, 0); + -webkit-transition: -webkit-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33); + -moz-transition: -moz-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33); + -o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33); + transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33); +} +.radio input[type="radio"] { + opacity: 0; + z-index: 1; +} +.radio input[type="radio"]:focus + label::before { + outline: none; + outline-offset: -2px; +} +.radio input[type="radio"]:checked + label::after { + -webkit-transform: scale(1, 1); + -ms-transform: scale(1, 1); + -o-transform: scale(1, 1); + transform: scale(1, 1); +} +.radio input[type="radio"]:disabled + label { + opacity: 0.65; +} +.radio input[type="radio"]:disabled + label::before { + cursor: not-allowed; +} +.radio.radio-inline { + margin-top: 0; +} +.radio-primary input[type="radio"] + label::after { + background-color: #337ab7; +} +.radio-primary input[type="radio"]:checked + label::before { + border-color: #337ab7; +} +.radio-primary input[type="radio"]:checked + label::after { + background-color: #337ab7; +} +.radio-danger input[type="radio"] + label::after { + background-color: #d9534f; +} +.radio-danger input[type="radio"]:checked + label::before { + border-color: #d9534f; +} +.radio-danger input[type="radio"]:checked + label::after { + background-color: #d9534f; +} +.radio-info input[type="radio"] + label::after { + background-color: #5bc0de; +} +.radio-info input[type="radio"]:checked + label::before { + border-color: #5bc0de; +} +.radio-info input[type="radio"]:checked + label::after { + background-color: #5bc0de; +} +.radio-warning input[type="radio"] + label::after { + background-color: #f0ad4e; +} +.radio-warning input[type="radio"]:checked + label::before { + border-color: #f0ad4e; +} +.radio-warning input[type="radio"]:checked + label::after { + background-color: #f0ad4e; +} +.radio-success input[type="radio"] + label::after { + background-color: #5cb85c; +} +.radio-success input[type="radio"]:checked + label::before { + border-color: #5cb85c; +} +.radio-success input[type="radio"]:checked + label::after { + background-color: #5cb85c; +} +input[type="checkbox"].styled:checked + label:after { + font-family: 'FontAwesome'; + content: "\f00c"; +} +input[type="checkbox"] .styled:checked + label::before { + color: #fff; +} +input[type="checkbox"] .styled:checked + label::after { + color: #fff; +} \ No newline at end of file diff --git a/luciexpress/htdocs/lib/js/translations.js b/luciexpress/htdocs/lib/js/translations.js index 1fee48cd6..369a4904d 100644 --- a/luciexpress/htdocs/lib/js/translations.js +++ b/luciexpress/htdocs/lib/js/translations.js @@ -1,6 +1,6 @@ angular.module('gettext').run(['gettextCatalog', function (gettextCatalog) { /* jshint -W100 */ - gettextCatalog.setStrings('en', {"Overview":"Overview","Phone":"Phone","System":"System","Internet":"Internet","WiFi":"WiFi","Settings":"Settings","Status":"Status","Theme":"Theme","Network":"Network","Choose Bandwidth":"Choose Bandwidth","Choose Channel":"Choose Channel","Choose Device":"Choose Device","Choose Mode":"Choose Mode","Choose Protection":"Choose Protection","DSL Status":"DSL Status"}); + gettextCatalog.setStrings('en', {"Overview":"Overview","Phone":"Phone","System":"System","Internet":"Internet","WiFi":"WiFi","Settings":"Settings","Status":"Status","Theme":"Theme","Network":"Network","Choose Bandwidth":"Choose Bandwidth","Choose Channel":"Choose Channel","Choose Device":"Choose Device","Choose Mode":"Choose Mode","Choose Protection":"Choose Protection","DSL Status":"DSL Status","internet.firewall.info":"Your EasyBox provides extensive firewall functionality which protects against common attacks. Vodafone recommends not to turn off firewall.","internet.firewall.title":"Firewall"}); gettextCatalog.setStrings('se', {"Overview":"Översikt","Phone":"Telefoni","System":"System","Internet":"Internet","WiFi":"WiFi","Settings":"Inställningar","Status":"Status","Theme":"Utseende","Network":"Nätverk","Setup":"Inställningar","General":"Inställningar","Schedule":"Schemaläggning","WPS":"WPS","MAC Filter":"MAC Filter","wifi.general.info":"Generell information ","wifi.macfilter.info":"Med hjälp av MAC filter kan du begränsa åtkomst till nätverket på hårdvarunivå. ","Enable WiFi On/Off button on EasyBox":"On/Off knappen på din EasyBox","Wifi Network":"Wifi Nätverk","wifi.schedule.info":"Med schemaläggninga kan du enkelt schemalägga när din wifi är tillgänglig. ","WPS Function":"WPS Funktion","wifi.wps.info":"Med hjälp av WPS kan du enkelt autentisera med ditt wifi nätverk. ","MAC Filtering":"MAC-filtrering ","Access for listed devices":"Åtkomst för listade enheter","Currently added devices":"Tilllagda enheter","Add currently connected hosts to the list":"Lägg till anslutna enheter","Wifi Mode":"WiFi typ","Bandwidth":"Bandbredd","Channel":"Kanal","MAC filter":"MAC Filter","Apply":"Verkställ","Cancel":"Avbryt","Firewall":"Brandvägg","DSN":"DSN","DSL":"DSL","Voice":"Telefoni","Vodaphone TV":"Vodaphone TV","Diagnostics":"Diagnostik","Events":"Händelser","Restart":"Starta om","About":"Om","NAT":"NAT","Call Log":"Samtalslogg","Number Blocking":"Nummerblockering","Ringing Schedule":"Telefonischema","Numbers":"Nummer","Speed Dialing":"Snabbuppringning","EasyBox Password":"EasyBox Lösenord","Firmware Upgrade":"Uppgradering","Energy Settings":"Energi-inställningar","Configuration":"Konfiguration","Advanced":"Avancerat","application.name":"LuCI-Express","ADSL":"ADSL","Active Connections":"Aktiva uppkopplingar","Active Stations":"Aktiva klienter","Add clients to MAC filtering list":"Lägg till klienter till filter-listan","All Numbers":"Alla nummer","Automated Diagnostics":"Automatiserad diagnostik","Basic":"Bas","Basic Mode":"Basic Mode","Bit Rate":"Bithastighet","Buffered":"Buffrad","Cell Statistics":"Samtals-statistik","Change Password":"Ändra lösenord","Check for Update":"Sök efter uppdatering","Choose Bandwidth":"Välj bandbredd","Choose Channel":"Välj kanal","Choose Device":"Välj enhet","Choose Mode":"Välj inställning","Choose Protection":"Välj säkerhet","Connection Type":"Anslutningstyp","Connections":"Anslutningar","Current Firmware Version":"Nuvarande mjukvaruversion","Current password":"Nuvarande lösenord","DHCP Leases":"DHCP Leasar","DSL Connection":"DSL uppkoppling","DSL Mode":"DSL Mode","DSL Status":"DSL Status","DSL Status Information":"DSL Status","Diagnose":"Diagnostisera","Diagnostic Utility":"Diagnostikverktyg","Display Characters":"Visa tecken","Enabled":"Aktiv","Error Counter":"Fel","Ethernet Ports":"Ethernet portar","Expert Mode":"Expert","Exposed Host":"Öppet klient","Exposed Host Function":"Aktivera öppen klient","Factory Settings":"Fabriksinställningar","Firmware File:":"Mjukvarufil","Firmware Version":"Firmware version","Gateway Password":"Gateway lösenord","General WiFi Settings":"Generella Inställningar","Guest Room":"Gästrum","Home Main":"Home Main","Host":"Namn","Hostname":"Datornamn","IPv4-Address":"IPv4-Adress","If you have a local network device that cannot run an Internet application properly behind the firewall, you can allow unrestricted Internet access to the network device (Exposed Host).":"Om du har en maskin som du vill göra tillgänglig från internet så kan du använda denna funktion för att vidarekoppla samtliga uppkopplingar till denna maskin (DMZ)","Install Upgrade":"Installera uppgradering","Kernel Version":"Kärnans version","Leasetime remaining":"Återstående lease-tid","Load":"Ladda upp","Load Average":"Genomsnittsbelastning","Loading":"Laddar","Local IP":"Lokalt IP","Local Time":"Lokal tid","Local port":"Lokal port","Log out":"Logga ut","Login Account":"Login konto","MAC address":"MAC-Adress","MAC-Address":"MAC-Adress","Manual Firmware Upgrade":"Manuell uppgradering","Memory":"Minne","Model":"Modell","No active leases":"Inga aktiva leasar","No active stations":"Inga aktiva klienter","Noise":"Brus","Office":"Office","Online Update":"Online-uppgradering","Operating Data":"Operationsdata","Password":"Lösenord","Ping":"Ping","Ping Test":"Ping Test","Please enter correct username and password!":"Knappa in rätt användarnamn och lösenord! ","Please sign in":"Logga in","Port Mapping":"Portmappning","Port mapping allows remote computers to connect to a specific device within your private network.":"Portmappning tillåter andra datorer på internet att koppla upp sig till datorer på ditt lokala nätverk","Power-LED":"Power-LED","Power-LED Brightness":"Power-LED Ljusstyrka","Protocol":"Protokol","Public Port":"Publikt port","RX Rate":"RX","Reset":"Reset","Reset restores the factory default settings of your gateway":"Reset återställer fabriksinställningarna på din gateway","Restore settings from a configuration saved on a computer":"Återställ konfigurationsinställnignar från fil på din dator","Root Usage (/)":"Root disk (/)","Save":"Spara","Save settings to computer with password protection":"Spara konfigurationen till fil","Schedule Function":"Schemaläggningsfunktion","Shared":"Delad","Show calls for":"Visa samtal för","Sign in":"Logga in","Signal":"Signal","Status-LED":"Status-LED","Storage":"Utrymme","Swap":"Swap","TX Rate":"TX","Temporary Usage (/tmp)":"Temporärt utrymme (/tmp)","Toggle navigation":"Toggla navigation","Tracing Tool":"Spårningsverktyg","USB Firmware Upgrade":"USB Uppgradering","USB Port":"USB Port","Upload file":"Ladda upp fil","Uptime":"Upptid","Usage":"Användning","Username":"Användarnamn","VDSL":"VDSL","Voice Ports":"Voice portar","Wifi":"WiFi","You are logged in!":"Du är inloggad!","no":"Nej","phone.number_blocking.info":"Behåll kontrollen över dina räkningar och blockera utgående samtal till oönskade nummer.","phone.schedule.info":"Definiera scheman när dina telefoner bör eller inte bör ringa.","settings.config.info":"Spara dina inställningar, återställa tidigare sparade inställningar och återställ EasyBox till fabrikstillstånd.Din EasyBox kan spara din konfiguration till en dator. Vi rekommenderar att alltid spara dina senaste ändrade inställningar till en dator.","settings.energy.info":"Minska energiförbrukningen genom att stänga av oanvända funktioner.","settings.password.info":"Ställ en ny Easybox lösenord för att begränsa hanteringsåtkomst till routern.","settings.upgrade.info":"Här kan du uppdatera programvaran på din EasyBox. Om det behövs, är det möjligt att uppdatera Easybox inbyggda programvaran manuellt. Dina nuvarande inställningar kommer inte att påverkas av programvara uppgradering förfarande.","settings.upgrade.manual.info":"Det är möjligt att uppdatera firmware från fil en sparad uppdatering. Den senaste versionen kan hittas på www.dsl-easybox.de.","settings.upgrade.online.info":"Klicka på \"Sök efter uppdatering\" för att starta en online-programvaruuppgradering. Om en ny firmware finns, kommer det att installeras automatiskt på din EasyBox (Internet-anslutning krävs).","settings.upgrade.usb.info":"Det är möjligt att uppdatera firmware från en fil som sparats på ett USB-minne ansluten till USB-porten på din EasyBox. Klicka på \"Install Update\" för att starta uppgraderingen av automatiska firmware. Observera att det bör finnas en enda firmware-fil att den bör vara placerad under huvudkatalogen (ingen sökning i undermappar).","status.diagnostics.auto.info":"Denna diagnos bör ta upp till 2 minuter och kan inte avbrytas när den väl har startats.","status.diagnostics.info":"I det här avsnittet visas en lista över verktyg som kan användas för att kontrollera status för din nätverksanslutning.","status.diagnostics.ping.info":"Ange ett giltigt värdnamn eller IP-adress för att utföra Ping-test.","status.diagnostics.trace.info":"Välj anslutningstypen och platsen där du vill spara spårning. Spårning kommer då att börja automatiskt i en separat popup-fönster.","status.dsl.offline":"DSL är offline","wifi-iface.closed":"Öppet nätverk","wifi-iface.device":"Radio","wifi-iface.encryption":"Säkerhet","wifi-iface.key":"Krypteringsnyckel","wifi-iface.ssid":"WiFi Namn (SSID)","wifi.settings.info":"Här kan du ställa in generella inställningar för wifi kort","yes":"Ja","internet.title":"Internet","internet.firewall.title":"Brandvägg","internet.port_mapping.title":"NAT Mappning","internet.exposed_host.title":"Exponerad klient","internet.dns.title":"DNS","overview.title":"Översikt","phone.title":"Telefoni","phone.call_log.title":"Samtalslogg","phone.number_blocking.title":"Nummerblockering","phone.ringing_schedule.title":"Ringschema","phone.numbers.title":"Telefonnummer","phone.speed_dialing.title":"Snabbuppringning","settings.title":"Inställningar","settings.password.title":"Lösenord","settings.upgrade.title":"Uppgradera","settings.energy.title":"Energiförbrukning","settings.configuration.title":"Konfiguration","settings.network.title":"Nätverk","settings.uci.title":"UCI","status.title":"Status","status.status.title":"Status","status.status.dsl.title":"DSL","status.diagnostics.title":"Diagnostik","status.events.title":"Händelser","status.restart.title":"Starta om","status.about.title":"Om","status.nat.title":"NAT","status.status.voice.title":"Telefoni","status.status.tv.title":"TV","wifi.title":"WiFi","wifi.general.title":"Wifi Inställningar","wifi.schedule.title":"Wifi Schemaläggning","wifi.wps.title":"Wifi WPS","wifi.mac_filter.title":"Wifi MAC-filter","wifi.settings.title":"Wifi Inställningar","wifi-iface.wifi-iface.ssid":"SSID","wifi-iface.network":"Nätverk","wifi-iface.mode":"WiFi inställning","wifi-iface.cipher":"Kryptering","wifi-iface.up":"På","wifi-iface.macmode":"Filtreringstyp","wifi-iface.macfilter":"MAC Filter","interface.macmode.allow":"Tillåt","interface.macmode.deny":"Neka"}); /* jshint +W100 */ }]); \ No newline at end of file diff --git a/luciexpress/htdocs/plugins/core/plugin.json b/luciexpress/htdocs/plugins/core/plugin.json index db3a5a697..e06ee2beb 100644 --- a/luciexpress/htdocs/plugins/core/plugin.json +++ b/luciexpress/htdocs/plugins/core/plugin.json @@ -6,7 +6,8 @@ "widgets/luci.table", "widgets/luci.config", "widgets/uci.firewall.nat.rule.edit", - "widgets/core.modal" + "widgets/core.modal", + "widgets/luci.input.port" ], "pages": { "overview": { diff --git a/luciexpress/htdocs/plugins/core/widgets/core.modal.html b/luciexpress/htdocs/plugins/core/widgets/core.modal.html index 787926d9d..d7d579704 100644 --- a/luciexpress/htdocs/plugins/core/widgets/core.modal.html +++ b/luciexpress/htdocs/plugins/core/widgets/core.modal.html @@ -2,11 +2,12 @@
- -

{{ title }}

+ +

{{title|translate}}

-
-
+
+
+
diff --git a/luciexpress/htdocs/plugins/core/widgets/core.modal.js b/luciexpress/htdocs/plugins/core/widgets/core.modal.js index 83353d5c8..b2d527acb 100644 --- a/luciexpress/htdocs/plugins/core/widgets/core.modal.js +++ b/luciexpress/htdocs/plugins/core/widgets/core.modal.js @@ -7,19 +7,18 @@ $juci.module("core") transclude: true, replace:true, scope: { - acceptLabel: "@acceptLabel", - dismissLabel: "@dismissLabel", - onAccept: "&onAccept", - onDismiss: "&onDismiss", - ngShow: "=ngShow", - title: "@title" + acceptLabel: "@", + dismissLabel: "@", + onAccept: "&", + onDismiss: "&", + ngShow: "=", + title: "@", + hideCloseBtn : "@", + formIncluded : "@" }, controller: "ModalController", link: function postLink(scope, element, attrs) { - //scope.title = attrs.title; - //scope.acceptLabel = attrs.acceptLabel; - //scope.dismissLabel = attrs.dismissLabel; - scope.element = element; + scope.element = element; scope.$watch("ngShow", function(value){ if(value == true) $(element).modal('show'); diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.input.port.html b/luciexpress/htdocs/plugins/core/widgets/luci.input.port.html new file mode 100644 index 000000000..64c426bc5 --- /dev/null +++ b/luciexpress/htdocs/plugins/core/widgets/luci.input.port.html @@ -0,0 +1,13 @@ +
+ +
+ + +
+
+
+ {{'error.port.required'|translate}} + {{'error.port.invalid'|translate}} +
+
+
diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.input.port.js b/luciexpress/htdocs/plugins/core/widgets/luci.input.port.js new file mode 100644 index 000000000..80ec21187 --- /dev/null +++ b/luciexpress/htdocs/plugins/core/widgets/luci.input.port.js @@ -0,0 +1,39 @@ +$juci.module("core") +.directive("luciInputPort", function(){ + var plugin_root = $juci.module("core").plugin_root; + return { + templateUrl: plugin_root+"/widgets/luci.input.port.html", + restrict: 'E', + replace: true, + scope: { + id: "@", + name: "@", + label: "@", + model : "=", + form: "=", + labelClass : "@", + inputOuterClass : "@", + messageClass : "@", + messageOffsetClass : "@" + } + }; +}) +.directive("validatePort", function(){ + var PORT_REGEX = /^\d{1,5}$/; + return { + require: 'ngModel', + link: function(scope, elm, attrs, ctrl) { + ctrl.$validators.validatePort = function(modelValue, viewValue) { + if (ctrl.$isEmpty(modelValue)) { // consider empty models to be valid + return true; + } + if (PORT_REGEX.test(viewValue)) { // valid regex + if (viewValue > 0 && viewValue <= 65535) { + return true; + } + } + return false; + } + } + } +}); diff --git a/luciexpress/htdocs/plugins/core/widgets/theme_picker.html b/luciexpress/htdocs/plugins/core/widgets/theme_picker.html index 1fdd7051a..8edda174c 100644 --- a/luciexpress/htdocs/plugins/core/widgets/theme_picker.html +++ b/luciexpress/htdocs/plugins/core/widgets/theme_picker.html @@ -3,8 +3,7 @@ theme="bootstrap" search-enabled="false" on-select="onChangeTheme($item, $model)" - style="width: 150px;" - > + style="width: 150px;"> {{$select.selected.label}} diff --git a/luciexpress/htdocs/plugins/core/widgets/theme_picker.js b/luciexpress/htdocs/plugins/core/widgets/theme_picker.js index 9b576ccd6..08b001b1c 100644 --- a/luciexpress/htdocs/plugins/core/widgets/theme_picker.js +++ b/luciexpress/htdocs/plugins/core/widgets/theme_picker.js @@ -1,5 +1,5 @@ $juci.module("core") -.directive("juciThemePicker", function($compile){ +.directive("juciThemePicker", function(){ var plugin_root = $juci.module("core").plugin_root; return { @@ -8,7 +8,6 @@ $juci.module("core") }; }) .controller("JuciThemePickerController", function($scope, $theme, $config){ - var allthemes = $theme.getAvailableThemes(); $scope.themes = $config.themes.map(function(x){ return { id: x, diff --git a/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.html b/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.html index 4068af1cf..5a906a108 100644 --- a/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.html +++ b/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.html @@ -1,59 +1,71 @@ -
-
- -
- - {{devices[$select.selected].ipaddr}} - -
{{devices[c].ipaddr + " " + devices[c].hostname}}
- - -
-
-
- -
-
-
- -
- - {{$select.selected}} - -
{{c}}
- - -
-
-
- -
- Range - Single -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
+
+
+
+ +
+ + {{devices[$select.selected].hostname}} + +
{{devices[c].hostname}}
+ + +
+
+
+ +
+
+
+ +
+ + {{$select.selected}} + +
{{c}}
+ + +
+
+
+ +
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + +
+
\ No newline at end of file diff --git a/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.js b/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.js index 2b8197eea..1780bb510 100644 --- a/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.js +++ b/luciexpress/htdocs/plugins/core/widgets/uci.firewall.nat.rule.edit.js @@ -11,12 +11,12 @@ $juci.module("core") require: "^ngModel" }; }).controller("uciFirewallNatRuleEdit", function($scope, $uci, $rpc){ - $scope.portIsRange = 1; + $scope.portIsRange = 0; $scope.protocols = ["udp", "tcp"]; $scope.patterns = { ipaddress: /^(?!0)(?!.*\.$)((1?\d?\d|25[0-5]|2[0-4]\d)(\.|$)){4}$/, port: /^\d{1,5}$/ - } + }; $rpc.router.clients().done(function(clients){ //console.log(JSON.stringify(Object.keys(clients).map(function(x) { return clients[x]; }))); $scope.clients = []; diff --git a/luciexpress/htdocs/plugins/internet/internet.js b/luciexpress/htdocs/plugins/internet/internet.js new file mode 100644 index 000000000..4fd468aa8 --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/internet.js @@ -0,0 +1,35 @@ +/* + * juci - javascript universal client interface + * + * Project Author: Noël Wuyts + * + * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +$juci.module("internet") +.state("internet", { + url: "/internet", + views: { + "content": { + templateUrl: "pages/internet.firewall.html" + } + }, + onEnter: function(){ + $juci.redirect("internet.firewall"); + } +}); + diff --git a/luciexpress/htdocs/plugins/router/pages/internet.dns.html b/luciexpress/htdocs/plugins/internet/pages/internet.dns.html similarity index 100% rename from luciexpress/htdocs/plugins/router/pages/internet.dns.html rename to luciexpress/htdocs/plugins/internet/pages/internet.dns.html diff --git a/luciexpress/htdocs/plugins/router/pages/internet.dns.js b/luciexpress/htdocs/plugins/internet/pages/internet.dns.js similarity index 100% rename from luciexpress/htdocs/plugins/router/pages/internet.dns.js rename to luciexpress/htdocs/plugins/internet/pages/internet.dns.js diff --git a/luciexpress/htdocs/plugins/router/pages/internet.exposed_host.html b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html similarity index 100% rename from luciexpress/htdocs/plugins/router/pages/internet.exposed_host.html rename to luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html diff --git a/luciexpress/htdocs/plugins/router/pages/internet.exposed_host.js b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js similarity index 100% rename from luciexpress/htdocs/plugins/router/pages/internet.exposed_host.js rename to luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.firewall.html b/luciexpress/htdocs/plugins/internet/pages/internet.firewall.html new file mode 100644 index 000000000..7ce233dc3 --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/pages/internet.firewall.html @@ -0,0 +1,19 @@ + +
+ + {{'internet.firewall.title'|translate}} + {{'internet.firewall.info'|translate}} + + + + + + + + + + + + +
+ diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.firewall.js b/luciexpress/htdocs/plugins/internet/pages/internet.firewall.js new file mode 100644 index 000000000..7dca418d2 --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/pages/internet.firewall.js @@ -0,0 +1,23 @@ +$juci.module("internet") +.controller("InternetFirewallPageCtrl", function($scope, $uci){ + $scope.firewallSwitchState = 0; + $uci.sync("firewall").done(function(){ + $scope.firewall = $uci.firewall; + //settings.firewall = Number(settings.firewall); + //settings.ping_wan = Number(settings.ping_wan); + $scope.wan_ping_rule = $uci.firewall["@rule"].filter(function(rule){ return rule.name.value == "Allow-Ping" })[0]||null; + $scope.firewallSwitchState = $uci.firewall["@rule"].filter(function(rule){ return rule.enabled.value == true; }).length > 0; + $scope.$apply(); + }); + $scope.onFirewallToggle = function(){ + if(!$scope.firewallSwitchState) { + $uci.firewall["@rule"].map(function(rule){ + rule.enabled.value = false; + }); + } else { + $uci.firewall["@rule"].map(function(rule){ + rule.enabled.value = true; + }); + }; + } +}); diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.html b/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.html new file mode 100644 index 000000000..aa257c00d --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.html @@ -0,0 +1,27 @@ + +
+

Port Mapping

+

Port mapping allows remote computers to connect to a specific device within your private network.

+ + + + + + + + + + + + + + + + +
Local IPProtocolLocal portPublic Port
{{ r.dest_ip.value }}{{ r.proto.value }}{{ r.dest_port.value }}{{ r.src_dport.value }}
+ + + + +
+ diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.js b/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.js new file mode 100644 index 000000000..4fb6d3285 --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/pages/internet.port_mapping.js @@ -0,0 +1,73 @@ +$juci.module("internet") +.controller("InternetPortMappingPageCtrl", function($scope, $uci, ModalService, $rpc){ + + function reload(){ + $uci.sync("firewall").done(function(){ + $scope.redirects = $uci.firewall["@redirect"]; + $scope.$apply(); + }); + } reload(); + + $scope.showModal = 0; + $scope.onAcceptModal = function(){ + var rule = $scope.rule; + //Object.keys($scope.redirects).map(function(idx) { var x = $scope.redirects[idx]; if(x[".name"] == rule[".name"]) $scope.redirects[idx] = rule; }); + console.log(JSON.stringify(rule)); + if(!rule[".name"]){ + // set up the rule in uci + rule[".type"] = "redirect"; + $uci.firewall.create(rule).done(function(rule){ + $scope.rule_src = rule; + }); + } + $scope.showModal = 0; + }; + $scope.onDismissModal = function(){ + $scope.showModal = 0; + }; + $scope.onAddRule = function(){ + $scope.rule = {}; + //$scope.redirects.push($scope.rule); + $scope.showModal = 1; + }; + $scope.onEditRule = function(rule){ + $scope.rule_src = rule; + $scope.rule = { + ".name": rule[".name"], + dest_ip: rule.dest_ip.value, + proto: rule.proto.value, + dest_port: rule.dest_port.value, + src_dport: rule.src_dport.value + }; + $scope.modalTitle = "Edit port mapping ("+(rule['.name'] || 'new')+")"; + $scope.showModal = 1; + }; + $scope.onDeleteRule = function(rule){ + function removeFromList(){ + if($scope.redirects) { + $scope.redirects = $scope.redirects.filter(function(x){ return x !== rule; }); + $scope.$apply(); + } + } + console.log("Deleting rule: "+rule[".name"]); + if(rule[".name"]){ + $uci.delete("firewall."+rule[".name"]).always(function(){ + removeFromList(); + }); + } else { + removeFromList(); + } + }; + $scope.onCommit = function(){ + if(!$scope.redirects) return; + $uci.commit("firewall").always(function(){ + $scope.$apply(); + console.log("Saved firewall settings!"); + }); + }; + $scope.onCancel = function(){ + $uci.rollback().always(function(){ + reload(); + }); + } +}); diff --git a/luciexpress/htdocs/plugins/internet/plugin.json b/luciexpress/htdocs/plugins/internet/plugin.json new file mode 100644 index 000000000..744047985 --- /dev/null +++ b/luciexpress/htdocs/plugins/internet/plugin.json @@ -0,0 +1,19 @@ +{ + "scripts": [ + "internet" + ], + "pages": { + "internet.dns": { + "view": "pages/internet.dns" + }, + "internet.exposed_host": { + "view": "pages/internet.exposed_host" + }, + "internet.firewall": { + "view": "pages/internet.firewall" + }, + "internet.port_mapping": { + "view": "pages/internet.port_mapping" + } + } +} diff --git a/luciexpress/htdocs/plugins/router/plugin.json b/luciexpress/htdocs/plugins/router/plugin.json index 626c6bf0d..91c3e27eb 100644 --- a/luciexpress/htdocs/plugins/router/plugin.json +++ b/luciexpress/htdocs/plugins/router/plugin.json @@ -3,17 +3,50 @@ "router" ], "pages": { - "internet.dns": { - "view": "pages/internet.dns" + "settings.configuration": { + "view": "pages/settings.configuration" }, - "internet.exposed_host": { - "view": "pages/internet.exposed_host" + "settings.energy": { + "view": "pages/settings.energy" }, - "internet.firewall": { - "view": "pages/internet.firewall" + "settings.network": { + "view": "pages/settings.network" }, - "internet.port_mapping": { - "view": "pages/internet.port_mapping" + "settings.password": { + "view": "pages/settings.password" + }, + "settings.upgrade": { + "view": "pages/settings.upgrade" + }, + "settings.uci": { + "view": "pages/settings.uci" + }, + "status.status": { + "view": "pages/status.status" + }, + "status.status.dsl": { + "view": "pages/status.status.dsl" + }, + "status.status.tv": { + "view": "pages/status.status.tv" + }, + "status.status.voice": { + "view": "pages/status.status.voice" + }, + "status.about": { + "view": "pages/status.about" + }, + "status.diagnostics": { + "view": "pages/status.diagnostics" + }, + "status.events": { + "view": "pages/status.events" + }, + "status.nat": { + "view": "pages/status.nat" + }, + "status.restart": { + "view": "pages/status.restart" } } } diff --git a/luciexpress/htdocs/plugins/router/router.js b/luciexpress/htdocs/plugins/router/router.js index db0c549f7..6c1739c49 100644 --- a/luciexpress/htdocs/plugins/router/router.js +++ b/luciexpress/htdocs/plugins/router/router.js @@ -21,14 +21,15 @@ */ $juci.module("router") -.state("internet", { - url: "/internet", - views: { - "content": { - templateUrl: "pages/internet.firewall.html", - } - }, - onEnter: function($state){ - $juci.redirect("internet.firewall"); - }, -}); +.state("settings", { + url: "/settings", + onEnter: function(){ + $juci.redirect("settings.password"); + } +}) +.state("status", { + url: "/status", + onEnter: function(){ + $juci.redirect("status.status"); + } +}); diff --git a/luciexpress/htdocs/themes/inteno-red/widgets/luci.navbar.html b/luciexpress/htdocs/themes/inteno-red/widgets/luci.navbar.html index 2118db9b6..7ab667dd6 100644 --- a/luciexpress/htdocs/themes/inteno-red/widgets/luci.navbar.html +++ b/luciexpress/htdocs/themes/inteno-red/widgets/luci.navbar.html @@ -1,7 +1,7 @@
-
-