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

SUP-463, Clean up dashboard #81

Merged
merged 5 commits into from
May 21, 2015
Merged

SUP-463, Clean up dashboard #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7759d74
SUP-463, Cleanup dashboard
vikasrohit May 18, 2015
a54a42e
SUP-463, Cleanup dashboard
vikasrohit May 18, 2015
8bcf858
SUP-463, Cleanup dashboard
vikasrohit May 19, 2015
95037ae
SUP-463, Cleanup dashboard
vikasrohit May 20, 2015
96e0211
SUP-463, Cleanup dashboard
vikasrohit May 20, 2015
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
8 changes: 8 additions & 0 deletions src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,14 @@ sub, sup {
margin-bottom: 5px;
}

.margin-left-1x {
margin-left: 5px;
}

.margin-right-1x {
margin-right: 5px;
}

.margin-vert-1x {
margin-top: 5px;
margin-bottom: 5px;
Expand Down
20 changes: 11 additions & 9 deletions src/css/my-dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,12 @@
}

.member-program-content .panel-body {
/*background: -webkit-linear-gradient(360deg, rgb(15, 16, 31), rgb(101,220,85), rgb(164, 13, 62));*/
height: 377px;
/*margin-left: 50px;*/
overflow: hidden;
background: url('../i/swift_background_hpattern.jpg') repeat-x center center;
color: #eeeeee;
}

.member-program-content img[rel="program-logo"] {
height: 80px;
}

.member-program-content .display-image {
Expand All @@ -241,8 +241,7 @@
}

.member-program-content .description {
/*float: left;
width: 50%;*/
text-align: justify;
}

.member-program-content .signup {
Expand Down Expand Up @@ -296,15 +295,18 @@
}

.member-program-content *[rel="badges"] *[rel="badge-status"] {
padding-left: 20px;
margin-top: 5px;
}
.member-program-content *[rel="badges"] *[rel="badge-status"] *[rel="image"] {
width: 20px;
height: 20px;
}

.member-program-content *[rel="badges"] *[rel="badge-status"].pending {
.member-program-content *[rel="badges"] *[rel="badge-status"].pending *[rel="image"] {
background: url("../i/check-box.png") no-repeat 0 0px;
}

.member-program-content *[rel="badges"] *[rel="badge-status"].completed {
.member-program-content *[rel="badges"] *[rel="badge-status"].completed *[rel="image"] {
background: url("../i/check-box.png") no-repeat 0 -20px;
}

Expand Down
4 changes: 2 additions & 2 deletions src/js/app/my-dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
<div class="my-dashboard-container container-fluid" >
<div class="clearfix visible-md-block visible-lg-block"></div>
<div class="row">
<div class="col-xs-12 col-sm-9 col-sm-push-3">
<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>-->
<div class="my-dashboard-widget my-challenges" ng-include="vm.getTemplateURL('my-challenges.html')">
</div>
<div class="my-dashboard-widget srm-gadget" ng-include="vm.getTemplateURL('upcaming-srms.html')">
</div>
</div>
<div class="col-xs-12 col-sm-3 col-sm-pull-9">
<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>
<div class="my-dashboard-widget helpful-links" ng-include="vm.getTemplateURL('helpful-links.html')">
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 @@ -85,7 +85,7 @@
}
} else {
vm.photoLink = PHOTO_LINK_LOCATION + '/i/m/nophoto_login.gif';
vm.uploadPhotoLink = $location.protocol + ":" + communityBaseUrl + '/tc?module=MyHome';
vm.uploadPhotoLink = $location.protocol() + ":" + communityBaseUrl + '/tc?module=MyHome';
vm.showUploadPhotoLink = true;
}

Expand Down
46 changes: 32 additions & 14 deletions src/js/app/my-dashboard/partials/member-program.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div rel="unregistered-view" ng-show="!vm.loading && !vm.registration">
<div class="center-align-text margin-top-3x">
<img src="/mf/i/swift-getting-started.png" />
<img rel="program-logo" src="/mf/i/member-program/peer-badge-big.png" />
</div>
<div class="description">
<p>Apple’s latest and greatest programming language for iOS8 that will enable you to become a rockstar mobile developer and achieve fortune & glory untold.</p>
Expand All @@ -28,57 +28,75 @@
</div> -->
<div class="description margin-top-3x">
<div>
<h3 class="col-xs-12">Swift Recognition</h3>
<h3>Swift Recognition</h3>
<div class="clear"></div>
</div>
<!-- TODO make badge list dynamic -->
<ul rel="badges" class="margin-top-3x">
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge1">
<div rel="badge" class="pull-left badge1">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">Get Ready</div>
</div>
<div rel="badge-status" class="col-xs-4 completed">Completed</div>
<div rel="badge-status" class="pull-right completed">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Completed</div>
</div>
<div class="clearfix"></div>
</li>
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge2">
<div rel="badge" class="pull-left badge2">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">Step One</div>
</div>
<div rel="badge-status" class="col-xs-4 pending">Pending</div>
<div rel="badge-status" class="pull-right pending">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Pending</div>
</div>
<div class="clearfix"></div>
</li>
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge3">
<div rel="badge" class="pull-left badge3">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">Getting Ready</div>
</div>
<div rel="badge-status" class="col-xs-4 pending">Pending</div>
<div rel="badge-status" class="pull-right pending">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Pending</div>
</div>
<div class="clearfix"></div>
</li>
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge4">
<div rel="badge" class="pull-left badge4">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">On Starting Line</div>
</div>
<div rel="badge-status" class="col-xs-4 pending">Pending</div>
<div rel="badge-status" class="pull-right pending">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Pending</div>
</div>
<div class="clearfix"></div>
</li>
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge5">
<div rel="badge" class="pull-left badge5">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">Break the Finish</div>
</div>
<div rel="badge-status" class="col-xs-4 pending">Pending</div>
<div rel="badge-status" class="pull-right pending">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Pending</div>
</div>
<div class="clearfix"></div>
</li>
<li class="margin-vert-1x">
<div rel="badge" class="col-xs-8 badge6">
<div rel="badge" class="pull-left badge6">
<div rel="image" class="pull-left"></div>
<div rel="name" class="pull-left">Get Certified</div>
</div>
<div rel="badge-status" class="col-xs-4 pending">Pending</div>
<div rel="badge-status" class="pull-right pending">
<div rel="image" class="pull-right margin-left-1x"></div>
<div rel="text" class="pull-right">Pending</div>
</div>
<div class="clearfix"></div>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/js/app/my-dashboard/partials/welcome-back.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="profile-left col-xs-12 col-sm-2">
<div class="profile-image"><img width="130px" src="{{vm.photoLink}}"></div>
<div rel="upload-photo" ng-show="vm.showUploadPhotoLink"><a href="{{vm.uploadPhotoLink}}">Upload Photo</a></div>
<div class="handle" style="{{vm.ratingColor}}">[{{vm.profile.handle}}]</div>
<div class="handle" style="{{vm.ratingColor}}">{{vm.profile.handle}}</div>
<div class="doj">Joined: <span ng-bind="vm.profile.memberSince | date"></span></div>
</div>
<div class="profile-right col-xs-12 col-sm-10">
Expand Down