Merge remote-tracking branch 'origin/Release13' into Release13

chrisshayan · Dec 18, 2014 · edccbe6 · edccbe6
2 parents 6d7a868 + ea7f42b
commit edccbe6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/src/main/webapp/assets/modules/common/json.val.js b/src/main/webapp/assets/modules/common/json.val.js
@@ -254,13 +254,13 @@ angular.module("Common").constant("jsonValue", {
   }],
 
   authSource: [
-/*    {
+    {
       provider: "vietnamworks",
       logo: "images/vietnamwork.png",
       magnitude: "level1",
       bgcolor: "#1fbaec",
       isNotSupported: true
-    },*/
+    },
     {
       provider: "linkedin",
       logo: "images/linkedin.png",
@@ -273,15 +273,13 @@ angular.module("Common").constant("jsonValue", {
       magnitude: "level3",
       bgcolor: "#3b5a9b"
     },
-/*
     {
       provider: "stackoverflow",
       logo: "images/stackoverflow.png",
       magnitude: "level4",
       bgcolor: "#fda428",
       isNotSupported: true
     },
-*/
     {
       provider: "google",
       "logo": "images/gmail.png",
@@ -294,15 +292,13 @@ angular.module("Common").constant("jsonValue", {
       magnitude: "level6",
       bgcolor: "#333333"
     },
-/*
     {
       provider: "bitbucket",
       logo: "images/bitbucket.png",
       magnitude: "level7",
       bgcolor: "#1f5081",
       isNotSupported: true
     },
-*/
     {
       provider: "twitter",
       logo: "images/twitter.png",

diff --git a/src/main/webapp/assets/modules/signin/signin.tem.html b/src/main/webapp/assets/modules/signin/signin.tem.html
@@ -32,16 +32,22 @@ <h2 translate>tagLine</h2>
         <div class="bg6"><img src="images/dunut-circle.png" alt=""></div>
       </li>
       <li class="layer" data-depth="0.20" ng-repeat="auth in authSource">
-        <div class="signin-account {{auth.magnitude}}" ng-style="{'background-color': auth.bgcolor}">
-          <!--<span ng-if="auth.site === 'vietnamworks'">-->
-            <!--<a data-toggle="modal" data-target="#signin-form" class="hi-icon">-->
-              <!--<img ng-src="{{auth.logo}}" alt="">-->
-            <!--</a>-->
-          <!--</span>-->
-          <span>
+        <span ng-if="auth.isNotSupported === true">
+        <div class="signin-account {{auth.magnitude}}" style="background-color: #9c9c9c">
+
+            <a>
+              <img ng-src="{{auth.logo}}" alt="">
+            </a>
+
+
+        </div>
+         </span>
+  <span  ng-if="auth.isNotSupported === undefined">
+    <div class="signin-account {{auth.magnitude}}" ng-style="{'background-color': auth.bgcolor}">
             <a ng-click="openOathDialog(auth)" class="hi-icon"><img ng-src="{{auth.logo}}" alt=""></a>
+    </div>
           </span>
-        </div>
+
       </li>
     </ul>
   </div>

diff --git a/src/test/java/com/techlooper/service/impl/VietnamWorksJobStatisticServiceITCase.java b/src/test/java/com/techlooper/service/impl/VietnamWorksJobStatisticServiceITCase.java
@@ -62,12 +62,12 @@ public void testCountJobsBySkill() throws Exception {
                 javaTerm, new HistogramEnum[]{HistogramEnum.TWO_WEEKS, HistogramEnum.ONE_WEEK});
 
         assertNotNull(skillStatisticResponse);
-        assertNotEquals(0, skillStatisticResponse.getCount().longValue());
-        assertNotEquals(0, skillStatisticResponse.getTotalTechnicalJobs().longValue());
-        assertNotEquals("", skillStatisticResponse.getLabel());
-        assertNotEquals("", skillStatisticResponse.getLogoUrl());
-        assertNotEquals("", skillStatisticResponse.getWebSite());
-        assertNotEquals(0, skillStatisticResponse.getSkills().size());
-        assertNotEquals(0, skillStatisticResponse.getUsefulLinks().size());
+//        assertNotEquals(0, skillStatisticResponse.getCount().longValue());
+//        assertNotEquals(0, skillStatisticResponse.getTotalTechnicalJobs().longValue());
+//        assertNotEquals("", skillStatisticResponse.getLabel());
+//        assertNotEquals("", skillStatisticResponse.getLogoUrl());
+//        assertNotEquals("", skillStatisticResponse.getWebSite());
+//        assertNotEquals(0, skillStatisticResponse.getSkills().size());
+//        assertNotEquals(0, skillStatisticResponse.getUsefulLinks().size());
     }
 }