diff --git a/templates/css/theme.css b/templates/css/theme.css index 11ef815..25839ca 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -92,17 +92,11 @@ body.noscroll box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); } - /* Added BY devMatan */ - -/*.disabledSubmitButton: -{ - /*background: #f7f7f7;*/ - /*border-radius: 10000px;*/ - /*text-align: center;*/ - - /*position: relative !important;* - - }*/ +.md-toolbar-tools h1 { + font-size: inherit; + font-weight: inherit; + margin: inherit; +} .campusAvatar img { @@ -298,6 +292,16 @@ body.noscroll cursor: pointer; } +.hoverable{ + cursor: pointer; +} + +.hoverable:hover{ + cursor: pointer; + background-color: #E2E2E2; +} + + .se-menu li:active{ background-color: #B2B2B2; text-shadow:#e0e0e0 1px 1px 0; diff --git a/templates/js/controllers/tasksController.js b/templates/js/controllers/tasksController.js index 46cc009..115ba12 100644 --- a/templates/js/controllers/tasksController.js +++ b/templates/js/controllers/tasksController.js @@ -19,7 +19,7 @@ angular.module('SeHub') ///Need to show the List $mdDialog.show({ controller: DialogController, - templateUrl: 'templates/views/UserStateList.html?v=1', + templateUrl: 'templates/views/UserStateList.html?v=1122231', parent: $scope, targetEvent: ev, locals: { @@ -43,9 +43,9 @@ angular.module('SeHub') } apiService.isTaskSubmitted(token, task.id, ownerId).success(function(data) { if (data.submitted) - $location.path('/tasks/overview/' + task.id + '/' + ownerId + '/' + ownerId) + $location.path('/tasks/overview/' + task.id + '/' + ownerId + '/' + ownerId); else - $location.path('/tasks/fill/' + task.id + '/' + ownerId) + $location.path('/tasks/fill/' + task.id + '/' + ownerId); }) }).error(function(err) { console.error('Error: ', err); @@ -56,8 +56,6 @@ angular.module('SeHub') function DialogController($scope, $mdDialog, data, apiService) { - - console.log(apiService); $scope.task = data.task; $scope.isPersonal = data.isPersonal; var token = data.token; @@ -71,6 +69,11 @@ angular.module('SeHub') $scope.hide(); }) + $scope.goToTask = function(obj){ + $mdDialog.hide(); + $location.path('/tasks/overview/' + $scope.task.id + '/' + obj.id + '/' + obj.id); + } + $scope.hide = function() { $mdDialog.hide(); diff --git a/templates/views/UserStateList.html b/templates/views/UserStateList.html index f698c19..037bab5 100644 --- a/templates/views/UserStateList.html +++ b/templates/views/UserStateList.html @@ -1,4 +1,4 @@ - +
@@ -10,14 +10,14 @@
-
+ + + + {{obj.id}} +
+

{{obj.name || obj.projectName}}

+

Grade: {{obj.grade.grade || "Not Yet Reviewed"}}

+ +
+
+
+ -
+ \ No newline at end of file