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

2586703@qq.com
Commit 63761d9d37d88633ff7c193cfb61a89e13ce5230 2 parents 09f0a1ce aadcfd21
Showing 10 changed files with 13 additions and 13 deletions
actions/channel/beauty/index_hk320.html
actions/channel/detail/index_hk320.html
actions/channel/fashion/index_hk320.html
actions/channel/lifestyle/index_hk320.html
actions/channel/magazine/index_hk320.html
actions/channel/sport/index_hk320.html
actions/default/category_hk320.html
actions/default/index_hk320.html
partials/channel/follow_us320.html
partials/channel/follow_us_hk320.html
--- a/actions/channel/beauty/index_hk320.html
View file @63761d9
+++ b/actions/channel/beauty/index_hk320.html
View file @63761d9
@@ -4,7 +4,7 @@
     <ul>
         {{> channel/content320}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 </div>
 {{> default/download_hk320}}
--- a/actions/channel/detail/index_hk320.html
View file @63761d9
+++ b/actions/channel/detail/index_hk320.html
View file @63761d9
@@ -111,7 +111,7 @@
     <ul></ul>
 </div>
 
- {{> common/comment_publish320}}
+ {{> common/comment_publish_hk320}}
 {{> common/comment320}}
 {{> common/third_login320}}
 {{> default/download_hk320}}
--- a/actions/channel/fashion/index_hk320.html
View file @63761d9
+++ b/actions/channel/fashion/index_hk320.html
View file @63761d9
@@ -4,7 +4,7 @@
     <ul>
         {{> channel/content320}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 </div>
 {{> default/download_hk320}}
--- a/actions/channel/lifestyle/index_hk320.html
View file @63761d9
+++ b/actions/channel/lifestyle/index_hk320.html
View file @63761d9
@@ -4,7 +4,7 @@
     <ul>
         {{> channel/content320}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 </div>
 {{> default/download_hk320}}
--- a/actions/channel/magazine/index_hk320.html
View file @63761d9
+++ b/actions/channel/magazine/index_hk320.html
View file @63761d9
@@ -7,7 +7,7 @@
             {{#bannerItem}}
             <li class="swiper-slide">
                 <span>
-                     <img class="swiper-lazy" data-src="{{img}}" alt="banner"/>
+                     <img class="swiper-lazy" data-src="{{img}}" alt=""/>
                     <div class="swiper-lazy-preloader"></div>
                 </span>
             </li>
@@ -21,7 +21,7 @@
     {{/only}}
     <div class="magazine-more">
         <time>{{title}}&nbsp;|&nbsp;{{subTitle}}</time>
-         <span>KD$ 20</span>
+         <span>HKD 20</span>
     </div>
 </div>
 {{/magazineBanner}}
--- a/actions/channel/sport/index_hk320.html
View file @63761d9
+++ b/actions/channel/sport/index_hk320.html
View file @63761d9
@@ -4,7 +4,7 @@
     <ul>
         {{> channel/content320}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 </div>
 {{> default/download_hk320}}
--- a/actions/default/category_hk320.html
View file @63761d9
+++ b/actions/default/category_hk320.html
View file @63761d9
@@ -13,7 +13,7 @@
     <ul>
         {{> channel/content320}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 
 </div>
--- a/actions/default/index_hk320.html
View file @63761d9
+++ b/actions/default/index_hk320.html
View file @63761d9
@@ -79,7 +79,7 @@
         </li>
         {{/ pop}}
     </ul>
-     {{> channel/follow_us320}}
+     {{> channel/follow_us_hk320}}
     {{> channel/page320}}
 </div>
 {{> default/download_hk320}}
--- a/partials/channel/follow_us320.html
View file @63761d9
+++ b/partials/channel/follow_us320.html
View file @63761d9
@@ -9,10 +9,10 @@
             <a target="_blank" href="http://weibo.com/yohomedia" onclick="YOHODCLICK('follow','mobile','followSina')">sina</a>
         </li>
         <li class="follow-facebook">
-             <a target="_blank" href="http://facebook.com/YOHOBOY" onclick="YOHODCLICK('follow','mobile','followFacebook')">facebook</a>
+             <a target="_blank" href="https://www.facebook.com/YOHOGIRL" onclick="YOHODCLICK('follow','mobile','followFacebook')">facebook</a>
         </li>
         <li class="follow-instagram">
-             <a target="_blank" href="http://instagram.com/YOHOBOY" onclick="YOHODCLICK('follow','mobile','followInstagram')">instagram</a>
+             <a target="_blank" href="https://instagram.com/YOHOGIRL" onclick="YOHODCLICK('follow','mobile','followInstagram')">instagram</a>
         </li>
     </ul>
     <div class="rss">
--- a/partials/channel/follow_us_hk320.html
View file @63761d9
+++ b/partials/channel/follow_us_hk320.html
View file @63761d9
@@ -9,10 +9,10 @@
             <a target="_blank" href="http://weibo.com/yohomedia" onclick="YOHODCLICK('follow','mobile','followSina')">sina</a>
         </li>
         <li class="follow-facebook">
-             <a target="_blank" href="http://facebook.com/YOHOBOY" onclick="YOHODCLICK('follow','mobile','followFacebook')">facebook</a>
+             <a target="_blank" href="https://www.facebook.com/YOHOGIRL" onclick="YOHODCLICK('follow','mobile','followFacebook')">facebook</a>
         </li>
         <li class="follow-instagram">
-             <a target="_blank" href="http://instagram.com/YOHOBOY" onclick="YOHODCLICK('follow','mobile','followInstagram')">instagram</a>
+             <a target="_blank" href="https://instagram.com/YOHOGIRL" onclick="YOHODCLICK('follow','mobile','followInstagram')">instagram</a>
         </li>
     </ul>
     <div class="rss">