From dae9fee0a4c8556f70ba225e337039f1cf80002e Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Mon, 22 Jun 2015 13:14:06 +0300 Subject: [PATCH 1/3] -DashBoard pattern and messages - fixed -Project evaluation pattern - added --- templates/css/theme.css | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/css/theme.css b/templates/css/theme.css index 092a58a..ef181e3 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -382,6 +382,7 @@ body.noscroll .projectExhibit { + padding-left: 4px; padding-right: 4px; margin: 5px; From e7e34bcbbd24d239bcb40353e5bad9a254b6c4a7 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Mon, 22 Jun 2015 14:23:03 +0300 Subject: [PATCH 2/3] - Create Task button reference to tasks/new --- templates/css/theme.css | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/css/theme.css b/templates/css/theme.css index ef181e3..092a58a 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -382,7 +382,6 @@ body.noscroll .projectExhibit { - padding-left: 4px; padding-right: 4px; margin: 5px; From eb5391cb8260fef7eba55eda0e0bcdf0b8c171ff Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Mon, 22 Jun 2015 14:45:50 +0300 Subject: [PATCH 3/3] - Projects controller and page - added - project zoom and open in another page - added --- templates/js/app.js | 4 + templates/js/controllers/mainController.js | 2 +- templates/views/home.html | 91 +++++++++++----------- templates/views/index.html | 1 + 4 files changed, 52 insertions(+), 46 deletions(-) diff --git a/templates/js/app.js b/templates/js/app.js index d0cf73f..9ee231c 100644 --- a/templates/js/app.js +++ b/templates/js/app.js @@ -53,6 +53,10 @@ app.config(['$routeProvider', '$locationProvider', .when('/tasks/new', { templateUrl: 'templates/views/newTask.html', controller: 'newTasksController' + }) + .when('/projects', { + templateUrl: 'templates/views/projects.html', + controller: 'projectsController' }); } ]); diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js index 8d6e5ba..f2e7e1e 100644 --- a/templates/js/controllers/mainController.js +++ b/templates/js/controllers/mainController.js @@ -48,7 +48,7 @@ angular.module('SeHub') "title": "My Projects", "icon": "fa fa-cube", "style": "", - "route": "/campuses" + "route": "/projects" }, { "title": "Tasks", "icon": "fa fa-clipboard", diff --git a/templates/views/home.html b/templates/views/home.html index 53e6fd5..8f8902f 100644 --- a/templates/views/home.html +++ b/templates/views/home.html @@ -112,55 +112,56 @@
- - a - a - a - - - s - s - s - - - d - d - d - + + + Press On Me + + + + + Press On Me + + + + + + Press On Me + +
- - e - e - e - - - q - q - q - - - w - w - w - + + + Press On Me + + + + + Press On Me + + + + + Press On Me + +
- - b - b - b - - - r - r - r - - - x - x - x - + + + Press On Me + + + + + Press On Me + + + + + Press On Me + +
diff --git a/templates/views/index.html b/templates/views/index.html index af10388..33fae89 100644 --- a/templates/views/index.html +++ b/templates/views/index.html @@ -103,6 +103,7 @@ + \ No newline at end of file