ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7
Commit 711d5f647c4d86a43cdef805eff4dab3eea229cf 2 parents 67c62bb9 66691cb2

Merge branch 'develop' into test 

Conflicts:
	partials/layout/footer_fan.html
	partials/layout/footer_jian.html
	partials/layout/header_fan.html
	partials/layout/header_jian.html
Inline Side-by-side
Showing 9 changed files with 167 additions and 149 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!--magazine-banner--> 2 <!--magazine-banner-->
3 {{#magazineBanner}} 3 {{#magazineBanner}}
4 <div class="magazine-banner"> 4 <div class="magazine-banner">
5 - <div class="{{^isOne}}swiper-container{{/isOne}} public-banner"> 5 + <div class="{{^only}}swiper-container{{/only}} public-banner">
6 <ul class="swiper-wrapper"> 6 <ul class="swiper-wrapper">
7 {{#bannerItem}} 7 {{#bannerItem}}
8 <li class="swiper-slide"> 8 <li class="swiper-slide">
@@ -13,11 +13,11 @@ @@ -13,11 +13,11 @@
13 {{/bannerItem}} 13 {{/bannerItem}}
14 </ul> 14 </ul>
15 </div> 15 </div>
16 - {{^isOne}} 16 + {{^only}}
17 <div class="pagination-wrap"> 17 <div class="pagination-wrap">
18 <div class="pagination"></div> 18 <div class="pagination"></div>
19 </div> 19 </div>
20 - {{/isOne}} 20 + {{/only}}
21 <div class="magazine-more"> 21 <div class="magazine-more">
22 <time>2014.10.15 ／全智贤</time> 22 <time>2014.10.15 ／全智贤</time>
23 <span>RBM 15</span> 23 <span>RBM 15</span>
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 {{> channel/banner320}} 2 {{> channel/banner320}}
3 <div class="video swiper-container"> 3 <div class="video swiper-container">
4 <ul class="swiper-wrapper"> 4 <ul class="swiper-wrapper">
5 - {{#video}} 5 + {{#tvs}}
6 <li class="swiper-slide"> 6 <li class="swiper-slide">
7 <a href="{{link}}" target="_blank"></a> 7 <a href="{{link}}" target="_blank"></a>
8 <img src="{{img}}" alt=""> 8 <img src="{{img}}" alt="">
9 </li> 9 </li>
10 - {{/video}} 10 + {{/tvs}}
11 </ul> 11 </ul>
12 </div> 12 </div>
13 <!--content--> 13 <!--content-->
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <a href="{{subChannelLink}}"> 10 <a href="{{subChannelLink}}">
11 {{subChannel}} 11 {{subChannel}}
12 </a> 12 </a>
13 - &nbsp;/&nbsp;&nbsp;<span>{{date}}</span> 13 + &nbsp;/&nbsp;&nbsp;<span></span>
14 </span> 14 </span>
15 <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a> 15 <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>
16 <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a> 16 <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a>
1 -<div class="pager-content">  
2 - <div class="channel-index-pager pager-channel-{{channel}}">  
3 - <a class="pager-item pager-item-choosen">1</a>  
4 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">2</a>  
5 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-3.html">3</a>  
6 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-4.html">4</a>  
7 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-5.html">5</a>  
8 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-6.html">6</a>  
9 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-7.html">7</a>  
10 - <a class="ellipsis">...</a><a class="pager-item" href="http://newboys.test.yoho.cn/index-78.html">78</a>  
11 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">&gt;</a>  
12 - </div>  
13 -</div>  
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <span class="arrow-bottom girl-channel-arrow"></span> 4 <span class="arrow-bottom girl-channel-arrow"></span>
5 </a> 5 </a>
6 <div class="item-text-area"> 6 <div class="item-text-area">
7 - <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / {{date}}</span> 7 + <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span>
8 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a> 8 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>
9 <a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a> 9 <a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a>
10 <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a> 10 <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>
@@ -44,4 +44,5 @@ @@ -44,4 +44,5 @@
44 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script> 44 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
45 {{> common/script}} 45 {{> common/script}}
46 46
47 -</html>  
  47 +</html>
  48 +
1 1
2 2
  3 +
3 <div class="return-to-top" style="opacity: 0.7;"></div> 4 <div class="return-to-top" style="opacity: 0.7;"></div>
4 <div class="bottom-content"> 5 <div class="bottom-content">
5 <div class="boys"> 6 <div class="boys">
@@ -50,5 +51,3 @@ @@ -50,5 +51,3 @@
50 </script> 51 </script>
51 {{> common/script}} 52 {{> common/script}}
52 </html> 53 </html>
53 -  
54 -  
1 -<!doctype html>  
2 -<html> 1 +
  2 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  3 +"http://www.w3.org/TR/html4/loose.dtd">
  4 +<html xmlns="http://www.w3.org/1999/xhtml">
3 <head> 5 <head>
4 - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />  
5 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  
6 - <title>{{title}}</title>  
7 - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0 user-scalable=no" />  
8 - <meta content="yes" name="apple-mobile-web-app-capable" />  
9 - <meta content="telephone=no" name="format-detection" />  
10 - <meta content="black" name="apple-mobile-web-app-status-bar-style" />  
11 - <meta name="keywords" content="{{keywords}}" />  
12 - <meta name="description" content="{{description}}" />  
13 - <meta name="author" content="yohogirls.com" />  
14 - <meta name="robots" content="index, follow"/>  
15 - <meta name="googlebot" content="index, follow"/>  
16 - <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />  
17 - <meta property="wb:webmaster" content="5ffc4cd75e724a17" />  
18 - <link rel="dns-prefetch" href="//img01.yohoboys.com" />  
19 - <link rel="dns-prefetch" href="//img02.yohoboys.com" />  
20 - <link rel="dns-prefetch" href="//video.yohoboys.com" />  
21 - <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" /> 6 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  7 + <title>Yoho!Girls | No Fashion, No Life!</title>
  8 + <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
22 </head> 9 </head>
23 <body> 10 <body>
24 <!--开头的集团导航--> 11 <!--开头的集团导航-->
@@ -30,13 +17,136 @@ @@ -30,13 +17,136 @@
30 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
31 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
32 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li> 19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
33 - <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newboys.test.yoho.cn/go/location">繁</a></li> 20 + <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newgirls.test.yoho.cn/go/location">繁</a></li>
34 </ul> 21 </ul>
35 </div> 22 </div>
36 23
37 <!--高的集团导航--> 24 <!--高的集团导航-->
38 <div class="enterprise" id="maxEnterprise"> 25 <div class="enterprise" id="maxEnterprise">
39 - <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div> 26 + <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
  27 + <div class='menubar-header menubar-header-{{channel}}'>
  28 + <div class="menubar">
  29 + <div class="menu-item menu-item-fashion">
  30 + <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
  31 + <a class="text">fashion</a>
  32 + <a class="hover-text">時尚</a>
  33 + <a class="menu" href="/fashion/index.html"></a>
  34 + <div class="submenu submenu-fashion">
  35 +
  36 + <!--<span class="arrow"></span>-->
  37 + <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
  38 + </div>
  39 + </span>
  40 +
  41 + </div>
  42 +
  43 + <div class="menu-item menu-item-sports">
  44 + <span class="menu-link-channel menu-link-beauty beauty-choosen">
  45 +
  46 + <a class="text">beauty</a>
  47 + <a class="hover-text">美麗</a>
  48 + <a class="menu" href="/beauty/index.html"></a>
  49 + <div class="submenu submenu-beauty">
  50 + <!--<span class="arrow"></span>-->
  51 + <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
  52 + </div>
  53 + </span>
  54 + </div>
  55 + <div class="menu-item menu-item-lifestyle">
  56 + <span class="menu-link-channel menu-link-sport sport-choosen">
  57 + <a class="text">sports</a>
  58 + <a class="hover-text">運動</a>
  59 + <a class="menu" href="/sports/index.html"></a>
  60 + <div class="submenu submenu-sport">
  61 + <!--<span class="arrow"></span>-->
  62 + <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
  63 + </div>
  64 + </span>
  65 + </div>
  66 + <div class="menu-item menu-item-map">
  67 + <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
  68 + <a class="text">lifestyle</a>
  69 + <a class="hover-text">生活</a>
  70 + <a class="menu" href="/lifestyle/index.html"></a>
  71 + <div class="submenu submenu-lifestyle">
  72 + <!--<span class="arrow"></span>-->
  73 + <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
  74 + </div>
  75 + </span>
  76 + </div>
  77 + <div class="menu-item menu-item-map">
  78 + <span class="menu-link-channel menu-link-video video-choosen">
  79 + <a class="text">video</a>
  80 + <a class="hover-text">視頻</a>
  81 + <a class="menu" href="/video/index.html"></a>
  82 + <div class="submenu submenu-video">
  83 + <div class="left-menu">
  84 + {{# videoSubmenu}}
  85 + <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
  86 + {{/ videoSubmenu}}
  87 + </div>
  88 + <div class="right-content">
  89 + </div>
  90 + <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
  91 + </div>
  92 + </span>
  93 + </div>
  94 + <div class="menu-item menu-item-map">
  95 + <span class="menu-link-channel menu-link-magazine magazine-choosen ">
  96 + <a class="text" style="text-align:left;">magazine</a>
  97 + <a class="hover-text">雜誌</a>
  98 + <a class="menu" href="/magazine/index.html"></a>
  99 + </span>
  100 + </div>
  101 + <span class="right iconfont search-area">
  102 + <span class="search-loading-icon" style="display: none;"></span>
  103 + <a class="search-icon" href="../search"></a>
  104 +
  105 +
  106 + <span class="search-text search-text-big" style="display: inline;">
  107 + <span class="search-text-content">search...</span>
  108 +
  109 + <input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
  110 + <a searchURL="..\search" class="home-search-button" id="search-button" style="display: none;" value=""></a>
  111 + </span>
  112 + <span class="splitline"></span>
  113 + </span>
  114 + </div>
  115 + </div>
  116 + </div>
  117 +
  118 +
  119 +
  120 +
  121 +
  122 +
  123 +
  124 +
  125 +
  126 +
  127 +
  128 +
  129 +
  130 +
  131 +
  132 +
  133 +
  134 + <div class="enterprise-header-content enterprise-header-fixed">
  135 + <ul class="enterprise-header">
  136 + <li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集團官網</a></li>
  137 + <li class="item enterprise-youhuo"><span>YOHO!有貨</span><a href="http://www.yohobuy.com" target="_blank">潮流購物</a></li>
  138 + <li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
  139 + <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
  140 + <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
  141 + <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
  142 + <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newgirls.test.yoho.cn/go/location">繁</a></li>
  143 + </ul>
  144 + </div>
  145 +
  146 +
  147 +
  148 + <div class="minEnterprise" id="minEnterprise" style="display:none;">
  149 + <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
40 <div class='menubar-header menubar-header-{{channel}}'> 150 <div class='menubar-header menubar-header-{{channel}}'>
41 <div class="menubar"> 151 <div class="menubar">
42 <div class="menu-item menu-item-fashion"> 152 <div class="menu-item menu-item-fashion">
@@ -46,25 +156,7 @@ @@ -46,25 +156,7 @@
46 <a class="menu" href="/fashion/index.html"></a> 156 <a class="menu" href="/fashion/index.html"></a>
47 <div class="submenu submenu-fashion"> 157 <div class="submenu submenu-fashion">
48 <!--<span class="arrow"></span>--> 158 <!--<span class="arrow"></span>-->
49 - <div class="content-item-menu">  
50 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
51 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
52 - <span class="text">测试添加热播资讯</span>  
53 - <span class="text detail">热播资讯添加</span>  
54 - </div>  
55 - <div class="content-item-menu">  
56 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
57 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
58 - <span class="text">再次发布一条新资讯</span>  
59 - <span class="text detail">测试发布资讯</span>  
60 - </div>  
61 - <div class="content-item-menu">  
62 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
63 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
64 - <span class="text">测试封面图片添加测试封面图片添加</span>  
65 - <span class="text detail">测试封面测试封面测试</span>  
66 - </div>  
67 - <div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div> 159 + <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
68 </div> 160 </div>
69 </span> 161 </span>
70 162
@@ -78,54 +170,18 @@ @@ -78,54 +170,18 @@
78 <a class="menu" href="/beauty/index.html"></a> 170 <a class="menu" href="/beauty/index.html"></a>
79 <div class="submenu submenu-beauty"> 171 <div class="submenu submenu-beauty">
80 <!--<span class="arrow"></span>--> 172 <!--<span class="arrow"></span>-->
81 - <div class="content-item-menu">  
82 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
83 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
84 - <span class="text">测试添加热播资讯</span>  
85 - <span class="text detail">热播资讯添加</span>  
86 - </div>  
87 - <div class="content-item-menu">  
88 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
89 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
90 - <span class="text">再次发布一条新资讯</span>  
91 - <span class="text detail">测试发布资讯</span>  
92 - </div>  
93 - <div class="content-item-menu">  
94 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
95 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
96 - <span class="text">测试封面图片添加测试封面图片添加</span>  
97 - <span class="text detail">测试封面测试封面测试</span>  
98 - </div>  
99 - <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div> 173 + <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
100 </div> 174 </div>
101 </span> 175 </span>
102 </div> 176 </div>
103 <div class="menu-item menu-item-lifestyle"> 177 <div class="menu-item menu-item-lifestyle">
104 - <span class="menu-link-channel menu-link-sports sports-choosen"> 178 + <span class="menu-link-channel menu-link-sport sports-choosen">
105 <a class="text">sports</a> 179 <a class="text">sports</a>
106 <a class="hover-text">運動</a> 180 <a class="hover-text">運動</a>
107 <a class="menu" href="/sports/index.html"></a> 181 <a class="menu" href="/sports/index.html"></a>
108 - <div class="submenu submenu-sports"> 182 + <div class="submenu submenu-sport">
109 <!--<span class="arrow"></span>--> 183 <!--<span class="arrow"></span>-->
110 - <div class="content-item-menu">  
111 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
112 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
113 - <span class="text">测试添加热播资讯</span>  
114 - <span class="text detail">热播资讯添加</span>  
115 - </div>  
116 - <div class="content-item-menu">  
117 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
118 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
119 - <span class="text">再次发布一条新资讯</span>  
120 - <span class="text detail">测试发布资讯</span>  
121 - </div>  
122 - <div class="content-item-menu">  
123 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
124 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
125 - <span class="text">测试封面图片添加测试封面图片添加</span>  
126 - <span class="text detail">测试封面测试封面测试</span>  
127 - </div>  
128 - <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div> 184 + <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
129 </div> 185 </div>
130 </span> 186 </span>
131 </div> 187 </div>
@@ -136,25 +192,7 @@ @@ -136,25 +192,7 @@
136 <a class="menu" href="/lifestyle/index.html"></a> 192 <a class="menu" href="/lifestyle/index.html"></a>
137 <div class="submenu submenu-lifestyle"> 193 <div class="submenu submenu-lifestyle">
138 <!--<span class="arrow"></span>--> 194 <!--<span class="arrow"></span>-->
139 - <div class="content-item-menu">  
140 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
141 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
142 - <span class="text">测试添加热播资讯</span>  
143 - <span class="text detail">热播资讯添加</span>  
144 - </div>  
145 - <div class="content-item-menu">  
146 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
147 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
148 - <span class="text">再次发布一条新资讯</span>  
149 - <span class="text detail">测试发布资讯</span>  
150 - </div>  
151 - <div class="content-item-menu">  
152 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
153 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
154 - <span class="text">测试封面图片添加测试封面图片添加</span>  
155 - <span class="text detail">测试封面测试封面测试</span>  
156 - </div>  
157 - <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div> 195 + <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
158 </div> 196 </div>
159 </span> 197 </span>
160 </div> 198 </div>
@@ -163,32 +201,20 @@ @@ -163,32 +201,20 @@
163 <a class="text">video</a> 201 <a class="text">video</a>
164 <a class="hover-text">視頻</a> 202 <a class="hover-text">視頻</a>
165 <a class="menu" href="/video/index.html"></a> 203 <a class="menu" href="/video/index.html"></a>
166 - <div class="submenu submenu-video">  
167 - <!--<span class="arrow"></span>-->  
168 - <div class="content-item-menu">  
169 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
170 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
171 - <span class="text">测试添加热播资讯</span>  
172 - <span class="text detail">热播资讯添加</span>  
173 - </div>  
174 - <div class="content-item-menu">  
175 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
176 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
177 - <span class="text">再次发布一条新资讯</span>  
178 - <span class="text detail">测试发布资讯</span>  
179 - </div>  
180 - <div class="content-item-menu">  
181 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
182 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
183 - <span class="text">测试封面图片添加测试封面图片添加</span>  
184 - <span class="text detail">测试封面测试封面测试</span>  
185 - </div>  
186 - <div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>  
187 - </div> 204 + <div class="submenu submenu-video">
  205 + <div class="left-menu">
  206 + {{# videoSubmenu}}
  207 + <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
  208 + {{/ videoSubmenu}}
  209 + </div>
  210 + <div class="right-content">
  211 + </div>
  212 + <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
  213 + </div>
188 </span> 214 </span>
189 </div> 215 </div>
190 <div class="menu-item menu-item-map"> 216 <div class="menu-item menu-item-map">
191 - <span class="menu-link-channel menu-link-magazine"> 217 + <span class="menu-link-channel menu-link-magazine magazine-choosen ">
192 <a class="text" style="text-align:left;">magazine</a> 218 <a class="text" style="text-align:left;">magazine</a>
193 <a class="hover-text">雜誌</a> 219 <a class="hover-text">雜誌</a>
194 <a class="menu" href="/magazine/index.html"></a> 220 <a class="menu" href="/magazine/index.html"></a>
@@ -197,8 +223,6 @@ @@ -197,8 +223,6 @@
197 <span class="right iconfont search-area"> 223 <span class="right iconfont search-area">
198 <span class="search-loading-icon" style="display: none;"></span> 224 <span class="search-loading-icon" style="display: none;"></span>
199 <a class="search-icon" href="/search"></a> 225 <a class="search-icon" href="/search"></a>
200 -  
201 -  
202 <span class="search-text search-text-big" style="display: inline;"> 226 <span class="search-text search-text-big" style="display: inline;">
203 <span class="search-text-content">search...</span> 227 <span class="search-text-content">search...</span>
204 228
@@ -210,5 +234,7 @@ @@ -210,5 +234,7 @@
210 </div> 234 </div>
211 </div> 235 </div>
212 </div> 236 </div>
  237 + {{# scrollToContent}}
  238 + <input type="hidden" id="scrollToContent"/>
  239 + {{/ scrollToContent}}
213 240
214 -  
@@ -235,3 +235,8 @@ @@ -235,3 +235,8 @@
235 </div> 235 </div>
236 </div> 236 </div>
237 </div> 237 </div>
  238 +
  239 +
  240 + {{# scrollToContent}}
  241 + <input type="hidden" id="scrollToContent"/>
  242 + {{/ scrollToContent}}