Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

@@ -25,13 +25,13 @@
         </a>
     </div>
     {{# isFail}}
-    <h1>验证没有通过，订阅失败！</h1>
+    <h1>驗證沒有通過，訂閱失敗！</h1>
     {{/ isFail}}
 
     {{^ isFail}}
     <h1>您已订阅！</h1>
      <p class="times yourEmail">mail: <span>{{emailAddress}}</span></p>
-    <p class="mb20">一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel" class="underline">取消订阅</a></p>
+    <p class="mb20">一旦您希望停止接收我們的電子郵件，您可以<a href="/passport/subscribe/cancel" class="underline">取消訂閱</a></p>
     {{/ isFail}}
     <p class="backYohoBoys"><a class="times" href="/">&lt;&lt; Back YOHO！Girls </a></p>
     <p class="black">NewPower Co. All Right</p>
@@ -44,17 +44,17 @@
             <img src="{{> comment/environment_images}}/logo_girl.png" alt="">
         </a>
     </div>
-    <h1>取消订阅成功</h1>
+    <h1>取消訂閱成功</h1>
     <div class="cancelForm">
-        <p>你已取消订阅YOHO！Girls</p>
-        <p>你将收到最后一封邮件，确认我们已为你取消订阅</p>
-        <h3>如果你有时间，请告诉我们您为什么取消订阅：</h3>
+        <p>你已經成功取消訂閱YOHO！Girls</p>
+        <p>你將收到最後一封電子郵件，確認我們以為你取消訂閱</p>
+        <h3>如果你有時間，請告訴我們為什麼您取消訂閱：</h3>
         <div class="radioBox" val="{{emailAddress}}">
-            <p><label><input name="radio" type="radio" value="1" checked>我不再希望收到这些电子邮件</label></p>
-            <p><label><input name="radio" type="radio" value="2">我从未在这个邮件列表注册</label></p>
-            <p><label><input name="radio" type="radio" value="3">这些邮件是不合宜的</label></p>
-            <p><label><input name="radio" type="radio" value="4">这些邮件是垃圾邮件，应该予以报告</label></p>
-            <p><label><input name="radio" type="radio" value="5">其他原因（在下面填写原因）</label></p>
+            <p><label><input name="radio" type="radio" value="1" checked>我不再希望收到這些電子郵件</label></p>
+            <p><label><input name="radio" type="radio" value="2">我從未在這個郵件列表註冊</label></p>
+            <p><label><input name="radio" type="radio" value="3">這些郵件是不合宜的</label></p>
+            <p><label><input name="radio" type="radio" value="4">這些也郵件是垃圾郵件，應該予以報告</label></p>
+            <p><label><input name="radio" type="radio" value="5">其他原因（在下面填寫原因）</label></p>
             <p><textarea name="" readonly="true"></textarea></p>
             <p class="pt10"><a class="submitEmail" href="javascript:void(0);">提交</a></p>
         </div>

 {{# devEnvironment}}
-	<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
+<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
 {{/ devEnvironment}}
 
-
-
 {{# prevEnvironment}}
-
-	<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-	<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
-	<script type="text/javascript">
-	    seajs.use("index");
-	</script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
+<script type="text/javascript">
+seajs.use("index");
+</script>
 {{/ prevEnvironment}}
 
-
-
-
 {{# testEnvironment}}
-
-	<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-	<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
-
-	<script type="text/javascript">
-	    seajs.use("index");
-	</script>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
+<script type="text/javascript">
+seajs.use("index");
+</script>
 {{/ testEnvironment}}
 
-
 {{# prodEnvironment}}
-
-	<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-	<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
-	<script type="text/javascript">
-	    seajs.use("index");
-	</script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs.js"></script>
+<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
+<script type="text/javascript">
+seajs.use("index");
+</script>
 {{/ prodEnvironment}}

@@ -3,7 +3,7 @@
     <a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
         <img class="img lazy" data-original="{{img}}" alt="{{title}}" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=="/>
 
-        <span class="arrow-bottom girl-channel-arrow"></span>
+        <span class="arrow-bottom girl-channel-arrow" style="right:1px;bottom:1px;"></span>
         {{# isVideo}}<span class="video-icon-Fragment"></span>{{/ isVideo}}
     </a>
     <div class="item-text-area">
@@ -14,10 +14,11 @@
             {{# subChannel}}
                 <a class="channel" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','web','contentTwoChannel')">{{name}}</a>&nbsp;|&nbsp;
             {{/ subChannel}}
-        </span>{{# title}}
-        <a class="item-title" href="{{link}}" target="_blank"  _title="{{title}}" onclick="YOHODCLICK('home','web','content')" style="text-align:left;" >{{.}}</a>{{/ title}}
+        </span>
+        {{# title}}
+            <a class="item-title" href="{{link}}" target="_blank"  _title="{{.}}" onclick="YOHODCLICK('home','web','content')" style="text-align:left;" ></a>{{/ title}}
         {{# subtitle}}
-        <a class="item-title" href="{{link}}" target="_blank"  _title="{{subtitle}}" style="margin-top:10px;text-align:left;" onclick="YOHODCLICK('home','web','content')">{{.}}</a>
+            <a class="item-title" href="{{link}}" target="_blank"  _title="{{.}}" style="margin-top:10px;text-align:left;" onclick="YOHODCLICK('home','web','content')"></a>
         {{/ subtitle}}
         <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}"
          style="text-align:left;" onclick="YOHODCLICK('home','web','content')">{{content}}</a>

@@ -5,7 +5,7 @@
     </div>
     <div class="app-main">
         <h6>Yoho!Girls</h6>
-        <p>We love to Play & Learn</p>
+        <p>No Fashion， NO Life！</p>
         <div class="download-btn clearfix">
             <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a>
             <a href="{{androidUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/android-download-1024.png" alt=""></a>

@@ -46,7 +46,7 @@
         <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html" onclick="YOHODCLICK('channel','web','homeHK')"></a></div>
         <div class="menubar-header menubar-header-{{channel}}">
         <div class="menubar">
-           <div class="menu-item menu-item-fashion">
+           <div class="menu-item menu-item-fashion menu-fashion">
                 <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
                     <a class="text">fashion</a>
                     <a class="hover-text">時尚</a>
@@ -58,7 +58,7 @@
                     </div>
                 </span>
             </div>
-            <div class="menu-item  menu-item-sports">
+            <div class="menu-item  menu-item-sports menu-beauty">
                 <span class="menu-link-channel menu-link-beauty beauty-choosen">
                     <a class="text">beauty</a>
                     <a class="hover-text">美容</a>
@@ -70,7 +70,7 @@
                     </div>
                 </span>
            </div>
-            <div class="menu-item  menu-item-lifestyle">
+            <div class="menu-item  menu-item-lifestyle menu-sport">
                 <span class="menu-link-channel menu-link-sport sports-choosen">
                     <a class="text">sport</a>
                     <a class="hover-text">運動</a>
@@ -82,7 +82,7 @@
                      </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-lifestyle">
                 <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
                     <a class="text">lifestyle</a>
                     <a class="hover-text">生活</a>
@@ -94,7 +94,7 @@
                  </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-video">
                 <span class="menu-link-channel menu-link-video video-choosen">
                     <a class="text">video</a>
                     <a class="hover-text">視頻</a>
@@ -102,7 +102,7 @@
                     <div class="submenu submenu-video">
                         <div class="left-menu">
                             {{# videoSubmenu}}
-                            <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelHK')">{{text}}</a>
+                            <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelHK')">{{text}}</a>
                             {{/ videoSubmenu}}
                         </div>
                         <div class="right-content">
@@ -112,7 +112,7 @@
                      </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-magazine">
                 <span class="menu-link-channel menu-link-magazine magazine-choosen ">
                     <a class="text" style="text-align:left;">magazine</a>
                     <a class="hover-text">雜誌</a>
@@ -144,10 +144,10 @@
         </ul>
     </div>
     <div class="minEnterprise" id="minEnterprise" style="display:none;">
-        <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html" onclick="YOHODCLICK('channel','web','homeHK')"></a></div>
+        
         <div class="menubar-header menubar-header-{{channel}}">
         <div class="menubar">
-           <div class="menu-item menu-item-fashion">
+           <div class="menu-item menu-item-fashion menu-fashion">
                 <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
                     <a class="text">fashion</a>
                     <a class="hover-text">時尚</a>
@@ -159,10 +159,10 @@
                     </div>
                 </span>
             </div>
-            <div class="menu-item  menu-item-sports">
+            <div class="menu-item  menu-item-sports menu-beauty">
                 <span class="menu-link-channel menu-link-beauty beauty-choosen">
                     <a class="text">beauty</a>
-                    <a class="hover-text">美麗</a>
+                    <a class="hover-text">美容</a>
                 <a class="menu" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','beautyHK')"></a>
                 <div class="submenu submenu-beauty">
                     <!--<span class="arrow"></span>-->
@@ -171,7 +171,7 @@
                  </div>
                  </span>
            </div>
-            <div class="menu-item  menu-item-lifestyle">
+            <div class="menu-item  menu-item-lifestyle menu-sport">
                 <span class="menu-link-channel menu-link-sport sports-choosen">
                     <a class="text">sport</a>
                     <a class="hover-text">運動</a>
@@ -183,7 +183,7 @@
                  </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-lifestyle">
                 <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
                     <a class="text">lifestyle</a>
                     <a class="hover-text">生活</a>
@@ -195,7 +195,7 @@
                  </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-video">
                 <span class="menu-link-channel menu-link-video video-choosen">
                     <a class="text">video</a>
                     <a class="hover-text">視頻</a>
@@ -203,7 +203,7 @@
                     <div class="submenu submenu-video">
                         <div class="left-menu">
                             {{# videoSubmenu}}
-                            <a class=" menu-text" {{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelHK')">{{text}}</a>
+                            <a class=" menu-text" {{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelHK')">{{text}}</a>
                             {{/ videoSubmenu}}
                         </div>
                         <div class="right-content">
@@ -213,7 +213,7 @@
                      </div>
                  </span>
             </div>
-            <div class="menu-item  menu-item-map">
+            <div class="menu-item  menu-item-map menu-magazine">
                 <span class="menu-link-channel menu-link-magazine magazine-choosen ">
                     <a class="text" style="text-align:left;">magazine</a>
                     <a class="hover-text">雜誌</a>

@@ -102,7 +102,7 @@
                         <div class="submenu submenu-video">
                             <div class="left-menu">
                                 {{# videoSubmenu}}
-                                <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelCN')">{{text}}</a>
+                                <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}}  href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelCN')">{{text}}</a>
                                 {{/ videoSubmenu}}
                             </div>
                             <div class="right-content">
@@ -144,7 +144,8 @@
         </ul>
     </div>
     <div class="minEnterprise" id="minEnterprise" style="display:none;">
-        <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html" onclick="YOHODCLICK('channel','web','homeCN')"></a></div>
+
+    
         <div class="menubar-header menubar-header-{{channel}}">
             <div class="menubar">
                 <div class="menu-item menu-item-fashion menu-fashion">
@@ -162,7 +163,7 @@
                 <div class="menu-item  menu-item-sports menu-beauty">
                     <span class="menu-link-channel menu-link-beauty beauty-choosen">
                         <a class="text">beauty</a>
-                        <a class="hover-text">美丽</a>
+                        <a class="hover-text">美容</a>
                         <a class="menu" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','beautyCN')"></a>
                         <div class="submenu submenu-beauty">
                             <!--<span class="arrow"></span>-->
@@ -203,7 +204,7 @@
                         <div class="submenu submenu-video">
                             <div class="left-menu">
                                 {{# videoSubmenu}}
-                                <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelCN')">{{text}}</a>
+                                <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} href="{{link}}" onclick="YOHODCLICK('channel','web','videoSubChannelCN')">{{text}}</a>
                                 {{/ videoSubmenu}}
                             </div>
                             <div class="right-content">