Merge pull request #497 from appirio-tech/feature/tom-image-final-fixes

Fix images

Author: tladendo

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

@@ -4,13 +4,9 @@
   p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
   p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
-  .thumbnail(ng-click="imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
-    img(ng-src="{{imageURL || '/images/ico-picture.svg'}}", fallback-src="/images/ico-picture.svg")
-
-    .thumbnail-gallery(ng-click="imageURL && openLightbox()")
-      .gallery-icon
-
-      .num-images 1 image
+  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    img(ng-show="!challenge.isPrivate", ng-src="{{imageURL || '/images/card-bg-no-image.svg'}}", fallback-src="/images/card-bg-no-image.svg")
+    img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")
 
 .list-view(ng-show="view === 'list'")
   .place-date
@@ -22,10 +18,7 @@
 
   .winner-ribbon(ng-show="challenge.wonFirst")
 
-  .thumbnail(ng-click="imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
-    img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
-
-    .thumbnail-gallery(ng-click="challenge.showLightbox()")
-      .gallery-icon
 
-      .num-images 1 image
+  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    img(ng-show="!challenge.isPrivate", ng-src="{{imageURL || '/images/card-bg-no-image.svg'}}", fallback-src="/images/ico-picture.svg")
+    img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")

app/directives/challenge-user-place/design-lightbox/design-lightbox.jade

@@ -6,7 +6,10 @@
     .title {{challenge.name}}
 
 
-    img(ng-src="{{selectedImage}}")
+    img(
+      ng-src="{{selectedImage}}",
+      fallback-src="/images/card-bg-no-image.svg"
+    )
 
 
     .info
@@ -17,7 +20,8 @@
         ng-repeat="submission in challenge.userDetails.submissions",
         ng-src="{{currentImage = submission.submissionImage && submission.submissionImage.full}}",
         ng-click="updateSelected(currentImage, $index)",
-        ng-class="{'current': currentImage == selectedImage}"
+        ng-class="{'current': currentImage == selectedImage}",
+        fallback-src="/images/card-bg-no-image.svg"
       )
 
   .right-nav

app/profile/subtrack/subtrack.jade

@@ -10,7 +10,7 @@
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
               .flex-wrapper
-                p.title(ng-hide="true") {{item.subTrack | underscoreStrip}}
+                p.title(ng-hide="true") {{item.subTrack | track}}
 
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")
@@ -29,7 +29,7 @@
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
               .flex-wrapper
-                p.title(ng-hide="true") {{item.subTrack | underscoreStrip}}
+                p.title(ng-hide="true") {{item.subTrack | track}}
 
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")