From 7759d744f5f2a825f968175a92b8b8cde4ae7263 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 18 May 2015 13:08:36 +0530 Subject: [PATCH 1/5] SUP-463, Cleanup dashboard --- src/css/my-dashboard.css | 13 +++--- src/js/app/my-dashboard/index.html | 4 +- .../my-dashboard/partials/member-program.html | 44 +++++++++++++------ 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/css/my-dashboard.css b/src/css/my-dashboard.css index f9eddfb4..6eca6344 100644 --- a/src/css/my-dashboard.css +++ b/src/css/my-dashboard.css @@ -223,12 +223,8 @@ } .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 .display-image { @@ -296,15 +292,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; } diff --git a/src/js/app/my-dashboard/index.html b/src/js/app/my-dashboard/index.html index d255fa84..1e55ec31 100644 --- a/src/js/app/my-dashboard/index.html +++ b/src/js/app/my-dashboard/index.html @@ -40,7 +40,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
diff --git a/src/js/app/my-dashboard/partials/member-program.html b/src/js/app/my-dashboard/partials/member-program.html index 74663ea5..bb7b63c7 100644 --- a/src/js/app/my-dashboard/partials/member-program.html +++ b/src/js/app/my-dashboard/partials/member-program.html @@ -28,57 +28,75 @@
-->
-

Swift Recognition

+

Swift Recognition

  • -
    +
    Get Ready
    -
    Completed
    +
    +
    +
    Completed
    +
  • -
    +
    Step One
    -
    Pending
    +
    +
    +
    Pending
    +
  • -
    +
    Getting Ready
    -
    Pending
    +
    +
    +
    Pending
    +
  • -
    +
    On Starting Line
    -
    Pending
    +
    +
    +
    Pending
    +
  • -
    +
    Break the Finish
    -
    Pending
    +
    +
    +
    Pending
    +
  • -
    +
    Get Certified
    -
    Pending
    +
    +
    +
    Pending
    +
From a54a42e6365377d29fe17b54703029c20fe0f20a Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 18 May 2015 13:09:04 +0530 Subject: [PATCH 2/5] SUP-463, Cleanup dashboard --- src/css/base.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/css/base.css b/src/css/base.css index 15b43685..d4feee58 100644 --- a/src/css/base.css +++ b/src/css/base.css @@ -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; From 8bcf8582c5c28154923ef9b544b86be7bff98c25 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 19 May 2015 11:52:38 +0530 Subject: [PATCH 3/5] SUP-463, Cleanup dashboard Removed [] from handle name --- src/js/app/my-dashboard/partials/welcome-back.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/app/my-dashboard/partials/welcome-back.html b/src/js/app/my-dashboard/partials/welcome-back.html index 9355af2a..15c47b2e 100644 --- a/src/js/app/my-dashboard/partials/welcome-back.html +++ b/src/js/app/my-dashboard/partials/welcome-back.html @@ -2,7 +2,7 @@
-
[{{vm.profile.handle}}]
+
{{vm.profile.handle}}
Joined:
From 95037aeda71ccd480f9c88f1b63b2d2fdd0a1f41 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 20 May 2015 11:47:57 +0530 Subject: [PATCH 4/5] SUP-463, Cleanup dashboard Replaced bird image with peer badge image without any text. --- src/css/my-dashboard.css | 7 +++++-- src/js/app/my-dashboard/partials/member-program.html | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/css/my-dashboard.css b/src/css/my-dashboard.css index 6eca6344..5d745d78 100644 --- a/src/css/my-dashboard.css +++ b/src/css/my-dashboard.css @@ -227,6 +227,10 @@ overflow: hidden; } +.member-program-content img[rel="program-logo"] { + height: 80px; +} + .member-program-content .display-image { height: 260px; background-color: white; @@ -237,8 +241,7 @@ } .member-program-content .description { - /*float: left; - width: 50%;*/ + text-align: justify; } .member-program-content .signup { diff --git a/src/js/app/my-dashboard/partials/member-program.html b/src/js/app/my-dashboard/partials/member-program.html index bb7b63c7..8caea53b 100644 --- a/src/js/app/my-dashboard/partials/member-program.html +++ b/src/js/app/my-dashboard/partials/member-program.html @@ -9,7 +9,7 @@
- +

Apple’s latest and greatest programming language for iOS8 that will enable you to become a rockstar mobile developer and achieve fortune & glory untold.

From 96e0211e3cae6db6907cc85e0455e0c2eadf3217 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 20 May 2015 15:47:39 +0530 Subject: [PATCH 5/5] SUP-463, Cleanup dashboard Fixed bug with protocol for upload photo link. --- .../app/my-dashboard/js/controllers/welcome-back-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f35be251..25219345 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 @@ -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; }