From 620068ecb040f721d4de03dadcda68f784674059 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 14 Apr 2015 10:32:30 +0200 Subject: [PATCH] BB: carry luci2 from feeds to local package dir --- luci2/luci2-p910nd/Makefile | 36 + .../usr/share/rpcd/acl.d/services.p910nd.json | 15 + .../share/rpcd/menu.d/services.p910nd.json | 11 + .../www/luci2/template/services.p910nd.htm | 1 + .../files/www/luci2/view/services.p910nd.js | 61 + luci2/luci2/Makefile | 62 + luci2/luci2/htdocs/luci2.html | 59 + luci2/luci2/htdocs/luci2/bootstrap.js | 1488 +++ luci2/luci2/htdocs/luci2/cbi.js | 3329 ++++++ luci2/luci2/htdocs/luci2/css/bootstrap.css | 5061 +++++++++ luci2/luci2/htdocs/luci2/css/luci2.css | 268 + luci2/luci2/htdocs/luci2/firewall.js | 50 + luci2/luci2/htdocs/luci2/html5.js | 8 + luci2/luci2/htdocs/luci2/icons/bridge.png | Bin 0 -> 838 bytes .../htdocs/luci2/icons/bridge_disabled.png | Bin 0 -> 517 bytes luci2/luci2/htdocs/luci2/icons/cbi/add.gif | Bin 0 -> 378 bytes luci2/luci2/htdocs/luci2/icons/cbi/apply.gif | Bin 0 -> 268 bytes luci2/luci2/htdocs/luci2/icons/cbi/arrow.gif | Bin 0 -> 135 bytes luci2/luci2/htdocs/luci2/icons/cbi/down.gif | Bin 0 -> 131 bytes .../luci2/htdocs/luci2/icons/cbi/download.gif | Bin 0 -> 189 bytes luci2/luci2/htdocs/luci2/icons/cbi/edit.gif | Bin 0 -> 280 bytes .../luci2/htdocs/luci2/icons/cbi/fieldadd.gif | Bin 0 -> 379 bytes luci2/luci2/htdocs/luci2/icons/cbi/file.gif | Bin 0 -> 371 bytes luci2/luci2/htdocs/luci2/icons/cbi/find.gif | Bin 0 -> 273 bytes luci2/luci2/htdocs/luci2/icons/cbi/folder.gif | Bin 0 -> 698 bytes luci2/luci2/htdocs/luci2/icons/cbi/help.gif | Bin 0 -> 266 bytes luci2/luci2/htdocs/luci2/icons/cbi/key.gif | Bin 0 -> 230 bytes luci2/luci2/htdocs/luci2/icons/cbi/link.gif | Bin 0 -> 279 bytes luci2/luci2/htdocs/luci2/icons/cbi/reload.gif | Bin 0 -> 248 bytes luci2/luci2/htdocs/luci2/icons/cbi/remove.gif | Bin 0 -> 385 bytes luci2/luci2/htdocs/luci2/icons/cbi/reset.gif | Bin 0 -> 258 bytes luci2/luci2/htdocs/luci2/icons/cbi/save.gif | Bin 0 -> 263 bytes luci2/luci2/htdocs/luci2/icons/cbi/up.gif | Bin 0 -> 130 bytes luci2/luci2/htdocs/luci2/icons/cbi/user.gif | Bin 0 -> 246 bytes luci2/luci2/htdocs/luci2/icons/encryption.png | Bin 0 -> 1224 bytes .../luci2/icons/encryption_disabled.png | Bin 0 -> 1197 bytes luci2/luci2/htdocs/luci2/icons/ethernet.png | Bin 0 -> 814 bytes .../htdocs/luci2/icons/ethernet_disabled.png | Bin 0 -> 508 bytes luci2/luci2/htdocs/luci2/icons/loading.gif | Bin 0 -> 1787 bytes luci2/luci2/htdocs/luci2/icons/port_down.png | Bin 0 -> 982 bytes luci2/luci2/htdocs/luci2/icons/port_up.png | Bin 0 -> 1401 bytes luci2/luci2/htdocs/luci2/icons/progress.gif | Bin 0 -> 1738 bytes .../luci2/htdocs/luci2/icons/signal-0-25.png | Bin 0 -> 495 bytes luci2/luci2/htdocs/luci2/icons/signal-0.png | Bin 0 -> 478 bytes .../luci2/htdocs/luci2/icons/signal-25-50.png | Bin 0 -> 501 bytes .../luci2/htdocs/luci2/icons/signal-50-75.png | Bin 0 -> 500 bytes .../htdocs/luci2/icons/signal-75-100.png | Bin 0 -> 485 bytes .../luci2/htdocs/luci2/icons/signal-none.png | Bin 0 -> 681 bytes luci2/luci2/htdocs/luci2/icons/switch.png | Bin 0 -> 794 bytes .../htdocs/luci2/icons/switch_disabled.png | Bin 0 -> 505 bytes luci2/luci2/htdocs/luci2/icons/tunnel.png | Bin 0 -> 533 bytes .../htdocs/luci2/icons/tunnel_disabled.png | Bin 0 -> 546 bytes luci2/luci2/htdocs/luci2/icons/vlan.png | Bin 0 -> 794 bytes .../htdocs/luci2/icons/vlan_disabled.png | Bin 0 -> 505 bytes luci2/luci2/htdocs/luci2/icons/wifi.png | Bin 0 -> 1037 bytes luci2/luci2/htdocs/luci2/icons/wifi_big.png | Bin 0 -> 2865 bytes .../htdocs/luci2/icons/wifi_big_disabled.png | Bin 0 -> 2853 bytes .../htdocs/luci2/icons/wifi_disabled.png | Bin 0 -> 980 bytes luci2/luci2/htdocs/luci2/jquery-1.9.1.js | 9597 +++++++++++++++++ luci2/luci2/htdocs/luci2/jquery.peity.js | 261 + luci2/luci2/htdocs/luci2/luci2.js | 705 ++ luci2/luci2/htdocs/luci2/network.js | 1447 +++ luci2/luci2/htdocs/luci2/proto/6in4.js | 90 + luci2/luci2/htdocs/luci2/proto/6rd.js | 63 + luci2/luci2/htdocs/luci2/proto/6to4.js | 35 + luci2/luci2/htdocs/luci2/proto/dhcp.js | 60 + luci2/luci2/htdocs/luci2/proto/dhcpv6.js | 59 + luci2/luci2/htdocs/luci2/proto/dslite.js | 46 + luci2/luci2/htdocs/luci2/proto/none.js | 6 + luci2/luci2/htdocs/luci2/proto/static.js | 113 + luci2/luci2/htdocs/luci2/respond.min.js | 6 + luci2/luci2/htdocs/luci2/rpc.js | 188 + luci2/luci2/htdocs/luci2/session.js | 78 + luci2/luci2/htdocs/luci2/system.js | 82 + .../luci2/template/network.diagnostics.htm | 20 + .../htdocs/luci2/template/network.hosts.htm | 1 + .../luci2/template/network.interfaces.htm | 1 + .../htdocs/luci2/template/network.routes.htm | 1 + .../htdocs/luci2/template/network.switch.htm | 1 + .../luci2/template/network.wireless.htm | 1 + .../htdocs/luci2/template/status.dmesg.htm | 1 + .../htdocs/luci2/template/status.overview.htm | 10 + .../luci2/template/status.processes.htm | 1 + .../htdocs/luci2/template/status.routes.htm | 3 + .../htdocs/luci2/template/status.syslog.htm | 1 + .../htdocs/luci2/template/system.admin.htm | 1 + .../htdocs/luci2/template/system.cron.htm | 6 + .../htdocs/luci2/template/system.leds.htm | 1 + .../htdocs/luci2/template/system.software.htm | 71 + .../htdocs/luci2/template/system.startup.htm | 21 + .../htdocs/luci2/template/system.system.htm | 1 + .../htdocs/luci2/template/system.upgrade.htm | 51 + .../htdocs/luci2/template/system.users.htm | 1 + luci2/luci2/htdocs/luci2/uci.js | 532 + luci2/luci2/htdocs/luci2/ui.js | 1580 +++ .../htdocs/luci2/view/network.diagnostics.js | 90 + .../luci2/htdocs/luci2/view/network.hosts.js | 29 + .../htdocs/luci2/view/network.interfaces.js | 361 + .../luci2/htdocs/luci2/view/network.routes.js | 110 + .../luci2/htdocs/luci2/view/network.switch.js | 338 + .../htdocs/luci2/view/network.wireless.js | 89 + luci2/luci2/htdocs/luci2/view/status.dmesg.js | 20 + .../htdocs/luci2/view/status.overview.js | 427 + .../htdocs/luci2/view/status.processes.js | 80 + .../luci2/htdocs/luci2/view/status.routes.js | 99 + .../luci2/htdocs/luci2/view/status.syslog.js | 20 + luci2/luci2/htdocs/luci2/view/system.admin.js | 373 + luci2/luci2/htdocs/luci2/view/system.cron.js | 33 + luci2/luci2/htdocs/luci2/view/system.leds.js | 121 + .../htdocs/luci2/view/system.software.js | 361 + .../luci2/htdocs/luci2/view/system.startup.js | 103 + .../luci2/htdocs/luci2/view/system.system.js | 212 + .../luci2/htdocs/luci2/view/system.upgrade.js | 290 + luci2/luci2/htdocs/luci2/view/system.users.js | 317 + luci2/luci2/htdocs/luci2/wireless.js | 181 + luci2/luci2/htdocs/luci2/zoneinfo.json | 1 + luci2/luci2/share/acl.d/luci2.json | 361 + luci2/luci2/share/menu.d/network.json | 44 + luci2/luci2/share/menu.d/status.json | 36 + luci2/luci2/share/menu.d/system.json | 56 + luci2/luci2/src/CMakeLists.txt | 6 + luci2/luci2/src/io/CMakeLists.txt | 19 + luci2/luci2/src/io/main.c | 644 ++ luci2/luci2/src/io/multipart_parser.c | 309 + luci2/luci2/src/io/multipart_parser.h | 48 + luci2/luci2/src/rpcd/CMakeLists.txt | 26 + luci2/luci2/src/rpcd/bwmon.c | 283 + luci2/luci2/src/rpcd/luci2.c | 2906 +++++ 128 files changed, 33984 insertions(+) create mode 100644 luci2/luci2-p910nd/Makefile create mode 100644 luci2/luci2-p910nd/files/usr/share/rpcd/acl.d/services.p910nd.json create mode 100644 luci2/luci2-p910nd/files/usr/share/rpcd/menu.d/services.p910nd.json create mode 100644 luci2/luci2-p910nd/files/www/luci2/template/services.p910nd.htm create mode 100644 luci2/luci2-p910nd/files/www/luci2/view/services.p910nd.js create mode 100644 luci2/luci2/Makefile create mode 100644 luci2/luci2/htdocs/luci2.html create mode 100644 luci2/luci2/htdocs/luci2/bootstrap.js create mode 100644 luci2/luci2/htdocs/luci2/cbi.js create mode 100644 luci2/luci2/htdocs/luci2/css/bootstrap.css create mode 100644 luci2/luci2/htdocs/luci2/css/luci2.css create mode 100644 luci2/luci2/htdocs/luci2/firewall.js create mode 100644 luci2/luci2/htdocs/luci2/html5.js create mode 100644 luci2/luci2/htdocs/luci2/icons/bridge.png create mode 100644 luci2/luci2/htdocs/luci2/icons/bridge_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/add.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/apply.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/arrow.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/down.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/download.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/edit.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/fieldadd.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/file.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/find.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/folder.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/help.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/key.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/link.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/reload.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/remove.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/reset.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/save.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/up.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/cbi/user.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/encryption.png create mode 100644 luci2/luci2/htdocs/luci2/icons/encryption_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/ethernet.png create mode 100644 luci2/luci2/htdocs/luci2/icons/ethernet_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/loading.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/port_down.png create mode 100644 luci2/luci2/htdocs/luci2/icons/port_up.png create mode 100644 luci2/luci2/htdocs/luci2/icons/progress.gif create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-0-25.png create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-0.png create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-25-50.png create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-50-75.png create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-75-100.png create mode 100644 luci2/luci2/htdocs/luci2/icons/signal-none.png create mode 100644 luci2/luci2/htdocs/luci2/icons/switch.png create mode 100644 luci2/luci2/htdocs/luci2/icons/switch_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/tunnel.png create mode 100644 luci2/luci2/htdocs/luci2/icons/tunnel_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/vlan.png create mode 100644 luci2/luci2/htdocs/luci2/icons/vlan_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/wifi.png create mode 100644 luci2/luci2/htdocs/luci2/icons/wifi_big.png create mode 100644 luci2/luci2/htdocs/luci2/icons/wifi_big_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/icons/wifi_disabled.png create mode 100644 luci2/luci2/htdocs/luci2/jquery-1.9.1.js create mode 100644 luci2/luci2/htdocs/luci2/jquery.peity.js create mode 100644 luci2/luci2/htdocs/luci2/luci2.js create mode 100644 luci2/luci2/htdocs/luci2/network.js create mode 100644 luci2/luci2/htdocs/luci2/proto/6in4.js create mode 100644 luci2/luci2/htdocs/luci2/proto/6rd.js create mode 100644 luci2/luci2/htdocs/luci2/proto/6to4.js create mode 100644 luci2/luci2/htdocs/luci2/proto/dhcp.js create mode 100644 luci2/luci2/htdocs/luci2/proto/dhcpv6.js create mode 100644 luci2/luci2/htdocs/luci2/proto/dslite.js create mode 100644 luci2/luci2/htdocs/luci2/proto/none.js create mode 100644 luci2/luci2/htdocs/luci2/proto/static.js create mode 100644 luci2/luci2/htdocs/luci2/respond.min.js create mode 100644 luci2/luci2/htdocs/luci2/rpc.js create mode 100644 luci2/luci2/htdocs/luci2/session.js create mode 100644 luci2/luci2/htdocs/luci2/system.js create mode 100644 luci2/luci2/htdocs/luci2/template/network.diagnostics.htm create mode 100644 luci2/luci2/htdocs/luci2/template/network.hosts.htm create mode 100644 luci2/luci2/htdocs/luci2/template/network.interfaces.htm create mode 100644 luci2/luci2/htdocs/luci2/template/network.routes.htm create mode 100644 luci2/luci2/htdocs/luci2/template/network.switch.htm create mode 100644 luci2/luci2/htdocs/luci2/template/network.wireless.htm create mode 100644 luci2/luci2/htdocs/luci2/template/status.dmesg.htm create mode 100644 luci2/luci2/htdocs/luci2/template/status.overview.htm create mode 100644 luci2/luci2/htdocs/luci2/template/status.processes.htm create mode 100644 luci2/luci2/htdocs/luci2/template/status.routes.htm create mode 100644 luci2/luci2/htdocs/luci2/template/status.syslog.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.admin.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.cron.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.leds.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.software.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.startup.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.system.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.upgrade.htm create mode 100644 luci2/luci2/htdocs/luci2/template/system.users.htm create mode 100644 luci2/luci2/htdocs/luci2/uci.js create mode 100644 luci2/luci2/htdocs/luci2/ui.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.diagnostics.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.hosts.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.interfaces.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.routes.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.switch.js create mode 100644 luci2/luci2/htdocs/luci2/view/network.wireless.js create mode 100644 luci2/luci2/htdocs/luci2/view/status.dmesg.js create mode 100644 luci2/luci2/htdocs/luci2/view/status.overview.js create mode 100644 luci2/luci2/htdocs/luci2/view/status.processes.js create mode 100644 luci2/luci2/htdocs/luci2/view/status.routes.js create mode 100644 luci2/luci2/htdocs/luci2/view/status.syslog.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.admin.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.cron.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.leds.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.software.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.startup.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.system.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.upgrade.js create mode 100644 luci2/luci2/htdocs/luci2/view/system.users.js create mode 100644 luci2/luci2/htdocs/luci2/wireless.js create mode 100644 luci2/luci2/htdocs/luci2/zoneinfo.json create mode 100644 luci2/luci2/share/acl.d/luci2.json create mode 100644 luci2/luci2/share/menu.d/network.json create mode 100644 luci2/luci2/share/menu.d/status.json create mode 100644 luci2/luci2/share/menu.d/system.json create mode 100644 luci2/luci2/src/CMakeLists.txt create mode 100644 luci2/luci2/src/io/CMakeLists.txt create mode 100644 luci2/luci2/src/io/main.c create mode 100644 luci2/luci2/src/io/multipart_parser.c create mode 100644 luci2/luci2/src/io/multipart_parser.h create mode 100644 luci2/luci2/src/rpcd/CMakeLists.txt create mode 100644 luci2/luci2/src/rpcd/bwmon.c create mode 100644 luci2/luci2/src/rpcd/luci2.c diff --git a/luci2/luci2-p910nd/Makefile b/luci2/luci2-p910nd/Makefile new file mode 100644 index 000000000..50aeadceb --- /dev/null +++ b/luci2/luci2-p910nd/Makefile @@ -0,0 +1,36 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci2-p910nd +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/luci2-p910nd + SECTION:=luci2 + CATEGORY:=LuCI2 + TITLE:=LuCI2 p910nd module + DEPENDS:=luci2 p910nd +endef + +define Package/luci2-p910nd/description + LuCI2 module for p910nd printer daemon management +endef + +define Build/Compile +endef + +define Package/luci2-p910nd/install + $(INSTALL_DIR) $(1)/usr/share/rpcd/menu.d + $(INSTALL_DATA) ./files/usr/share/rpcd/menu.d/services.p910nd.json $(1)/usr/share/rpcd/menu.d/ + + $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d + $(INSTALL_DATA) ./files/usr/share/rpcd/acl.d/services.p910nd.json $(1)/usr/share/rpcd/acl.d/ + + $(INSTALL_DIR) $(1)/www/luci2/template + $(INSTALL_DATA) ./files/www/luci2/template/services.p910nd.htm $(1)/www/luci2/template + + $(INSTALL_DIR) $(1)/www/luci2/view + $(INSTALL_DATA) ./files/www/luci2/view/services.p910nd.js $(1)/www/luci2/view +endef + +$(eval $(call BuildPackage,luci2-p910nd)) diff --git a/luci2/luci2-p910nd/files/usr/share/rpcd/acl.d/services.p910nd.json b/luci2/luci2-p910nd/files/usr/share/rpcd/acl.d/services.p910nd.json new file mode 100644 index 000000000..dac817843 --- /dev/null +++ b/luci2/luci2-p910nd/files/usr/share/rpcd/acl.d/services.p910nd.json @@ -0,0 +1,15 @@ +{ + "p910nd": { + "description": "P910ND management", + "read": { + "uci": [ + "p910nd" + ] + }, + "write": { + "uci": [ + "p910nd" + ] + } + } +} \ No newline at end of file diff --git a/luci2/luci2-p910nd/files/usr/share/rpcd/menu.d/services.p910nd.json b/luci2/luci2-p910nd/files/usr/share/rpcd/menu.d/services.p910nd.json new file mode 100644 index 000000000..1522e198f --- /dev/null +++ b/luci2/luci2-p910nd/files/usr/share/rpcd/menu.d/services.p910nd.json @@ -0,0 +1,11 @@ +{ + "services": { + "title": "Services", + "index": 40 + }, + "services/p910nd": { + "title": "p910nd", + "acls": [ "p910nd" ], + "view": "services/p910nd" + } +} \ No newline at end of file diff --git a/luci2/luci2-p910nd/files/www/luci2/template/services.p910nd.htm b/luci2/luci2-p910nd/files/www/luci2/template/services.p910nd.htm new file mode 100644 index 000000000..ad19e7dab --- /dev/null +++ b/luci2/luci2-p910nd/files/www/luci2/template/services.p910nd.htm @@ -0,0 +1 @@ +
diff --git a/luci2/luci2-p910nd/files/www/luci2/view/services.p910nd.js b/luci2/luci2-p910nd/files/www/luci2/view/services.p910nd.js new file mode 100644 index 000000000..d024b24b5 --- /dev/null +++ b/luci2/luci2-p910nd/files/www/luci2/view/services.p910nd.js @@ -0,0 +1,61 @@ +L.ui.view.extend({ + PortValue: L.cbi.InputValue.extend({ + ucivalue: function(sid) + { + var v = this.callSuper('ucivalue', sid); + if (typeof v == 'undefined') + return ''; + + return 9100 + parseInt(v); + }, + + formvalue: function(sid) + { + var v = $('#' + this.id(sid)).val(); + + return parseInt(v) - 9100; + } + }), + + execute: function() { + var self = this; + + var m = new L.cbi.Map('p910nd', { + caption: L.tr('p910nd printer daemon') + }); + + var s = m.section(L.cbi.TypedSection, 'p910nd', { + caption: L.tr('Printers'), + addremove: true, + add_caption: L.tr('Add shared printer …'), + }); + + s.option(L.cbi.CheckboxValue, 'enabled', { + caption: L.tr('Enabled'), + initial: 0, + enabled: '1', + disabled: '0' + }); + + s.option(self.PortValue, 'port', { + caption: L.tr('Port'), + description: L.tr('Specifies the listening port'), + datatype: 'range(9100, 65535)' + }); + + s.option(L.cbi.InputValue, 'device', { + caption: L.tr('Device'), + description: L.tr('Printer device path in the filesystem') + }); + + s.option(L.cbi.CheckboxValue, 'bidirectional', { + caption: L.tr('Bidirectional'), + description: L.tr('Bidirectional copying'), + initial: 1, + enabled: '1', + disabled: '0' + }); + + return m.insertInto('#map'); + } +}); diff --git a/luci2/luci2/Makefile b/luci2/luci2/Makefile new file mode 100644 index 000000000..014077435 --- /dev/null +++ b/luci2/luci2/Makefile @@ -0,0 +1,62 @@ +# +# Copyright (C) 2013 Jo-Philipp Wich +# +# Licensed under the Apache License, Version 2.0. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci2 +PKG_VERSION:=$(shell git --git-dir=$(CURDIR)/../.git log -1 --pretty="%ci %h" | awk '{ print $$1 "-" $$4 }') +PKG_MAINTAINER:=Jo-Philipp Wich + +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:= + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Build/Prepare + $(INSTALL_DIR) $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ +endef + +define Package/luci2 + SECTION:=luci2 + CATEGORY:=LuCI2 + TITLE:=LuCI2 UI + DEPENDS:=+rpcd +rpcd-mod-iwinfo +uhttpd +uhttpd-mod-ubus +libubox +libubus +endef + +define Package/luci2/description + Provides the LuCI2 web interface with standard functionality. +endef + +define Package/luci2/install + $(INSTALL_DIR) $(1)/www + $(CP) ./htdocs/* $(1)/www/ + $(INSTALL_DIR) $(1)/usr/share/rpcd + $(CP) ./share/* $(1)/usr/share/rpcd/ + $(INSTALL_DIR) $(1)/usr/lib/rpcd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd/luci2.so $(1)/usr/lib/rpcd/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd/bwmon.so $(1)/usr/lib/rpcd/ + $(INSTALL_DIR) $(1)/usr/libexec $(1)/www/cgi-bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/io/luci2-io $(1)/usr/libexec/ + $(LN) /usr/libexec/luci2-io $(1)/www/cgi-bin/luci-upload + $(LN) /usr/libexec/luci2-io $(1)/www/cgi-bin/luci-backup +endef + +define Package/luci2/postinst +#!/bin/sh + +if [ "$$(uci -q get uhttpd.main.ubus_prefix)" != "/ubus" ]; then + uci set uhttpd.main.ubus_prefix="/ubus" + uci commit uhttpd +fi + +exit 0 +endef + +$(eval $(call BuildPackage,luci2)) diff --git a/luci2/luci2/htdocs/luci2.html b/luci2/luci2/htdocs/luci2.html new file mode 100644 index 000000000..47c74c7b8 --- /dev/null +++ b/luci2/luci2/htdocs/luci2.html @@ -0,0 +1,59 @@ + + + + LuCI2 + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + diff --git a/luci2/luci2/htdocs/luci2/bootstrap.js b/luci2/luci2/htdocs/luci2/bootstrap.js new file mode 100644 index 000000000..847ab8197 --- /dev/null +++ b/luci2/luci2/htdocs/luci2/bootstrap.js @@ -0,0 +1,1488 @@ +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d); + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + .prop('checked', !this.$element.hasClass('active')) + .trigger('change') + if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + } + + this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + $parent.trigger(e = $.Event('show.bs.dropdown')) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown') + + $this.focus() + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var $items = $('[role=menu] li:not(.divider):visible a', $parent) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index=0 + + $items.eq(index).focus() + } + + function clearMenus() { + $(backdrop).remove() + $(toggle).each(function (e) { + var $parent = getParent($(this)) + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown')) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown') + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('dropdown') + + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: modal.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#modals + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + this.$backdrop = + this.isShown = null + + if (this.options.remote) this.$element.load(this.options.remote) + } + + Modal.DEFAULTS = { + backdrop: true + , keyboard: true + , show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { + var that = this + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element.show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one($.support.transition.end, function () { + that.$element.focus().trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.focus().trigger(e) + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one($.support.transition.end, $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + this.$element.on('click.dismiss.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (callback) { + callback() + } + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + var old = $.fn.modal + + $.fn.modal = function (option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option, this) + .one('hide', function () { + $this.is(':visible') && $this.focus() + }) + }) + + $(document) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: tooltip.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.DEFAULTS = { + animation: true + , placement: 'top' + , selector: false + , template: '
' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.'+ this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + var $tip = this.tip() + + this.setContent() + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var $parent = this.$element.parent() + + var orgPlacement = placement + var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() + var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() + var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : + placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : + placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + this.$element.trigger('shown.bs.' + this.type) + } + } + + Tooltip.prototype.applyPlacement = function(offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + $tip + .offset(offset) + .addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight + } + + if (/bottom|top/.test(placement)) { + var delta = 0 + + if (offset.left < 0) { + delta = offset.left * -2 + offset.left = 0 + + $tip.offset(offset) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + + this.$element.trigger('hidden.bs.' + this.type) + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#popovers + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.arrow') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: tab.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tabs + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab' + , relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active + .one($.support.transition.end, next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: transition.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#transitions + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(window.jQuery); diff --git a/luci2/luci2/htdocs/luci2/cbi.js b/luci2/luci2/htdocs/luci2/cbi.js new file mode 100644 index 000000000..cdffb9171 --- /dev/null +++ b/luci2/luci2/htdocs/luci2/cbi.js @@ -0,0 +1,3329 @@ +(function() { + var type = function(f, l) + { + f.message = l; + return f; + }; + + var cbi_class = { + validation: { + i18n: function(msg) + { + L.cbi.validation.message = L.tr(msg); + }, + + compile: function(code) + { + var pos = 0; + var esc = false; + var depth = 0; + var types = L.cbi.validation.types; + var stack = [ ]; + + code += ','; + + for (var i = 0; i < code.length; i++) + { + if (esc) + { + esc = false; + continue; + } + + switch (code.charCodeAt(i)) + { + case 92: + esc = true; + break; + + case 40: + case 44: + if (depth <= 0) + { + if (pos < i) + { + var label = code.substring(pos, i); + label = label.replace(/\\(.)/g, '$1'); + label = label.replace(/^[ \t]+/g, ''); + label = label.replace(/[ \t]+$/g, ''); + + if (label && !isNaN(label)) + { + stack.push(parseFloat(label)); + } + else if (label.match(/^(['"]).*\1$/)) + { + stack.push(label.replace(/^(['"])(.*)\1$/, '$2')); + } + else if (typeof types[label] == 'function') + { + stack.push(types[label]); + stack.push([ ]); + } + else + { + throw "Syntax error, unhandled token '"+label+"'"; + } + } + pos = i+1; + } + depth += (code.charCodeAt(i) == 40); + break; + + case 41: + if (--depth <= 0) + { + if (typeof stack[stack.length-2] != 'function') + throw "Syntax error, argument list follows non-function"; + + stack[stack.length-1] = + L.cbi.validation.compile(code.substring(pos, i)); + + pos = i+1; + } + break; + } + } + + return stack; + } + } + }; + + var validation = cbi_class.validation; + + validation.types = { + 'integer': function() + { + if (this.match(/^-?[0-9]+$/) != null) + return true; + + validation.i18n('Must be a valid integer'); + return false; + }, + + 'uinteger': function() + { + if (validation.types['integer'].apply(this) && (this >= 0)) + return true; + + validation.i18n('Must be a positive integer'); + return false; + }, + + 'float': function() + { + if (!isNaN(parseFloat(this))) + return true; + + validation.i18n('Must be a valid number'); + return false; + }, + + 'ufloat': function() + { + if (validation.types['float'].apply(this) && (this >= 0)) + return true; + + validation.i18n('Must be a positive number'); + return false; + }, + + 'ipaddr': function() + { + if (L.parseIPv4(this) || L.parseIPv6(this)) + return true; + + validation.i18n('Must be a valid IP address'); + return false; + }, + + 'ip4addr': function() + { + if (L.parseIPv4(this)) + return true; + + validation.i18n('Must be a valid IPv4 address'); + return false; + }, + + 'ip6addr': function() + { + if (L.parseIPv6(this)) + return true; + + validation.i18n('Must be a valid IPv6 address'); + return false; + }, + + 'netmask4': function() + { + if (L.isNetmask(L.parseIPv4(this))) + return true; + + validation.i18n('Must be a valid IPv4 netmask'); + return false; + }, + + 'netmask6': function() + { + if (L.isNetmask(L.parseIPv6(this))) + return true; + + validation.i18n('Must be a valid IPv6 netmask6'); + return false; + }, + + 'cidr4': function() + { + if (this.match(/^([0-9.]+)\/(\d{1,2})$/)) + if (RegExp.$2 <= 32 && L.parseIPv4(RegExp.$1)) + return true; + + validation.i18n('Must be a valid IPv4 prefix'); + return false; + }, + + 'cidr6': function() + { + if (this.match(/^([a-fA-F0-9:.]+)\/(\d{1,3})$/)) + if (RegExp.$2 <= 128 && L.parseIPv6(RegExp.$1)) + return true; + + validation.i18n('Must be a valid IPv6 prefix'); + return false; + }, + + 'ipmask4': function() + { + if (this.match(/^([0-9.]+)\/([0-9.]+)$/)) + { + var addr = RegExp.$1, mask = RegExp.$2; + if (L.parseIPv4(addr) && L.isNetmask(L.parseIPv4(mask))) + return true; + } + + validation.i18n('Must be a valid IPv4 address/netmask pair'); + return false; + }, + + 'ipmask6': function() + { + if (this.match(/^([a-fA-F0-9:.]+)\/([a-fA-F0-9:.]+)$/)) + { + var addr = RegExp.$1, mask = RegExp.$2; + if (L.parseIPv6(addr) && L.isNetmask(L.parseIPv6(mask))) + return true; + } + + validation.i18n('Must be a valid IPv6 address/netmask pair'); + return false; + }, + + 'port': function() + { + if (validation.types['integer'].apply(this) && + (this >= 0) && (this <= 65535)) + return true; + + validation.i18n('Must be a valid port number'); + return false; + }, + + 'portrange': function() + { + if (this.match(/^(\d+)-(\d+)$/)) + { + var p1 = RegExp.$1; + var p2 = RegExp.$2; + + if (validation.types['port'].apply(p1) && + validation.types['port'].apply(p2) && + (parseInt(p1) <= parseInt(p2))) + return true; + } + else if (validation.types['port'].apply(this)) + { + return true; + } + + validation.i18n('Must be a valid port range'); + return false; + }, + + 'macaddr': function() + { + if (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null) + return true; + + validation.i18n('Must be a valid MAC address'); + return false; + }, + + 'host': function() + { + if (validation.types['hostname'].apply(this) || + validation.types['ipaddr'].apply(this)) + return true; + + validation.i18n('Must be a valid hostname or IP address'); + return false; + }, + + 'hostname': function() + { + if ((this.length <= 253) && + ((this.match(/^[a-zA-Z0-9]+$/) != null || + (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) && + this.match(/[^0-9.]/))))) + return true; + + validation.i18n('Must be a valid host name'); + return false; + }, + + 'network': function() + { + if (validation.types['uciname'].apply(this) || + validation.types['host'].apply(this)) + return true; + + validation.i18n('Must be a valid network name'); + return false; + }, + + 'wpakey': function() + { + var v = this; + + if ((v.length == 64) + ? (v.match(/^[a-fA-F0-9]{64}$/) != null) + : ((v.length >= 8) && (v.length <= 63))) + return true; + + validation.i18n('Must be a valid WPA key'); + return false; + }, + + 'wepkey': function() + { + var v = this; + + if (v.substr(0,2) == 's:') + v = v.substr(2); + + if (((v.length == 10) || (v.length == 26)) + ? (v.match(/^[a-fA-F0-9]{10,26}$/) != null) + : ((v.length == 5) || (v.length == 13))) + return true; + + validation.i18n('Must be a valid WEP key'); + return false; + }, + + 'uciname': function() + { + if (this.match(/^[a-zA-Z0-9_]+$/) != null) + return true; + + validation.i18n('Must be a valid UCI identifier'); + return false; + }, + + 'range': function(min, max) + { + var val = parseFloat(this); + + if (validation.types['integer'].apply(this) && + !isNaN(min) && !isNaN(max) && ((val >= min) && (val <= max))) + return true; + + validation.i18n('Must be a number between %d and %d'); + return false; + }, + + 'min': function(min) + { + var val = parseFloat(this); + + if (validation.types['integer'].apply(this) && + !isNaN(min) && !isNaN(val) && (val >= min)) + return true; + + validation.i18n('Must be a number greater or equal to %d'); + return false; + }, + + 'max': function(max) + { + var val = parseFloat(this); + + if (validation.types['integer'].apply(this) && + !isNaN(max) && !isNaN(val) && (val <= max)) + return true; + + validation.i18n('Must be a number lower or equal to %d'); + return false; + }, + + 'rangelength': function(min, max) + { + var val = '' + this; + + if (!isNaN(min) && !isNaN(max) && + (val.length >= min) && (val.length <= max)) + return true; + + if (min != max) + validation.i18n('Must be between %d and %d characters'); + else + validation.i18n('Must be %d characters'); + return false; + }, + + 'minlength': function(min) + { + var val = '' + this; + + if (!isNaN(min) && (val.length >= min)) + return true; + + validation.i18n('Must be at least %d characters'); + return false; + }, + + 'maxlength': function(max) + { + var val = '' + this; + + if (!isNaN(max) && (val.length <= max)) + return true; + + validation.i18n('Must be at most %d characters'); + return false; + }, + + 'or': function() + { + var msgs = [ ]; + + for (var i = 0; i < arguments.length; i += 2) + { + delete validation.message; + + if (typeof(arguments[i]) != 'function') + { + if (arguments[i] == this) + return true; + i--; + } + else if (arguments[i].apply(this, arguments[i+1])) + { + return true; + } + + if (validation.message) + msgs.push(validation.message.format.apply(validation.message, arguments[i+1])); + } + + validation.message = msgs.join( L.tr(' - or - ')); + return false; + }, + + 'and': function() + { + var msgs = [ ]; + + for (var i = 0; i < arguments.length; i += 2) + { + delete validation.message; + + if (typeof arguments[i] != 'function') + { + if (arguments[i] != this) + return false; + i--; + } + else if (!arguments[i].apply(this, arguments[i+1])) + { + return false; + } + + if (validation.message) + msgs.push(validation.message.format.apply(validation.message, arguments[i+1])); + } + + validation.message = msgs.join(', '); + return true; + }, + + 'neg': function() + { + return validation.types['or'].apply( + this.replace(/^[ \t]*![ \t]*/, ''), arguments); + }, + + 'list': function(subvalidator, subargs) + { + if (typeof subvalidator != 'function') + return false; + + var tokens = this.match(/[^ \t]+/g); + for (var i = 0; i < tokens.length; i++) + if (!subvalidator.apply(tokens[i], subargs)) + return false; + + return true; + }, + + 'phonedigit': function() + { + if (this.match(/^[0-9\*#!\.]+$/) != null) + return true; + + validation.i18n('Must be a valid phone number digit'); + return false; + }, + + 'string': function() + { + return true; + } + }; + + cbi_class.AbstractValue = L.ui.AbstractWidget.extend({ + init: function(name, options) + { + this.name = name; + this.instance = { }; + this.dependencies = [ ]; + this.rdependency = { }; + + this.options = L.defaults(options, { + placeholder: '', + datatype: 'string', + optional: false, + keep: true + }); + }, + + id: function(sid) + { + return this.ownerSection.id('field', sid || '__unknown__', this.name); + }, + + render: function(sid, condensed) + { + var i = this.instance[sid] = { }; + + i.top = $('
') + .addClass('luci2-field'); + + if (!condensed) + { + i.top.addClass('form-group'); + + if (typeof(this.options.caption) == 'string') + $('