From aa59829ca370b1e90c80c975d0790b43dcc799db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Thu, 28 May 2015 10:40:13 +0200
Subject: [PATCH] Moved files to their right places

---
 luciexpress/Gruntfile.js                      |  5 +-
 luciexpress/htdocs/css/checkbox.css           | 14 -----
 luciexpress/htdocs/css/menu.css               | 63 -------------------
 luciexpress/htdocs/css/radio.css              | 14 -----
 .../plugins/phone/pages/phone.call_log.js     |  2 +-
 luciexpress/server.js                         |  2 +-
 6 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 luciexpress/htdocs/css/checkbox.css
 delete mode 100644 luciexpress/htdocs/css/menu.css
 delete mode 100644 luciexpress/htdocs/css/radio.css

diff --git a/luciexpress/Gruntfile.js b/luciexpress/Gruntfile.js
index eeb80579f..f4f687eaa 100644
--- a/luciexpress/Gruntfile.js
+++ b/luciexpress/Gruntfile.js
@@ -142,13 +142,12 @@ module.exports = function(grunt){
 			"htdocs/lib/css/awesome-bootstrap-checkbox.css",
 			"htdocs/css/nga.min.css",
 			"htdocs/css/app.css",
-            "htdocs/css/radio.css",
-            "htdocs/css/checkbox.css",
-            "htdocs/css/menu.css",
 			"htdocs/themes/vodafone/css/theme.css",
 			"htdocs/themes/vodafone/css/bootstrap.min.css"
 		]; 
 		
+		cssfiles = cssfiles.concat(grunt.file.expand(["htdocs/plugins/**/css/*.css"])); 
+		
 		var pluginfiles = grunt.file.expand(["htdocs/plugins/**/plugin.json"]); 
 		var otherfiles = grunt.file.expand(["./htdocs/plugins/**/*.js", "./htdocs/themes/vodafone/**/*.js"]).filter(function(x){
 			return !x.match(/.*\/test-.*\.js/) && !x.match(/.*\.test\.js/); 
diff --git a/luciexpress/htdocs/css/checkbox.css b/luciexpress/htdocs/css/checkbox.css
deleted file mode 100644
index 0f8edbfe5..000000000
--- a/luciexpress/htdocs/css/checkbox.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.checkbox-info input[type="checkbox"] {
-    cursor: pointer; 
-}
-.checkbox-info input[type="checkbox"]:checked + label::before {
-    background-color: #64bd63;
-    border-color: #808080;
-}
-.checkbox-info input[type="checkbox"]:checked + label::after {
-    color: #fff;
-}
-.checkbox-small {
-    margin-top: 0px !important;
-    margin-bottom: 0px !important;
-}
diff --git a/luciexpress/htdocs/css/menu.css b/luciexpress/htdocs/css/menu.css
deleted file mode 100644
index 0db98952d..000000000
--- a/luciexpress/htdocs/css/menu.css
+++ /dev/null
@@ -1,63 +0,0 @@
-ul.left-menu {
-    list-style-type: none;
-    padding: 0;
-    margin: 0 20px 0 -10px;
-}
-
-ul.left-menu li {
-    padding: 0;
-    margin: 0;
-    background: none repeat scroll 0 0 transparent;
-    border: 0 none;
-    font-family: Arial,sans-serif;
-    font-size: 16px;
-    outline: 0 none;
-    vertical-align: middle;
-}
-
-ul.left-menu a {
-    margin: 0;
-    display: block;
-    border-bottom: 1px solid #ccc;
-    height: 50px;
-    line-height: 50px;
-    padding-left: 20px;
-    text-decoration: none;
-    font-size: 100%;
-}
-
-ul.left-menu a.collapsed {
-    border-bottom: none;
-}
-
-ul.left-menu a:hover,
-ul.left-menu a:visited,
-ul.left-menu a:active{
-    text-decoration: none;
-    cursor: pointer;
-    color: #444;
-}
-
-ul.left-menu li a.open {
-    color: #e60000;
-    font-weight: bold;
-}
-
-ul.left-sub-menu {
-    list-style-type: none;
-    padding: 0;
-    margin: -10px 0 10px 20px;
-}
-
-ul.left-sub-menu li {
-    padding: 0;
-    margin: 0;
-    background: none repeat scroll 0 0 transparent;
-    border: 0 none;
-    font-family: Arial,sans-serif;
-    font-size: 16px;
-    outline: 0 none;
-    vertical-align: middle;
-}
-
-
diff --git a/luciexpress/htdocs/css/radio.css b/luciexpress/htdocs/css/radio.css
deleted file mode 100644
index 49190a8e4..000000000
--- a/luciexpress/htdocs/css/radio.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.radio-info input[type="radio"] {
-	cursor: pointer; 
-}
-
-.radio-info input[type="radio"] + label::after {
-    background-color: #64bd63;
-}
-.radio-info input[type="radio"]:checked + label::before {
-    border-color: #808080;
-}
-.radio-info input[type="radio"]:checked + label::after {
-    background-color: #64bd63;
-}
-
diff --git a/luciexpress/htdocs/plugins/phone/pages/phone.call_log.js b/luciexpress/htdocs/plugins/phone/pages/phone.call_log.js
index 129486f3e..6c947aa24 100644
--- a/luciexpress/htdocs/plugins/phone/pages/phone.call_log.js
+++ b/luciexpress/htdocs/plugins/phone/pages/phone.call_log.js
@@ -1,6 +1,6 @@
 //! Author: Martin K. Schröder <mkschreder.uk@gmail.com>
  
-$juci.module("phone")
+JUCI.app
 .controller("PhoneCallLogPageCtrl", function($scope, $uci, gettext, $tr, $rpc){ 
 	$scope.phoneFilter = ""; 
 	$scope.phoneFilterSelected = {}; 
diff --git a/luciexpress/server.js b/luciexpress/server.js
index 5d93ab633..9527703a3 100644
--- a/luciexpress/server.js
+++ b/luciexpress/server.js
@@ -7,7 +7,7 @@ var request = require("request");
 var bodyParser = require('body-parser')
 
 var config = {
-	ubus_uri: "http://192.168.1.4/ubus" // <-- your router uri
+	ubus_uri: "http://192.168.1.1/ubus" // <-- your router uri
 }; 
 
 app.use( bodyParser.json() );       // to support JSON-encoded bodies