mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
Fixed layout on pages
This commit is contained in:
Martin Schröder
Martin Schröder
parent
7194e647a2
commit
ccceb36e3a
17 changed files with 115 additions and 134 deletions
|
|
@ -1,14 +1,10 @@
|
|||
<luci-layout-with-sidebar>
|
||||
<div ng-controller="SettingsNetworkCtrl">
|
||||
<luci-config-section>
|
||||
<luci-config-heading>{{ 'Network Settings' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'settings.network.info' | translate }}</luci-config-info>
|
||||
<p translate ng-hide="network">Missing uci config boardpanel.</p>
|
||||
</luci-config-section>
|
||||
<luci-config-section ng-show="network">
|
||||
<div ng-repeat="interface in interfaces">
|
||||
<uci-network-interface-edit ng-model="interface"></uci-network-interface-edit>
|
||||
</div>
|
||||
</luci-config-section>
|
||||
<luci-config-heading>{{ 'Network Settings' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'settings.network.info' | translate }}</luci-config-info>
|
||||
<p translate ng-hide="network">Missing uci config boardpanel.</p>
|
||||
<div ng-repeat="interface in interfaces">
|
||||
<uci-network-interface-edit ng-model="interface"></uci-network-interface-edit>
|
||||
</div>
|
||||
</div>
|
||||
</luci-layout-with-sidebar>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ JUCI.app
|
|||
require: "^ngModel"
|
||||
};
|
||||
}).controller("uciNetworkInterfaceEdit", function($scope, $uci, $rpc, $log){
|
||||
$scope.expanded = true;
|
||||
$scope.$watch("interface", function(interface){
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
<button class="btn btn-lg btn-default" ng-click="onRestoreConfig()">{{'Load'|translate}}</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<div ng-show="resetPossible" >
|
||||
<h3>{{'Factory Settings'|translate}}</h3>
|
||||
<luci-config-lines >
|
||||
<luci-config-line title="{{'Reset restores the factory default settings of your gateway'|translate}}">
|
||||
<button class="btn btn-lg btn-default" ng-click="onReset()">{{'Reset'|translate}}</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</div>
|
||||
</luci-config-section>
|
||||
<luci-config-section ng-show="resetPossible">
|
||||
<h3>{{'Factory Settings'|translate}}</h3>
|
||||
<luci-config-lines >
|
||||
<luci-config-line title="{{'Reset restores the factory default settings of your gateway'|translate}}">
|
||||
<button class="btn btn-lg btn-default" ng-click="onReset()">{{'Reset'|translate}}</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<modal title="{{'Save Configuration to Computer'|translate}}" ng-show="showModal" on-accept="onAcceptModal()" on-dismiss="onDismissModal()" dismiss-label="Cancel" accept-label="Continue">
|
||||
<form name="backupForm" action="/cgi-bin/luci-backup" method="post" >
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
<div ng-controller="SettingsEnergyCtrl">
|
||||
<luci-config-section>
|
||||
<luci-config-heading>{{ 'Energy Settings' | translate }}</luci-config-heading>
|
||||
<p translate ng-hide="boardpanel">Missing uci config boardpanel.</p>
|
||||
</luci-config-section>
|
||||
<luci-config-section ng-show="boardpanel">
|
||||
<luci-config-info>{{ 'settings.energy.info' | translate }}</luci-config-info>
|
||||
</luci-config-section>
|
||||
<p translate ng-hide="boardpanel">Missing uci config boardpanel.</p>
|
||||
<luci-config-section ng-show="boardpanel">
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'USB Port'|translate}}">
|
||||
<switch id="enabled" name="enabled" ng-model="boardpanel.settings.usb_port.value" class="green"></switch>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<!--<switch id="enabled" name="enabled" ng-model="boardpanel.settings.power_led_br.value" class="green"></switch>-->
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<luci-config-apply></luci-config-apply>
|
||||
</luci-config-section>
|
||||
<luci-config-apply></luci-config-apply>
|
||||
</div>
|
||||
</luci-layout-with-sidebar>
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
<luci-layout-with-sidebar>
|
||||
<div ng-controller="SettingsNetworkCtrl">
|
||||
<luci-config-section>
|
||||
<luci-config-heading>{{ 'Network Settings' | translate }}</luci-config-heading>
|
||||
<p translate ng-hide="network">Missing uci config boardpanel.</p>
|
||||
</luci-config-section>
|
||||
<luci-config-section ng-show="boardpanel">
|
||||
<luci-config-info>{{ 'settings.energy.info' | translate }}</luci-config-info>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'USB Port'|translate}}">
|
||||
<switch id="enabled" name="enabled" ng-model="boardpanel.settings.usb_port.value" class="green"></switch>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Status-LED'|translate}}">
|
||||
<switch id="enabled" name="enabled" ng-model="boardpanel.settings.status_led.value" class="green"></switch>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Power-LED'|translate}}">
|
||||
<switch id="enabled" name="enabled" ng-model="boardpanel.settings.power_led.value" class="green"></switch>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Power-LED Brightness'|translate}}" no-pull>
|
||||
<luci-slider ng-model="boardpanel.settings.power_led_br.value" min="0" max="100"></luci-slider>
|
||||
<!--<switch id="enabled" name="enabled" ng-model="boardpanel.settings.power_led_br.value" class="green"></switch>-->
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<luci-config-apply></luci-config-apply>
|
||||
</luci-config-section>
|
||||
</div>
|
||||
</luci-layout-with-sidebar>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
//! Author: Martin K. Schröder <mkschreder.uk@gmail.com>
|
||||
|
||||
JUCI.app
|
||||
.controller("SettingsNetworkCtrl", function($scope){
|
||||
|
||||
});
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
<luci-config-section>
|
||||
<luci-config-heading>{{ 'Gateway Password' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'settings.password.info' | translate }}</luci-config-info>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Your account'|translate}} ({{username}})">
|
||||
<button class="btn btn-default btn-lg" ng-click="onChangePasswordClick()">{{'Change Password'|translate}}</button>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,9 @@
|
|||
<strong>{{config.system.firmware}}</strong>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<h3>{{'Manual Firmware Upgrade'|translate}}</h3>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2>{{'Manual Firmware Upgrade'|translate}}</h2>
|
||||
<p>{{'settings.upgrade.manual.info'|translate}}</p>
|
||||
<iframe name="postiframe" id="postiframe" style="display: none;" ></iframe>
|
||||
<form target="postiframe" name="uploadForm" action="/cgi-bin/luci-upload" method="post" enctype="multipart/form-data" >
|
||||
|
|
@ -23,7 +25,9 @@
|
|||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</form>
|
||||
<h3>{{'Online Update'|translate}}</h3>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2>{{'Online Update'|translate}}</h2>
|
||||
<p>{{'settings.upgrade.online.info'|translate}}</p>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{onlineUpgrade}}">
|
||||
|
|
@ -31,7 +35,9 @@
|
|||
<button ng-show="onlineUpgrade" class="btn btn-lg btn-default" ng-click="onUpgradeOnline()">{{'Upgrade'|translate}}</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<h3>{{'USB Firmware Upgrade'|translate}}</h3>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2>{{'USB Firmware Upgrade'|translate}}</h2>
|
||||
<p>{{'settings.upgrade.usb.info'|translate}}</p>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{usbUpgrade}}" ng-show="usbUpgrade">
|
||||
|
|
|
|||
|
|
@ -109,12 +109,14 @@
|
|||
})( jQuery);
|
||||
|
||||
JUCI.app
|
||||
.controller("SettingsUpgradeCtrl", function($scope, $uci, $rpc, $session){
|
||||
.controller("SettingsUpgradeCtrl", function($scope, $config, $uci, $rpc, $session){
|
||||
$scope.sessionID = $session.sid;
|
||||
$scope.uploadFilename = "/tmp/firmware.bin";
|
||||
$scope.usbFileName = "()";
|
||||
console.log("SID: "+$scope.sessionID);
|
||||
|
||||
$scope.config = $config;
|
||||
|
||||
function upgradeStart(path){
|
||||
alert("Will try to upgrade from "+path);
|
||||
$rpc.luci2.system.upgrade_start({"path": path}).done(function(){
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
<luci-config-section>
|
||||
<luci-config-heading>{{ 'General WiFi Settings' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'wifi.general.info' | translate }}</luci-config-info>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Wifi Network'|translate}}">
|
||||
<switch ng-model="status.wlan.value" class="green" ng-change="onApply()"></switch>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
<luci-layout-with-sidebar>
|
||||
<div ng-controller="WifiMacFilterPageCtrl">
|
||||
<luci-config>
|
||||
<luci-config-heading>{{ 'MAC Filter' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'wifi.macfilter.info' | translate }}</luci-config-info>
|
||||
<luci-config-section ng-repeat="iface in interfaces">
|
||||
<luci-config-heading>{{ iface.ssid.value }}</luci-config-heading>
|
||||
<uci-wireless-interface-macfilter-edit ng-model="iface"></uci-wifi-iface-macfilter-edit>
|
||||
</luci-config-section>
|
||||
<!--<luci-config-section>
|
||||
<luci-config-heading>str.guest.wifi</luci-config-heading>
|
||||
<uci-wireless-interface-macfilter-edit ng-model="guest_wifi"></uci-wifi-iface-macfilter-edit>
|
||||
</luci-config-section>-->
|
||||
<luci-config-apply></luci-config-apply>
|
||||
</luci-config>
|
||||
<luci-config-heading>{{ 'MAC Filter' | translate }}</luci-config-heading>
|
||||
<luci-config-info>{{ 'wifi.macfilter.info' | translate }}</luci-config-info>
|
||||
<luci-config-section ng-show="interfaces && interfaces.length != 0" ng-repeat="iface in interfaces">
|
||||
<luci-config-heading>{{ iface.ssid.value }} ({{iface[".frequency"]}})</luci-config-heading>
|
||||
<uci-wireless-interface-macfilter-edit ng-model="iface"></uci-wifi-iface-macfilter-edit>
|
||||
</luci-config-section>
|
||||
<!--<luci-config-section>
|
||||
<luci-config-heading>str.guest.wifi</luci-config-heading>
|
||||
<uci-wireless-interface-macfilter-edit ng-model="guest_wifi"></uci-wifi-iface-macfilter-edit>
|
||||
</luci-config-section>-->
|
||||
<luci-config-apply></luci-config-apply>
|
||||
</div>
|
||||
</luci-layout-with-sidebar>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,24 @@
|
|||
$juci.module("wifi")
|
||||
.controller("WifiMacFilterPageCtrl", function($scope, $uci){
|
||||
.controller("WifiMacFilterPageCtrl", function($scope, $uci, gettext){
|
||||
window.uci = $uci;
|
||||
$scope.uci = $uci;
|
||||
|
||||
$uci.sync(["wireless", "hosts"]).done(function(){
|
||||
console.log("synced wireless config");
|
||||
$scope.interfaces = $uci.wireless['@wifi-iface'];
|
||||
$scope.interfaces = $uci.wireless['@wifi-iface'];
|
||||
|
||||
// TODO: ================ this is a duplicate. It should be put elsewhere!
|
||||
$scope.devices = $uci.wireless["@wifi-device"].map(function(x){
|
||||
// TODO: this should be a uci "displayname" or something
|
||||
if(x.band.value == "a") x[".label"] = gettext("5GHz");
|
||||
else if(x.band.value == "b") x[".label"] = gettext("2.4GHz");
|
||||
return { label: x[".label"], value: x[".name"] };
|
||||
});
|
||||
$uci.wireless["@wifi-iface"].map(function(x){
|
||||
var dev = $uci.wireless[x.device.value];
|
||||
x[".frequency"] = dev[".label"];
|
||||
});
|
||||
// ========================
|
||||
|
||||
$scope.$apply();
|
||||
}).fail(function(err){
|
||||
console.log("failed to sync config: "+err);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@
|
|||
<td style="width: 1%"><button class="btn btn-default" ng-click="onAddSchedule()"><i class="fa fa-plus"></i></button></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</table>
|
||||
</luci-config-section>
|
||||
<luci-config-apply></luci-config-apply>
|
||||
<modal title="Add a new WiFi Schedule" ng-show="showScheduleDialog" on-accept="onAcceptSchedule()"
|
||||
on-dismiss="onDismissSchedule()" dismiss-label="Cancel" accept-label="Save">
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
<switch id="enabled" name="enabled" ng-model="interface.wps_pbc.value" class="green" ng-change="save()" ></switch>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2 translate>WPS-PBC: Push Button on Device</h2>
|
||||
<p translate>wifi.wps.pbc.info</p>
|
||||
<luci-config-lines>
|
||||
|
|
@ -32,6 +34,8 @@
|
|||
<button class="btn btn-lg btn-default col-xs-12" ng-click="onPairPBC()" translate>Pair</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2 translate>WPS-REG: Router provides PIN</h2>
|
||||
<p translate>wifi.wps.pin.info</p>
|
||||
<luci-config-lines>
|
||||
|
|
@ -45,6 +49,8 @@
|
|||
<button class="btn btn-lg btn-default" ng-click="onGeneratePIN()" translate>Generate</button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<luci-config-section>
|
||||
<h2 translate>WPS-PIN: Another Device provides PIN</h2>
|
||||
<p translate>wifi.wps.otherpin.info</p>
|
||||
<luci-config-lines>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
<div>
|
||||
<luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Wifi Mode'|translate}}">
|
||||
<luci-select ng-model="device.hwmode.value" ng-items="device.hwmode.schema.allow"/>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Bandwidth'|translate}}">
|
||||
<luci-select ng-model="device.bandwidth.value" ng-items="device.bandwidth.schema.allow"/>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Channel'|translate}}">
|
||||
<luci-select ng-model="device.channel.value" ng-items="device.channel.schema.allow"/>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Wifi Mode'|translate}}">
|
||||
<luci-select ng-model="device.hwmode.value" ng-items="device.hwmode.schema.allow"/>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Bandwidth'|translate}}">
|
||||
<luci-select ng-model="device.bandwidth.value" ng-items="device.bandwidth.schema.allow"/>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Channel'|translate}}">
|
||||
<luci-select ng-model="device.channel.value" ng-items="device.channel.schema.allow"/>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
<div>
|
||||
<luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'MAC Filtering'|translate}}">
|
||||
<switch ng-model="interface.macfilter.value" class="green" ng-change="onFilterEnable"></switch>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
<luci-config-section ng-show="interface.macfilter.value">
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'MAC Filtering'|translate}}">
|
||||
<switch ng-model="interface.macfilter.value" class="green" ng-change="onFilterEnable"></switch>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
<div ng-show="interface.macfilter.value">
|
||||
<!--<div class="alert alert-danger">
|
||||
<div ng-message="pattern" translate><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>You must enter a valid MAC address!</div>
|
||||
</div>-->
|
||||
|
|
@ -42,23 +40,18 @@
|
|||
<button class="btn btn-default" ng-click="onAddClients()"><i class="fa fa-plus"></i></button>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
</div>
|
||||
<modal title="{{'Add clients to MAC filtering list'|translate}}" ng-show="showModal" on-accept="onAcceptModal()" on-dismiss="onDismissModal()" dismiss-label="{{'Cancel'|translate}}" accept-label="{{'Save'|translate}}">
|
||||
<luci-config>
|
||||
<luci-config-section>
|
||||
|
||||
<div class="row" ng-repeat="cl in client_list">
|
||||
<div class="col-xs-6">
|
||||
<label>
|
||||
<input type="checkbox" ng-model="cl.checked"/> {{cl.client.hostname}}
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<label>{{cl.client.macaddr}}</label>
|
||||
</div>
|
||||
</div>
|
||||
</luci-config-section>
|
||||
</luci-config>
|
||||
<div class="row" ng-repeat="cl in client_list">
|
||||
<div class="col-xs-6">
|
||||
<label>
|
||||
<input type="checkbox" ng-model="cl.checked"/> {{cl.client.hostname}}
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<label>{{cl.client.macaddr}}</label>
|
||||
</div>
|
||||
</div>
|
||||
</modal>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,21 @@
|
|||
<form name="ruleForm" class="form-horizontal" novalidate>
|
||||
<div class="modal-body">
|
||||
<luci-config>
|
||||
<luci-config-section>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Time Frame'|translate}}">
|
||||
<luci-select ng-model="selectedTimeFrame" on-change="onChangeDays()" ng-items="allTimeFrames"></luci-select>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Days'|translate}}" no-pull >
|
||||
<div class="row" ng-class="{'field-error': schedule.days.error}" >
|
||||
<div class="col-xs-6" ng-repeat="day in allDayNames">
|
||||
<label >
|
||||
<input type="checkbox" checklist-model="schedule.days.value" checklist-value="day.value"> {{day.label}}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Time'|translate}}" no-pull>
|
||||
<luci-input-timespan ng-model="schedule.time" luci-timespan-validator="schedule.time.value"></luci-input-timespan>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</luci-config-section>
|
||||
</luci-config>
|
||||
<luci-config-lines>
|
||||
<luci-config-line title="{{'Time Frame'|translate}}">
|
||||
<luci-select ng-model="selectedTimeFrame" on-change="onChangeDays()" ng-items="allTimeFrames"></luci-select>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Days'|translate}}" no-pull >
|
||||
<div class="row" ng-class="{'field-error': schedule.days.error}" >
|
||||
<div class="col-xs-6" ng-repeat="day in allDayNames">
|
||||
<label >
|
||||
<input type="checkbox" checklist-model="schedule.days.value" checklist-value="day.value"> {{day.label}}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</luci-config-line>
|
||||
<luci-config-line title="{{'Time'|translate}}" no-pull>
|
||||
<luci-input-timespan ng-model="schedule.time" luci-timespan-validator="schedule.time.value"></luci-input-timespan>
|
||||
</luci-config-line>
|
||||
</luci-config-lines>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue