- tasks.html added

- tasksController added

- app.js updated when '/tasks'

- mainController updated '/tasks'
This commit is contained in:
Matan Bar Yosef 2015-06-18 23:21:09 +03:00
parent a2b763e00d
commit 94cf0447e4
4 changed files with 57 additions and 23 deletions

View file

@ -86,7 +86,7 @@ body.noscroll
position:center; position:center;
width: 80px; width: 80px;
height: 80px; height: 80px;
margin: 6px; /*centers the image in the parent element */ margin: 6px;
-webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
@ -144,11 +144,6 @@ body.noscroll
margin-bottom: 10px; margin-bottom: 10px;
} }
.md-avatar img
{
/*TODO*/
}
.feed .feed
{ {
overflow-y: scroll; overflow-y: scroll;
@ -156,7 +151,7 @@ body.noscroll
/*width: 100%;*/ /*width: 100%;*/
} }
.feedMessages /*.feedMessages
{ {
overflow: scroll; overflow: scroll;
height: 300px; height: 300px;
@ -174,7 +169,7 @@ body.noscroll
padding-left: 6%; padding-left: 6%;
font-size: 15px; font-size: 15px;
display:table; display:table;
} }*/
.md-no-sticky .md-no-sticky
{ {
@ -262,7 +257,6 @@ body.noscroll
-moz-border-radius: 100px; -moz-border-radius: 100px;
border-radius: 50px; border-radius: 50px;
width: 30%; width: 30%;
/*top: -40px;*/
position: relative; position: relative;
z-index: 50; z-index: 50;
} }
@ -355,14 +349,15 @@ body.noscroll
box-sizing: content-box; box-sizing: content-box;
} }
/*gridList Effects*/ /*gridList Effects*/
md-grid-list { md-grid-list
margin: 8px; } {
.gray{ margin: 8px;
}
.gray
{
background:#f5f5f5; background:#f5f5f5;
} }
.aliceblue { .aliceblue {
@ -383,24 +378,37 @@ md-grid-list {
.red { .red {
background: #ff8a80; background: #ff8a80;
} }
md-grid-tile {
transition: all 400ms ease-out 50ms; .whiteframedemoBasicUsage md-whiteframe {
background: #fff;
margin: 20px;
padding: 20px;
} }
/* md-grid-tile {
transition: all 400ms ease-out 50ms;
}*/
/*END gridList Effects*/ /*END gridList Effects*/
.tasksContent
{
/*float:left;*/
}
/* md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
font-size: inherit; font-size: inherit;
height: inherit; height: inherit;
text-align: left; text-align: left;
text-transform: none; text-transform: none;
width: 100%; width: 300px;
white-space: normal; white-space: normal;
} }
md-list-item, md-list-item .md-list-item-inner { /*md-list-item, md-list-item .md-list-item-inner {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;

View file

@ -41,8 +41,11 @@ app.config(['$routeProvider', '$locationProvider',
.when('/Settings', { .when('/Settings', {
templateUrl: 'templates/views/settings.html', templateUrl: 'templates/views/settings.html',
controller: 'settingsController' controller: 'settingsController'
})
.when('/tasks', {
templateUrl: 'templates/views/tasks.html',
controller: 'tasksController'
}); });
} }
]); ]);

View file

@ -53,7 +53,7 @@ angular.module('SeHub')
"title": "Tasks", "title": "Tasks",
"icon": "fa fa-clipboard", "icon": "fa fa-clipboard",
"style": "", "style": "",
"route": "/campuses" "route": "/tasks"
}, { }, {
"title": "Settings", "title": "Settings",
"icon": "fa fa-cogs", "icon": "fa fa-cogs",

View file

@ -22,6 +22,7 @@
</div> </div>
</md-card> </md-card>
</md-content> </md-content>
<md-content layout-padding> <md-content layout-padding>
<md-card> <md-card>
<div class = "feed"> <div class = "feed">
@ -34,17 +35,39 @@
<md-grid-tile-header> <md-grid-tile-header>
<h3>Messages</h3> <h3>Messages</h3>
</md-grid-tile-header> </md-grid-tile-header>
<!-- Enter Wanted MESSAGES Text Here --> In The Future Will Enter Wanted MESSAGES Text Here
</md-grid-tile> </md-grid-tile>
<md-grid-tile class="gray" <md-grid-tile class="gray"
md-rowspan="2" md-colspan="3" md-colspan-sm="1"> md-rowspan="2" md-colspan="3" md-colspan-sm="1">
<md-grid-tile-header> <md-grid-tile-header>
<h3>Tasks</h3> <h3>Tasks</h3>
</md-grid-tile-header> </md-grid-tile-header>
<!-- Enter Wanted TASKS Text Here --> <!-- In The Future Will Enter Wanted TASKS Text Here -->
<div class = "tasksContent" style:"text-align= left;">
For Task 3 Press: <a href="http://localhost:8080/home#/tasks">Task #3</a>
<br>=====================</br>
For Task 4 Press: <a href="http://localhost:8080/home#/home">Task #4</a>
</div>
</md-grid-tile> </md-grid-tile>
</md-grid-list> </md-grid-list>
</div> </div>
</md-card> </md-card>
</md-content> </md-content>
<!-- <div layout="row" layout-fill style="padding-right: 320px;">
<md-whiteframe class="md-whiteframe-z4" layout layout-align="center center">
<span>.md-whiteframe-z4</span>
</md-whiteframe>
<md-whiteframe class="md-whiteframe-z5" layout layout-align="center center">
<span>.md-whiteframe-z5</span>
</md-whiteframe>
</div> -->
</div> </div>