Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

SUP-674, Shrink header #96

Merged
merged 1 commit into from
Jun 1, 2015
Merged

SUP-674, Shrink header #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/css/my-dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
}
Expand Down
4 changes: 2 additions & 2 deletions src/js/app/my-dashboard/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<html lang="en" itemscope itemtype="http://schema.org/Article" ng-app="myDashboard" ng-controller="MyDashboardCtrl as vm">
<html lang="en" itemscope itemtype="http://schema.org/Article" ng-app="myDashboard" ng-controller="MyDashboardCtrl as db">
<head>
<title ng-bind="vm.title"></title>
<title ng-bind="db.title"></title>
18 changes: 9 additions & 9 deletions src/js/app/my-dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@@header

<div ng-show="vm.loggedIn && vm.user" class="content">
<div ng-show="db.loggedIn && db.user" class="content">
<style>
/* CSS to override bootstrap and existing css conflicts*/
body {
Expand Down Expand Up @@ -32,7 +32,7 @@
</style>
<div class="jumbotron my-dashboard-container member-profile-header">
<div class="container">
<div class="welcome-back" ng-include="vm.getTemplateURL('welcome-back.html')">
<div class="welcome-back" ng-include="db.getTemplateURL('welcome-back.html')">
</div>
</div>
</div>
Expand All @@ -41,21 +41,21 @@
<div class="clearfix visible-md-block visible-lg-block"></div>
<div class="row">
<div class="col-xs-12 col-sm-8 col-sm-push-4 col-md-9 col-md-push-3">
<!--<div class="my-dashboard-widget marketing-message" ng-include="vm.getTemplateURL('marketing-message.html')">
<!--<div class="my-dashboard-widget marketing-message" ng-include="db.getTemplateURL('marketing-message.html')">
</div>-->
<div class="my-dashboard-widget my-challenges" ng-include="vm.getTemplateURL('my-challenges.html')">
<div class="my-dashboard-widget my-challenges" ng-include="db.getTemplateURL('my-challenges.html')" ng-controller="MyChallengesCtrl as vm" ng-show="vm.renderWidget">
</div>
<div class="my-dashboard-widget srm-gadget" ng-include="vm.getTemplateURL('upcaming-srms.html')">
<div class="my-dashboard-widget srm-gadget" ng-include="db.getTemplateURL('upcaming-srms.html')">
</div>
</div>
<div class="col-xs-12 col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9">
<div class="my-dashboard-widget member-program" ng-include="vm.getTemplateURL('member-program.html')">
<div class="my-dashboard-widget member-program" ng-include="db.getTemplateURL('member-program.html')">
</div>
<div class="my-dashboard-widget helpful-links" ng-include="vm.getTemplateURL('helpful-links.html')">
<div class="my-dashboard-widget helpful-links" ng-include="db.getTemplateURL('helpful-links.html')">
</div>
<div class="my-dashboard-widget subscribe-updates" ng-include="vm.getTemplateURL('subscribe-updates.html')">
<div class="my-dashboard-widget subscribe-updates" ng-include="db.getTemplateURL('subscribe-updates.html')">
</div>
<div class="my-dashboard-widget blog-post" ng-include="vm.getTemplateURL('blog-feed.html')">
<div class="my-dashboard-widget blog-post" ng-include="db.getTemplateURL('blog-feed.html')">
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/js/app/my-dashboard/js/controllers/member-program-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion src/js/app/my-dashboard/js/controllers/my-challenges-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
vm.isCurrentPage = isCurrentPage;
vm.getCurrentPageClass = getCurrentPageClass;
vm.sort = sort;
vm.renderWidget = false;

// getChallenges controller
if (AuthService.isLoggedIn === true) {
Expand Down Expand Up @@ -83,7 +84,7 @@
processChallengesResponse(data);
// stop loading icon
vm.loading = false;

vm.renderWidget = vm.myChallenges && vm.myChallenges.length > 0;
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/js/app/my-dashboard/js/controllers/welcome-back-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/app/my-dashboard/partials/my-challenges.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-controller="MyChallengesCtrl as vm" >
<div>
<div class="widget-content">
<div class="challenges-header clearfix">
<div class="pull-left"><strong>My Challenges</strong></div>
Expand Down