From e4ad544b948d38edb1c04f1fe9ab93a69e608d20 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 1 Jun 2015 17:33:05 +0530 Subject: [PATCH] SUP-674, Shrink header Added both options 1. Reduced height of the header 2. Hide the challenges widget when there is no active challenge for the user --- src/css/my-dashboard.css | 5 +++++ src/js/app/my-dashboard/head.html | 4 ++-- src/js/app/my-dashboard/index.html | 18 +++++++++--------- .../controllers/member-program-controller.js | 2 +- .../js/controllers/my-challenges-controller.js | 3 ++- .../js/controllers/welcome-back-controller.js | 2 +- .../my-dashboard/partials/my-challenges.html | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/css/my-dashboard.css b/src/css/my-dashboard.css index 92ff7a32..27445d88 100644 --- a/src/css/my-dashboard.css +++ b/src/css/my-dashboard.css @@ -111,6 +111,11 @@ background-position: 50% 50%; color: #fff; } +@media only screen and (min-width: 768px) { + .member-profile-header { + padding: 15px 0; + } +} .member-profile { } diff --git a/src/js/app/my-dashboard/head.html b/src/js/app/my-dashboard/head.html index 426e6286..5efb9eae 100644 --- a/src/js/app/my-dashboard/head.html +++ b/src/js/app/my-dashboard/head.html @@ -1,3 +1,3 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/js/app/my-dashboard/index.html b/src/js/app/my-dashboard/index.html index 1e55ec31..dd467559 100644 --- a/src/js/app/my-dashboard/index.html +++ b/src/js/app/my-dashboard/index.html @@ -1,6 +1,6 @@ @@header -
+
-
+
@@ -41,21 +41,21 @@
- -
+
-
+
-
+
-
+
- diff --git a/src/js/app/my-dashboard/js/controllers/member-program-controller.js b/src/js/app/my-dashboard/js/controllers/member-program-controller.js index 9ed1a3cc..62569c0a 100644 --- a/src/js/app/my-dashboard/js/controllers/member-program-controller.js +++ b/src/js/app/my-dashboard/js/controllers/member-program-controller.js @@ -46,7 +46,7 @@ vm.registerUser = registerUser; // parent dashboard controller - var db = $scope.$parent.vm; + var db = $scope.$parent.db; // activate controller if (AuthService.isLoggedIn === true) { diff --git a/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js b/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js index 5dda2859..d422bc42 100644 --- a/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js +++ b/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js @@ -48,6 +48,7 @@ vm.isCurrentPage = isCurrentPage; vm.getCurrentPageClass = getCurrentPageClass; vm.sort = sort; + vm.renderWidget = false; // getChallenges controller if (AuthService.isLoggedIn === true) { @@ -83,7 +84,7 @@ processChallengesResponse(data); // stop loading icon vm.loading = false; - + vm.renderWidget = vm.myChallenges && vm.myChallenges.length > 0; }); } diff --git a/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js b/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js index 25219345..c19c1a28 100644 --- a/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js +++ b/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js @@ -45,7 +45,7 @@ vm.statsToShow = 2; // parent dashboard controller - var db = $scope.$parent.vm; + var db = $scope.$parent.db; // activate controller if (AuthService.isLoggedIn === true) { diff --git a/src/js/app/my-dashboard/partials/my-challenges.html b/src/js/app/my-dashboard/partials/my-challenges.html index 0d3ea83e..9adfc144 100644 --- a/src/js/app/my-dashboard/partials/my-challenges.html +++ b/src/js/app/my-dashboard/partials/my-challenges.html @@ -1,4 +1,4 @@ -
+
My Challenges