Merge pull request #478 from phuonghuynh/master

Update changes
chrisshayan · Dec 30, 2015 · be86d6f · be86d6f
2 parents e276da2 + fd14ff8
commit be86d6f
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/src/main/webapp/assets/modules/_appStart.js b/src/main/webapp/assets/modules/_appStart.js
@@ -55,12 +55,13 @@ techlooper.run(function (connectionFactory, loadingBoxFactory, cleanupFactory, u
       case "redirectJA":
         window.location.href = (param.targetUrl.startsWith("http://") || param.targetUrl.startsWith("https://")) ? param.targetUrl : "http://" + param.targetUrl;
         break;
-
-      //case "cancel":
-      //  $location.url("/");
-      //  break;
     }
   }
+  else {//remove all operation flags
+    localStorageService.remove("joiningChallengeId");
+    localStorageService.remove("joinNow");
+    localStorageService.remove("submitNow");
+  }
 
   //$rootScope.$watchCollection([
   //  function () {

diff --git a/src/main/webapp/assets/modules/common/challenge/joinInternalChallenge.html b/src/main/webapp/assets/modules/common/challenge/joinInternalChallenge.html
@@ -1,6 +1,6 @@
 <div class="row join-internal-challenge">
   <ng-form name="joinInternalForm" autocomplete="off" role="form" class="form-horizontal">
-    <p ng-if="challenge.$isInternal && challenge.companyDomains.length" class="text-center">
+    <p class="title-head" ng-if="challenge.$isInternal && challenge.companyDomains.length" class="text-center">
       {{'joinInternalChallengeWith' | translate}}
       <span ng-repeat="domain in challenge.companyDomains">
         <strong>{{domain}}</strong>&nbsp;<span ng-if="!$last" translate="or"></span>&nbsp;

diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html
@@ -1,5 +1,13 @@
 <div class="submit-phase-contest show" ng-show="visibleSubmitForm">
   <ng-form name="submissionForm" autocomplete="off">
+    <p ng-if="challenge.$isInternal && challenge.companyDomains.length" class="title-head text-center">
+      {{'useYourEmailDomain' | translate}}
+      <span ng-repeat="domain in challenge.companyDomains">
+        <strong>{{domain}}</strong>&nbsp;<span ng-if="!$last" translate="or"></span>
+      </span>
+      {{'toRegister' | translate}}
+    </p>
+
     <div class="error-messages"
          ng-show="submissionForm.submissionPassCode.$error.credential && (submissionForm.submissionPassCode.$dirty || submissionForm.$submitted)"
          translate="invalidCredential" />
@@ -39,6 +47,7 @@
       <div class="col-sm-6">
         <label>
           <span translate="passCode"></span>
+          <input type="password" name="password_fake" value="" style="display:none;" />
           <input type="password" class="input-style passcode"
                  name="submissionPassCode" maxlength="4" minlength="4" only-digits=""
                  ng-model="submission.passCode" reset-validator-on-blur="credential"

diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js
@@ -30,7 +30,7 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa
         localStorageService.remove("joiningChallengeId");
       }
     }
-  }
+  };
 
   joinChallenge();
 

diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json
@@ -883,6 +883,8 @@
   "invalidDomainName": "Invalid domain name format",
   "emailDomainNotMatch": "Email domain is invalid",
   "joinInternalChallengeWith": "Join with your email from:",
+  "useYourEmailDomain": "This is an internal challenge. Use your",
+  "toRegister": "email to join",
   "enterYourPassword": "Enter your password",
   "enterYourEmail": "Enter your email",
   "signInInternalChallengeTitle": "First, Let Us Know Who You Are",

diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json
@@ -887,6 +887,8 @@
   "invalidDomainName": "Tên miền không đúng định dạng",
   "emailDomainNotMatch": "Tên miền email không hợp lệ",
   "joinInternalChallengeWith": "Tham gia bằng email với tên miền:",
+  "useYourEmailDomain": "Đây là thử thách nội bộ. Sử dụng email",
+  "toRegister": "để đăng ký.",
   "enterYourPassword": "Nhập mật khẩu",
   "enterYourEmail": "Nhập email",
   "signInInternalChallengeTitle": "Trước tiên, Giúp Chúng Tôi Biết Bạn Là Ai",

diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass
@@ -988,7 +988,15 @@
           margin-top: 10px
           float: left
           width: 100%
-
+          p.title-head
+            padding: 10px 0 15px 0
+            font-size: 16px
+            text-align: center
+            width: 100%
+            clear: both
+            display: inline-block
+            span
+              text-transform: lowercase
         .join-internal-challenge
           background-color: #f1f2f7
           padding: 15px 20px 5px 20px
@@ -1011,9 +1019,7 @@
             color: red
             font-size: 12px
             font-style: italic
-          p
-            span
-              text-transform: lowercase
+
       .col-md-12
         padding: 0
       .contest-content-item

diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass
@@ -303,7 +303,10 @@
           color: red
           font-size: 12px
           font-style: italic
-        p
+        p.title-head
+          padding: 10px 0 15px 0
+          text-align: center
+          font-size: 16px
           span
             text-transform: lowercase
       .contest-item-row.internal
-Original file line number
+Diff line change
@@ Expand Up @@
             localStorageService.remove("joiningChallengeId");
           }
         }
-      }
+      };
       joinChallenge();
@@ Expand Down @@