- -

- + +

diff --git a/client/partials/favicon.html b/client/partials/favicon.html index e69de29..66df6d0 100644 --- a/client/partials/favicon.html +++ b/client/partials/favicon.html @@ -0,0 +1,3 @@ + +

+ \ No newline at end of file -- cgit v1.2.3 From 05b0ac955170fd8708bf4d72bc6dedd024156f5f Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sat, 23 Jan 2016 18:12:18 +0100 Subject: Change grid --- client/index.php | 35 ++++++++++++++++++--------- client/partials/header.html | 1 - client/partials/menu.html | 7 ++++++ client/partials/nav.html | 59 +++++++++++++++++++++++++++++++++++++++------ 4 files changed, 83 insertions(+), 19 deletions(-) delete mode 100644 client/partials/header.html create mode 100644 client/partials/menu.html (limited to 'client/partials') diff --git a/client/index.php b/client/index.php index f52eaa2..a32c5d2 100644 --- a/client/index.php +++ b/client/index.php @@ -26,25 +26,38 @@

+ +

- - + +

+ +

MAIN CONTENT !

Content test

+ Main content test +

diff --git a/client/partials/header.html b/client/partials/header.html deleted file mode 100644 index 900a6f1..0000000 --- a/client/partials/header.html +++ /dev/null @@ -1 +0,0 @@ -

Header Content

\ No newline at end of file diff --git a/client/partials/menu.html b/client/partials/menu.html new file mode 100644 index 0000000..04f4f68 --- /dev/null +++ b/client/partials/menu.html @@ -0,0 +1,7 @@ +

+ + + + + +

\ No newline at end of file diff --git a/client/partials/nav.html b/client/partials/nav.html index 8211f2d..866302d 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -1,8 +1,53 @@ -

- - - - - +

+ \ No newline at end of file -- cgit v1.2.3 From 20f7f555f9061d3395d0be36d201382f7a61f5c4 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 24 Jan 2016 10:41:29 +0100 Subject: Change grid --- client/index.php | 68 +++++++++++++++++++------------------------- client/partials/favicon.html | 2 +- 2 files changed, 30 insertions(+), 40 deletions(-) (limited to 'client/partials') diff --git a/client/index.php b/client/index.php index a32c5d2..6ce050c 100644 --- a/client/index.php +++ b/client/index.php @@ -18,61 +18,51 @@ - - - - - +

- +

- - -

- -

- - -

- - - - -

- - +

Content test

- Main content test -

+ +

+ + +

+ Content test +

+ Main content test +

- - - - - - diff --git a/client/partials/favicon.html b/client/partials/favicon.html index 66df6d0..d49c651 100644 --- a/client/partials/favicon.html +++ b/client/partials/favicon.html @@ -1,3 +1,3 @@

- \ No newline at end of file + -- cgit v1.2.3 From 96a85567552f1555f9c46990610f8e387a4e9d7a Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 24 Jan 2016 11:29:36 +0100 Subject: Edit interface --- client/partials/menu.html | 7 ++----- client/partials/nav.html | 41 ++++++++++++++--------------------------- 2 files changed, 16 insertions(+), 32 deletions(-) (limited to 'client/partials') diff --git a/client/partials/menu.html b/client/partials/menu.html index 04f4f68..cb3cb6a 100644 --- a/client/partials/menu.html +++ b/client/partials/menu.html @@ -1,7 +1,4 @@

- - - - - + +

\ No newline at end of file diff --git a/client/partials/nav.html b/client/partials/nav.html index 866302d..5664b38 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -8,43 +8,30 @@ - +

+ +

+ - + -- cgit v1.2.3 From a059014b1bb87fe18f3079c4ab1dfefc728a0e34 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 24 Jan 2016 15:10:13 +0100 Subject: Edit controller --- client/index.php | 12 +++++++----- client/js/controllers/main.js | 10 ++++++++++ client/js/controllers/mainApp.js | 10 ---------- client/js/controllers/status.js | 12 ++++++++++++ client/partials/nav.html | 6 +++--- 5 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 client/js/controllers/main.js delete mode 100644 client/js/controllers/mainApp.js create mode 100644 client/js/controllers/status.js (limited to 'client/partials') diff --git a/client/index.php b/client/index.php index 8c29a9b..fa53c19 100644 --- a/client/index.php +++ b/client/index.php @@ -17,11 +17,11 @@ - +

@@ -39,13 +39,13 @@

- Content test + {{ test }}

Main Content @@ -70,7 +70,9 @@ - + + + \ No newline at end of file diff --git a/client/js/controllers/main.js b/client/js/controllers/main.js new file mode 100644 index 0000000..78d5849 --- /dev/null +++ b/client/js/controllers/main.js @@ -0,0 +1,10 @@ +/* + * mainApp Controller + */ + + + +mainApp.controller('mainCtrl', function ($scope) +{ + $scope.test="Test title"; +}); \ No newline at end of file diff --git a/client/js/controllers/mainApp.js b/client/js/controllers/mainApp.js deleted file mode 100644 index 6ff39a9..0000000 --- a/client/js/controllers/mainApp.js +++ /dev/null @@ -1,10 +0,0 @@ -/* - * mainApp Controller - */ - - - -mainApp.controller('mainAppCtrl', function ($scope) -{ - // TODO -}); \ No newline at end of file diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js new file mode 100644 index 0000000..3534912 --- /dev/null +++ b/client/js/controllers/status.js @@ -0,0 +1,12 @@ +/* + * mainApp Controller + */ + + + +mainApp.controller('statusCtrl', function ($scope) +{ + $scope.username="User 1"; + $scope.connection="Online"; + $scope.lastconnection="1 Septembre"; +}); \ No newline at end of file diff --git a/client/partials/nav.html b/client/partials/nav.html index 5664b38..a765daa 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -18,9 +18,9 @@ -- cgit v1.2.3 From 5466ce78f00038e742ef2a108c755f57ede451f5 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 24 Jan 2016 19:19:32 +0100 Subject: Add angular-route --- client/index.php | 19 +- client/js/app.js | 17 +- client/js/controllers/home.js | 10 + client/js/controllers/main.js | 10 - client/js/controllers/network.js | 10 + client/partials/home.html | 9 + client/partials/menu.html | 4 +- client/partials/network.html | 9 + client/vendors/angularjs/angular-route.js | 1008 +++++++++++++++++++++++++++++ 9 files changed, 1071 insertions(+), 25 deletions(-) create mode 100644 client/js/controllers/home.js delete mode 100644 client/js/controllers/main.js create mode 100644 client/js/controllers/network.js create mode 100644 client/partials/home.html create mode 100644 client/partials/network.html create mode 100644 client/vendors/angularjs/angular-route.js (limited to 'client/partials') diff --git a/client/index.php b/client/index.php index fa53c19..0c02623 100644 --- a/client/index.php +++ b/client/index.php @@ -39,20 +39,13 @@

- {{ test }} -

- Main Content -

@@ -69,8 +62,10 @@ + - + + diff --git a/client/js/app.js b/client/js/app.js index 63ecfef..7fedb32 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -1,3 +1,18 @@ // Declare main app -var mainApp=angular.module("mainApp",[]); \ No newline at end of file +var mainApp=angular.module("mainApp",['ngRoute']); + + +mainApp.config(['$routeProvider', function($routeProvider){ + $routeProvider. + when('/home',{ + templateUrl: 'partials/home.html', + controller: 'homeCtrl' + }). + when('/network',{ + templateUrl: 'partials/network.html', + controller: 'networkCtrl' + }).otherwise({ + redirectTo: '/home' + }); +}]); \ No newline at end of file diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js new file mode 100644 index 0000000..d4e1b0e --- /dev/null +++ b/client/js/controllers/home.js @@ -0,0 +1,10 @@ +/* + * home Controller + */ + + + +mainApp.controller('homeCtrl', function ($scope) +{ + $scope.test="Home view"; +}); \ No newline at end of file diff --git a/client/js/controllers/main.js b/client/js/controllers/main.js deleted file mode 100644 index 78d5849..0000000 --- a/client/js/controllers/main.js +++ /dev/null @@ -1,10 +0,0 @@ -/* - * mainApp Controller - */ - - - -mainApp.controller('mainCtrl', function ($scope) -{ - $scope.test="Test title"; -}); \ No newline at end of file diff --git a/client/js/controllers/network.js b/client/js/controllers/network.js new file mode 100644 index 0000000..c2a9794 --- /dev/null +++ b/client/js/controllers/network.js @@ -0,0 +1,10 @@ +/* + * network Controller + */ + + + +mainApp.controller('networkCtrl', function ($scope) +{ + $scope.test="Network View"; +}); \ No newline at end of file diff --git a/client/partials/home.html b/client/partials/home.html new file mode 100644 index 0000000..b00113a --- /dev/null +++ b/client/partials/home.html @@ -0,0 +1,9 @@ +

+ {{ test }} +

+ Main Content +

\ No newline at end of file diff --git a/client/partials/menu.html b/client/partials/menu.html index cb3cb6a..dfd5842 100644 --- a/client/partials/menu.html +++ b/client/partials/menu.html @@ -1,4 +1,4 @@

- - + Home + Network

\ No newline at end of file diff --git a/client/partials/network.html b/client/partials/network.html new file mode 100644 index 0000000..a520a88 --- /dev/null +++ b/client/partials/network.html @@ -0,0 +1,9 @@ +

+ {{ test }} +

+ Main Content +

diff --git a/client/vendors/angularjs/angular-route.js b/client/vendors/angularjs/angular-route.js new file mode 100644 index 0000000..c340d0f --- /dev/null +++ b/client/vendors/angularjs/angular-route.js @@ -0,0 +1,1008 @@ +/** + * @license AngularJS v1.5.0-rc.1 + * (c) 2010-2016 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/** + * @ngdoc module + * @name ngRoute + * @description + * + * # ngRoute + * + * The `ngRoute` module provides routing and deeplinking services and directives for angular apps. + * + * ## Example + * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. + * + * + *

+ */ + /* global -ngRouteModule */ +var ngRouteModule = angular.module('ngRoute', ['ng']). + provider('$route', $RouteProvider), + $routeMinErr = angular.$$minErr('ngRoute'); + +/** + * @ngdoc provider + * @name $routeProvider + * + * @description + * + * Used for configuring routes. + * + * ## Example + * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. + * + * ## Dependencies + * Requires the {@link ngRoute `ngRoute`} module to be installed. + */ +function $RouteProvider() { + function inherit(parent, extra) { + return angular.extend(Object.create(parent), extra); + } + + var routes = {}; + + /** + * @ngdoc method + * @name $routeProvider#when + * + * @param {string} path Route path (matched against `$location.path`). If `$location.path` + * contains redundant trailing slash or is missing one, the route will still match and the + * `$location.path` will be updated to add or drop the trailing slash to exactly match the + * route definition. + * + * * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up + * to the next slash are matched and stored in `$routeParams` under the given `name` + * when the route matches. + * * `path` can contain named groups starting with a colon and ending with a star: + * e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name` + * when the route matches. + * * `path` can contain optional named groups with a question mark: e.g.`:name?`. + * + * For example, routes like `/color/:color/largecode/:largecode*\/edit` will match + * `/color/brown/largecode/code/with/slashes/edit` and extract: + * + * * `color: brown` + * * `largecode: code/with/slashes`. + * + * + * @param {Object} route Mapping information to be assigned to `$route.current` on route + * match. + * + * Object properties: + * + * - `controller` – `{(string|function()=}` – Controller fn that should be associated with + * newly created scope or the name of a {@link angular.Module#controller registered + * controller} if passed as a string. + * - `controllerAs` – `{string=}` – An identifier name for a reference to the controller. + * If present, the controller will be published to scope under the `controllerAs` name. + * - `template` – `{string=|function()=}` – html template as a string or a function that + * returns an html template as a string which should be used by {@link + * ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives. + * This property takes precedence over `templateUrl`. + * + * If `template` is a function, it will be called with the following parameters: + * + * - `{Array.