Merge pull request #56 from sagidayan/UI

Ui - Create Task button reference to tasks/new
This commit is contained in:
Sagi Dayan 2015-06-22 20:35:24 +03:00
commit 71ef085662
4 changed files with 52 additions and 46 deletions

View file

@ -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'
});
}
]);

View file

@ -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",

View file

@ -112,55 +112,56 @@
</md-select>
<div layout = "column" layout-margin layout-padding>
<div layout="row">
<md-card flex class = "projectExhibit">
a
a
a
</md-card>
<md-card flex class = "projectExhibit">
s
s
s
</md-card>
<md-card flex class = "projectExhibit">
d
d
d
</md-card>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit" >
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
</div>
<div layout="row">
<md-card flex class = "projectExhibit">
e
e
e
</md-card>
<md-card flex class = "projectExhibit">
q
q
q
</md-card>
<md-card flex class = "projectExhibit">
w
w
w
</md-card>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
</div>
<div layout="row">
<md-card flex class = "projectExhibit">
b
b
b
</md-card>
<md-card flex class = "projectExhibit">
r
r
r
</md-card>
<md-card flex class = "projectExhibit">
x
x
x
</md-card>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
<a href="http://localhost:8080/home#/projects/">
<md-card flex class = "projectExhibit">
Press On Me
</md-card>
</a>
</div>
</div>
</md-content>

View file

@ -103,6 +103,7 @@
<script src="templates/js/controllers/tasksController.js"></script>
<script src="templates/js/controllers/myClassesController.js"></script>
<script src="templates/js/controllers/newTasksController.js"></script>
<script src="templates/js/controllers/projectsController.js"></script>
</body>
</html>