Merge pull request #426 from khoa-nd/master

Merged
chrisshayan · Oct 1, 2015 · ec3c604 · ec3c604
2 parents 65d3584 + f58f0a1
commit ec3c604
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/src/main/resources/template/confirmUserJoinChallenge.en.ftl b/src/main/resources/template/confirmUserJoinChallenge.en.ftl
@@ -460,7 +460,6 @@
                           <tr>
                             <td width="100%" align="left" class="fullWidth">
                               <table border="0" cellspacing="0" cellpadding="0" align="left" style="margin: 0 auto; color:#000000" width="100%">
-                                <#if firstPlaceReward > 0>
                                 <tr>
                                   <td align="left" width="45%" style="font-size: 14px; padding-left: 15px" valign="top">
                                     1st Place Reward (USD):
@@ -469,8 +468,6 @@
                                     $${firstPlaceReward}
                                   </td>
                                 </tr>
-                                </#if>
-                                <#if secondPlaceReward > 0>
                                     <tr>
                                   <td style="height:5px; line-height: 5px;">
                                     <img height="1" width="1" src="http://images.vietnamworks.com/x.gif" style="display:block; border: 0px" />
@@ -487,8 +484,6 @@
                                     $${secondPlaceReward}
                                   </td>
                                 </tr>
-                                </#if>
-                                <#if thirdPlaceReward > 0>
                                 <tr>
                                   <td style="height:5px; line-height: 5px;">
                                     <img height="1" width="1" src="http://images.vietnamworks.com/x.gif" style="display:block; border: 0px" />
@@ -505,7 +500,6 @@
                                     $${thirdPlaceReward}
                                   </td>
                                 </tr>
-                                </#if>
                               </table>
                             </td>
                           </tr>

diff --git a/src/main/resources/template/confirmUserJoinChallenge.vi.ftl b/src/main/resources/template/confirmUserJoinChallenge.vi.ftl
@@ -460,7 +460,6 @@
                           <tr>
                             <td width="100%" align="left" class="fullWidth">
                               <table border="0" cellspacing="0" cellpadding="0" align="left" style="margin: 0 auto; color:#000000" width="100%">
-<#if firstPlaceReward > 0>
                                 <tr>
                                   <td align="left" width="45%" style="font-size: 14px; padding-left: 15px" valign="top">
                                       Giải nhất (USD):
@@ -477,8 +476,6 @@
                                     <img height="1" width="1" src="http://images.vietnamworks.com/x.gif" style="display:block; border: 0px" />
                                   </td>
                                 </tr>
-    </#if>
-<#if secondPlaceReward > 0>
                                 <tr>
                                   <td align="left" width="45%" style="font-size: 14px; padding-left: 15px" valign="top">
                                       Giải nhì (USD):
@@ -495,8 +492,6 @@
                                     <img height="1" width="1" src="http://images.vietnamworks.com/x.gif" style="display:block; border: 0px" />
                                   </td>
                                 </tr>
-</#if>
-<#if thirdPlaceReward > 0>
                                 <tr>
                                   <td align="left" width="45%" style="font-size: 14px; padding-left: 15px" valign="top">
                                       Giải ba (USD):
@@ -505,7 +500,6 @@
                                     $${thirdPlaceReward}
                                   </td>
                                 </tr>
-</#if>
                               </table>
                             </td>
                           </tr>