From e0465d430e610810737fc6010cf5d554db38d435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Schr=C3=B6der?= Date: Tue, 26 May 2015 09:39:34 +0200 Subject: [PATCH] Removed unnecessary stuff from final package --- luciexpress/Gruntfile.js | 6 +- luciexpress/Makefile | 7 +- .../plugins/core/widgets/luci.select.js | 93 ++++++++++++++++++ .../settings/pages/settings.upgrade.js | 9 +- .../img/activation/boxes/easybox-2.5.jpg | Bin 8255 -> 0 bytes .../img/activation/boxes/easybox-password.jpg | Bin 26862 -> 0 bytes .../vodafone/img/activation/boxes/mic.jpg | Bin 19528 -> 0 bytes .../img/activation/boxes/plugDSL-804.jpg | Bin 74866 -> 0 bytes .../img/activation/easybox-804-reskin-old.png | Bin 990 -> 0 bytes .../img/activation/easybox-804-reskin.png | Bin 2435 -> 0 bytes .../vodafone/img/buttons/button-add.png | Bin 1917 -> 0 bytes .../vodafone/img/buttons/button-delete.png | Bin 1911 -> 0 bytes .../vodafone/img/buttons/button-edit.png | Bin 1986 -> 0 bytes .../vodafone/img/buttons/button-left.png | Bin 2045 -> 0 bytes .../vodafone/img/buttons/button-reload.png | Bin 1917 -> 0 bytes .../vodafone/img/buttons/button-right.png | Bin 2050 -> 0 bytes .../vodafone/img/checkbox/check-white.png | Bin 1050 -> 0 bytes .../themes/vodafone/img/icons/arrow-down.png | Bin 1051 -> 0 bytes .../themes/vodafone/img/icons/arrow-up.png | Bin 1044 -> 0 bytes .../img/logo/easybox-804-reskin-old.png | Bin 1986 -> 0 bytes .../vodafone/img/logo/easybox-804-reskin.png | Bin 2649 -> 0 bytes .../themes/vodafone/img/overview/game.png | Bin 846 -> 0 bytes .../themes/vodafone/img/overview/game@2x.png | Bin 1395 -> 0 bytes .../img/overview/icon-small-arrow-up.png | Bin 1032 -> 0 bytes .../img/overview/icon-small-arrow.png | Bin 1034 -> 0 bytes .../themes/vodafone/img/overview/incoming.png | Bin 482 -> 0 bytes .../vodafone/img/overview/incomingl@2x.png | Bin 615 -> 0 bytes .../themes/vodafone/img/overview/laptop.png | Bin 465 -> 0 bytes .../vodafone/img/overview/laptop@2x.png | Bin 617 -> 0 bytes .../themes/vodafone/img/overview/map.jpg | Bin 111188 -> 0 bytes .../vodafone/img/overview/miseedcall@2x.png | Bin 477 -> 0 bytes .../vodafone/img/overview/missedcall.png | Bin 397 -> 0 bytes .../themes/vodafone/img/overview/network.png | Bin 368 -> 0 bytes .../vodafone/img/overview/network@2x.png | Bin 419 -> 0 bytes .../themes/vodafone/img/overview/outgoing.png | Bin 487 -> 0 bytes .../vodafone/img/overview/outgoing@2x.png | Bin 632 -> 0 bytes .../img/overview/overview-background-bot.jpg | Bin 68699 -> 0 bytes .../overview-background-top-left-vdsl.jpg | Bin 3886 -> 0 bytes .../themes/vodafone/img/overview/phone.png | Bin 829 -> 0 bytes .../themes/vodafone/img/overview/phone@2x.png | Bin 1308 -> 0 bytes .../themes/vodafone/img/overview/phone_U1.png | Bin 441 -> 0 bytes .../vodafone/img/overview/phone_U1@2x.png | Bin 1705 -> 0 bytes .../themes/vodafone/img/overview/phone_U2.png | Bin 1336 -> 0 bytes .../themes/vodafone/img/overview/schedule.png | Bin 589 -> 0 bytes .../vodafone/img/overview/schedule@2x.png | Bin 839 -> 0 bytes .../vodafone/img/overview/signal_full.png | Bin 309 -> 0 bytes .../vodafone/img/overview/signal_full@2x.png | Bin 509 -> 0 bytes .../vodafone/img/overview/smartphone.png | Bin 354 -> 0 bytes .../vodafone/img/overview/smartphone@2x.png | Bin 431 -> 0 bytes .../themes/vodafone/img/overview/tablet.png | Bin 343 -> 0 bytes .../vodafone/img/overview/tablet@2x.png | Bin 399 -> 0 bytes .../themes/vodafone/img/overview/tv.png | Bin 462 -> 0 bytes .../themes/vodafone/img/overview/tv@2x.png | Bin 569 -> 0 bytes .../vodafone/img/overview/vox-2.5-804.jpg | Bin 3956 -> 0 bytes .../themes/vodafone/img/overview/wifi.png | Bin 851 -> 0 bytes .../themes/vodafone/img/overview/wifi@2x.png | Bin 1411 -> 0 bytes .../themes/vodafone/img/overview/wps.png | Bin 866 -> 0 bytes .../themes/vodafone/img/overview/wps@2x.png | Bin 1560 -> 0 bytes 58 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 luciexpress/htdocs/plugins/core/widgets/luci.select.js delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/boxes/easybox-2.5.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/boxes/easybox-password.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/boxes/mic.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/boxes/plugDSL-804.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/easybox-804-reskin-old.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/activation/easybox-804-reskin.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-add.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-delete.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-edit.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-left.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-reload.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/buttons/button-right.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/checkbox/check-white.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/icons/arrow-down.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/icons/arrow-up.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/logo/easybox-804-reskin-old.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/logo/easybox-804-reskin.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/game.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/game@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/icon-small-arrow-up.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/icon-small-arrow.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/incoming.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/incomingl@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/laptop.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/laptop@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/map.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/miseedcall@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/missedcall.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/network.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/network@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/outgoing.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/outgoing@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/overview-background-bot.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/overview-background-top-left-vdsl.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/phone.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/phone@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/phone_U1.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/phone_U1@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/phone_U2.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/schedule.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/schedule@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/signal_full.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/signal_full@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/smartphone.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/smartphone@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/tablet.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/tablet@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/tv.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/tv@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/vox-2.5-804.jpg delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/wifi.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/wifi@2x.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/wps.png delete mode 100644 luciexpress/htdocs/themes/vodafone/img/overview/wps@2x.png diff --git a/luciexpress/Gruntfile.js b/luciexpress/Gruntfile.js index 121db88a2..6cb275038 100644 --- a/luciexpress/Gruntfile.js +++ b/luciexpress/Gruntfile.js @@ -97,6 +97,7 @@ module.exports = function(grunt){ console.log(files); }); grunt.registerTask("compile", "Compile all files into a single file", function(){ + var OUTDIR = "bin/"; var libfiles = [ "htdocs/lib/js/async.js", "htdocs/lib/js/js-schema.min.js", @@ -161,9 +162,10 @@ module.exports = function(grunt){ pluginfiles.map(function(name){ plugins[name.replace(/^htdocs\//, "")] = JSON.parse(String(fs.readFileSync(name))); }); - fs.writeFileSync("htdocs/__all.css", css); + if(!fs.existsSync(OUTDIR)) fs.mkdirSync(OUTDIR); + fs.writeFileSync(OUTDIR+"__all.css", css); // TODO: really do not do it in memory! - fs.writeFileSync("htdocs/__all.js", + fs.writeFileSync(OUTDIR+"__all.js", //uglifyjs.minify( "var JUCI_COMPILED = 1; var JUCI_TEMPLATES = "+ JSON.stringify(templates)+";"+ diff --git a/luciexpress/Makefile b/luciexpress/Makefile index b75217fe2..0d572438f 100644 --- a/luciexpress/Makefile +++ b/luciexpress/Makefile @@ -43,7 +43,12 @@ define Package/luciexpress/install npm install grunt compile $(INSTALL_DIR) $(1)/www - $(CP) ./htdocs/* $(1)/www/ + $(CP) ./bin/* $(1)/www/ + $(CP) ./htdocs/index.html $(1)/www/ + $(CP) ./htdocs/config.json $(1)/www/ + $(INSTALL_DIR) $(1)/www/themes/vodafone/ + $(CP) ./htdocs/themes/vodafone/img $(1)/www/themes/vodafone/ + $(CP) ./htdocs/themes/vodafone/fonts $(1)/www/themes/vodafone/ $(INSTALL_DIR) $(1)/usr/share/rpcd $(CP) ./share/* $(1)/usr/share/rpcd/ ./install_menus.sh $(1) diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.select.js b/luciexpress/htdocs/plugins/core/widgets/luci.select.js new file mode 100644 index 000000000..410e54196 --- /dev/null +++ b/luciexpress/htdocs/plugins/core/widgets/luci.select.js @@ -0,0 +1,93 @@ +$juci.module("core") +.directive('luciSelect', function ($compile) { + return { + restrict: 'E', + scope: { + selectedItem: '=ngModel', + items: '=ngItems', + onChange: '&onChange', + placeholder: '@placeholder', + prefix: "@", + size: '=size' + }, + link: function (scope, element, attrs) { + var html = ''; + switch (attrs.type) { + case "dropdown": + html += '