sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #56 from sagidayan/UI

Browse source 
Ui - Create Task button reference to tasks/new
This commit is contained in:
Sagi Dayan 2015-06-22 20:35:24 +03:00
parent 4deeb3084f eb5391cb82
commit 71ef085662
4 changed files with 52 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/js/app.js
View file

@ -53,6 +53,10 @@ app.config(['$routeProvider', '$locationProvider',
.when('/tasks/new', { .when('/tasks/new', {
templateUrl: 'templates/views/newTask.html', templateUrl: 'templates/views/newTask.html',
controller: 'newTasksController' controller: 'newTasksController'
})
.when('/projects', {
templateUrl: 'templates/views/projects.html',
controller: 'projectsController'
}); });
} }
]); ]);

2
templates/js/controllers/mainController.js
View file

@ -48,7 +48,7 @@ angular.module('SeHub')
"title": "My Projects", "title": "My Projects",
"icon": "fa fa-cube", "icon": "fa fa-cube",
"style": "", "style": "",
"route": "/campuses" "route": "/projects"
}, { }, {
"title": "Tasks", "title": "Tasks",
"icon": "fa fa-clipboard", "icon": "fa fa-clipboard",

91
templates/views/home.html
View file

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

1
templates/views/index.html
View file

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