From 94cf0447e4bba64b033041eed5161a3e9308d9a8 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Thu, 18 Jun 2015 23:21:09 +0300
Subject: [PATCH] - tasks.html added

- tasksController added

- app.js updated when '/tasks'

- mainController updated '/tasks'
---
 templates/css/theme.css                    | 46 +++++++++++++---------
 templates/js/app.js                        |  5 ++-
 templates/js/controllers/mainController.js |  2 +-
 templates/views/home.html                  | 27 ++++++++++++-
 4 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/templates/css/theme.css b/templates/css/theme.css
index ed28d11..815890f 100644
--- a/templates/css/theme.css
+++ b/templates/css/theme.css
@@ -86,7 +86,7 @@ body.noscroll
   position:center;
   width: 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);
   -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);
@@ -144,11 +144,6 @@ body.noscroll
   margin-bottom: 10px;
 }
 
-.md-avatar img  
-{
-  /*TODO*/
-}
-
 .feed
 {
   overflow-y: scroll;
@@ -156,7 +151,7 @@ body.noscroll
   /*width: 100%;*/
 }
 
-.feedMessages
+/*.feedMessages
 {
   overflow: scroll;
   height: 300px;
@@ -174,7 +169,7 @@ body.noscroll
   padding-left: 6%;
   font-size: 15px;
   display:table;
-}
+}*/
 
 .md-no-sticky
 {
@@ -262,7 +257,6 @@ body.noscroll
     -moz-border-radius: 100px;
     border-radius: 50px;
     width: 30%;
-    /*top: -40px;*/
     position: relative;
     z-index: 50;
   }
@@ -355,14 +349,15 @@ body.noscroll
     box-sizing: content-box;
   }
 
-
 /*gridList Effects*/
 
-md-grid-list {
-  margin: 8px; }
-.gray{
+md-grid-list
+{
+  margin: 8px;
+}
+.gray
+{
   background:#f5f5f5;
-
 }
 
 .aliceblue {
@@ -383,24 +378,37 @@ md-grid-list {
   .red {
   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*/
 
 
+.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;
   height: inherit;
   text-align: left;
   text-transform: none;
-  width: 100%;
+  width: 300px;
   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: -ms-flexbox;
   display: flex;
diff --git a/templates/js/app.js b/templates/js/app.js
index 86cbcc1..0a154b5 100644
--- a/templates/js/app.js
+++ b/templates/js/app.js
@@ -41,8 +41,11 @@ app.config(['$routeProvider', '$locationProvider',
 			.when('/Settings', {
 				templateUrl: 'templates/views/settings.html',
 				controller: 'settingsController'
+			})
+			.when('/tasks', {
+				templateUrl: 'templates/views/tasks.html',
+				controller: 'tasksController'
 			});
-
 	}
 ]);
 
diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js
index 1f175ab..f2eb0b4 100644
--- a/templates/js/controllers/mainController.js
+++ b/templates/js/controllers/mainController.js
@@ -53,7 +53,7 @@ angular.module('SeHub')
 				"title": "Tasks",
 				"icon": "fa fa-clipboard",
 				"style": "",
-				"route": "/campuses"
+				"route": "/tasks"
 			}, {
 				"title": "Settings",
 				"icon": "fa fa-cogs",
diff --git a/templates/views/home.html b/templates/views/home.html
index 65dabb3..b312bf7 100644
--- a/templates/views/home.html
+++ b/templates/views/home.html
@@ -22,6 +22,7 @@
 			</div>
 		</md-card>
 	</md-content>
+	
 	<md-content layout-padding>
 		<md-card>
 			<div class = "feed">
@@ -34,17 +35,39 @@
 						<md-grid-tile-header>
 					        <h3>Messages</h3>
 						</md-grid-tile-header>
-						<!-- Enter Wanted MESSAGES Text Here -->
+						In The Future Will Enter Wanted MESSAGES Text Here
 				    </md-grid-tile>
 			    	<md-grid-tile class="gray"
 						md-rowspan="2" md-colspan="3" md-colspan-sm="1">
 						<md-grid-tile-header>
 				        	<h3>Tasks</h3>
 						</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-list>
 			</div>
 		</md-card>
 	</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>
\ No newline at end of file