ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit b7fa616e1e89d5020f5c06b4ebe754496b62464f 2 parents cf1d32ae cbfad86f

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

Inline Side-by-side
Showing 19 changed files with 232 additions and 166 deletions
1 -{{> layout/header_jian }}  
2 -{{> default/channel_banner}}  
3 -<!--六个小电视-->  
4 -<div class="tv-area">  
5 - {{# tvs}}  
6 - <span class="tv">  
7 - {{# link}}  
8 - <a class="tv-a" href="{{link}}" target="_blank"></a>  
9 - {{/ link}}  
10 - {{^ link}}  
11 - <span class="tv-a" href="{{link}}" target="_blank"></span>  
12 - {{/ link}}  
13 - <img class="tv-img" src="{{img}}" alt="{{alt}}">  
14 - </span>  
15 - {{/ tvs}}  
16 -</div>  
17 -<!--内容列表-->  
18 -<div class="content clearfix">  
19 - {{# topItems}}  
20 - {{> default/default_item}}  
21 - {{/ topItems}}  
22 - <div class="right-advt">  
23 - {{# advert}}  
24 - <a class="link" href="{{link}}" target="_blank">  
25 - <img src="{{img}}" class="img" alt="{{alt}}"/>  
26 - </a>  
27 - {{/ advert}}  
28 -  
29 - <div class="follow-us-default">  
30 - <div class="title">  
31 - {{# fanti}}  
32 - Follow us  
33 - {{/ fanti}} 1 +{{# contentWithNothing}}
  2 + {{> default/index_with_nothing }}
  3 +{{/ contentWithNothing}}
34 4
35 - {{^ fanti}}  
36 - 关注我们  
37 - {{/ fanti}} 5 +{{# contentWithAdvert}}
  6 + {{> default/index_without_centerbanner}}
  7 +{{/ contentWithAdvert}}
38 8
39 - </div>  
40 - <ul class="icons-content">  
41 - <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>  
42 - <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>  
43 - <li class="li-weixin">  
44 - <a class="icons weixin"></a>  
45 - <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>  
46 - </li>  
47 - <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>  
48 - <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>  
49 - </ul>  
50 - <div class="follow-us-input-content">  
51 - <input type="text" value="" class="followus-input" placeholder="me@email.com">  
52 - <button class="button followus-button">订阅</button>  
53 - </div>  
54 - </div>  
55 - </div>  
56 - <!--中间的广告-->  
57 - {{> default/default_advt}}  
58 - <div class="bottom-item-container">  
59 - <!--下面的位置-->  
60 - {{# bottomItems}}  
61 - {{> default/default_item}}  
62 - {{/ bottomItems}}  
63 - {{> default/default_pop}}  
64 -  
65 - <div class="pager-content-default">  
66 - <span class="channel-index-pager">  
67 - {{# pager}}  
68 - <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>  
69 - {{/ pager}}  
70 - </span>  
71 - </div>  
72 - </div>  
73 -</div>  
74 -{{> layout/footer_jian }}  
  9 +{{# contentWithCenterBanner}}
  10 + {{> default/index_without_advert}}
  11 +{{/ contentWithCenterBanner}}
  12 +
  13 +{{# contentWithAll}}
  14 + {{> default/index_with_all}}
  15 +{{/ contentWithAll}}
1 -{{> layout/header_fan}}  
2 -{{> default/channel_banner}}  
3 -<!--六个小电视-->  
4 -<div class="tv-area">  
5 - {{# tvs}}  
6 - <span class="tv">  
7 - {{# link}}  
8 - <a class="tv-a" href="{{link}}" target="_blank"></a>  
9 - {{/ link}}  
10 - {{^ link}}  
11 - <span class="tv-a" href="{{link}}" target="_blank"></span>  
12 - {{/ link}}  
13 - <img class="tv-img" src="{{img}}" alt="{{alt}}">  
14 - </span>  
15 - {{/ tvs}}  
16 -</div>  
17 -<!--内容列表-->  
18 -<div class="content clearfix">  
19 - {{# topItems}}  
20 - {{> default/default_item}}  
21 - {{/ topItems}}  
22 - <div class="right-advt">  
23 - {{# advert}}  
24 - <a class="link" href="{{link}}" target="_blank">  
25 - <img src="{{img}}" class="img" alt="{{alt}}"/>  
26 - </a>  
27 - {{/ advert}}  
28 -  
29 - <div class="follow-us-default">  
30 - <div class="title">  
31 - {{# fanti}}  
32 - Follow us  
33 - {{/ fanti}} 1 +{{# contentWithNothing}}
  2 + {{> default/index_with_nothing }}
  3 +{{/ contentWithNothing}}
34 4
35 - {{^ fanti}}  
36 - 关注我们  
37 - {{/ fanti}}  
38 - </div>  
39 - <ul class="icons-content">  
40 - <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>  
41 - <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>  
42 - <li class="li-weixin">  
43 - <a class="icons weixin"></a>  
44 - <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>  
45 - </li>  
46 - <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>  
47 - <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>  
48 - </ul>  
49 - <div class="follow-us-input-content">  
50 - <input type="text" value="" class="followus-input" placeholder="me@email.com">  
51 - <button class="button followus-button">订阅</button>  
52 - </div>  
53 - </div>  
54 - </div>  
55 - <!--中间的广告-->  
56 - {{> default/default_advt}}  
57 - <div class="bottom-item-container">  
58 - <!--下面的位置-->  
59 - {{# bottomItems}}  
60 - {{> default/default_item}}  
61 - {{/ bottomItems}}  
62 - {{> default/default_pop}}  
63 -  
64 - <div class="pager-content-default">  
65 - <span class="channel-index-pager">  
66 - {{# pager}}  
67 - <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>  
68 - {{/ pager}}  
69 - </span>  
70 - </div>  
71 - </div>  
72 -</div>  
73 -{{> layout/footer_fan }}  
  5 +{{# contentWithAdvert}}
  6 + {{> default/index_without_centerbanner}}
  7 +{{/ contentWithAdvert}}
  8 +
  9 +{{# contentWithCenterBanner}}
  10 + {{> default/index_without_advert}}
  11 +{{/ contentWithCenterBanner}}
  12 +
  13 +{{# contentWithAll}}
  14 + {{> default/index_with_all}}
  15 +{{/ contentWithAll}}
1 {{> layout/header_jian }} 1 {{> layout/header_jian }}
2 -<div id="search-content"> 2 +<div id="search-content" class="clearfix">
3 <div class="search-content"> 3 <div class="search-content">
4 <div class="search-input-content"> 4 <div class="search-input-content">
5 <input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span> 5 <input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>
@@ -7,10 +7,17 @@ @@ -7,10 +7,17 @@
7 <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a> 7 <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
8 </span> 8 </span>
9 <span class="content-item-detail-subchannle" _time="{{time}}"> 9 <span class="content-item-detail-subchannle" _time="{{time}}">
10 - <a href="{{subChannelLink}}">  
11 - {{subChannel}}  
12 - </a>  
13 - &nbsp;/&nbsp;&nbsp;<span></span> 10 + {{# channel}}
  11 + <a href="{{../channelLink}}">
  12 + {{.}}
  13 + </a>&nbsp;/&nbsp;
  14 + {{/ channel}}
  15 + {{# subChannel}}
  16 + <a href="{{../subChannel}}">
  17 + {{.}}
  18 + </a>&nbsp;/&nbsp;
  19 + {{/ subChannel}}
  20 + <span></span>
14 </span> 21 </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> 22 <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> 23 <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 +{{# WEnvironment}}
  2 + <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
  3 +{{/ WEnvironment}}
  4 +
  5 +{{^ WEnvironment}}
  6 + <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_hk.js"></script>
  7 + <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
  8 + <script type="text/javascript">
  9 + seajs.use("index");
  10 + </script>
  11 +{{/ WEnvironment}}
@@ -10,7 +10,9 @@ @@ -10,7 +10,9 @@
10 <div class="wx-popup-hd"> 10 <div class="wx-popup-hd">
11 <span>分享到微信朋友圈</span> 11 <span>分享到微信朋友圈</span>
12 </div> 12 </div>
13 - <div class="wx-popup-bd"></div> 13 + <div class="wx-popup-bd">
  14 + <img src="http://newgirls.test.yoho.cn/go/qrcode?text={{url}}">
  15 + </div>
14 <div class="wx-popup-ft">打開微信，點擊底部的“發現”，使用<br>“掃一掃”即可將網頁分享至朋友圈。</div> 16 <div class="wx-popup-ft">打開微信，點擊底部的“發現”，使用<br>“掃一掃”即可將網頁分享至朋友圈。</div>
15 </div> 17 </div>
16 </li> 18 </li>
@@ -2,9 +2,17 @@ @@ -2,9 +2,17 @@
2 <a href="{{link}}" target="_blank" class="img-link" title="{{title}}"> 2 <a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
3 <img class="img lazy" data-original="{{img}}" alt="{{title}}"/> 3 <img class="img lazy" data-original="{{img}}" alt="{{title}}"/>
4 <span class="arrow-bottom girl-channel-arrow"></span> 4 <span class="arrow-bottom girl-channel-arrow"></span>
  5 + {{# isVideo}}<span class="video-icon-Fragment"></span>{{/ isVideo}}
5 </a> 6 </a>
6 <div class="item-text-area"> 7 <div class="item-text-area">
7 - <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span> 8 + <span class="item-date" _time="{{time}}">
  9 + {{# channel}}
  10 + <a class="channel" href="{{../channelURL}}" target="_blank">{{.}}</a> /
  11 + {{/ channel}}
  12 + {{# subChannel}}
  13 + <a class="channel" href="{{../subChannelLink}}" target="_blank">{{.}}</a> /
  14 + {{/ subChannel}}
  15 + </span>
8 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a> 16 <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> 17 <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> 18 <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>
1 -<div class='pop-container' {{# centerBanner}} style="border-top:0;"{{/centerBanner}}> 1 +
  2 +<div class='pop-container' style="position:relative;">
2 <span class='pop-text'>#POP</span> 3 <span class='pop-text'>#POP</span>
3 <div class="swiper-container3"> 4 <div class="swiper-container3">
4 <span class='pop-img-container swiper-wrapper'> 5 <span class='pop-img-container swiper-wrapper'>
5 {{# pop}} 6 {{# pop}}
6 - <a class='pop-link swiper-slide' href="{{link}}" target="_blank"> 7 + <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
7 <img src='{{img}}' class='img'/> 8 <img src='{{img}}' class='img'/>
8 - <span class='title'_title='{{title}}'>{{title}}</span> 9 + <a class='title'_title='{{title}}'>{{title}}</a>
9 <span class='date default-pop-date' _time='{{time}}'> 10 <span class='date default-pop-date' _time='{{time}}'>
10 {{#if channelClass}} 11 {{#if channelClass}}
11 - <a target="_blank" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;  
12 - {{/if}}</span>  
13 - <span class='detail' _title='{{detail}}'>{{detail}}</span>  
14 - </a> 12 + <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
  13 + {{/if}}
  14 + </span>
  15 + <a class='detail' _title='{{detail}}'>{{detail}}</a>
  16 + </span>
15 {{/ pop}} 17 {{/ pop}}
16 </span> 18 </span>
17 </div> 19 </div>
1 -<div class='pop-container' style='position:relative;'> 1 +
  2 +<div class='pop-container' style="position:relative;">
2 <span class='pop-text'>#POP</span> 3 <span class='pop-text'>#POP</span>
3 <div class="swiper-container3"> 4 <div class="swiper-container3">
4 <span class='pop-img-container swiper-wrapper'> 5 <span class='pop-img-container swiper-wrapper'>
5 {{# pop}} 6 {{# pop}}
6 - <a class='pop-link swiper-slide' href="{{link}}" target="_blank"> 7 + <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
7 <img src='{{img}}' class='img'/> 8 <img src='{{img}}' class='img'/>
8 - <span class='title'_title='{{title}}'>{{title}}</span>  
9 - <span class='date' _title='{{date}}'>{{date}}</span>  
10 - <span class='detail' _title='{{detail}}'>{{detail}}</span>  
11 - </a> 9 + <a class='title'_title='{{title}}'>{{title}}</a>
  10 + <span class='date default-pop-date' _time='{{time}}'>
  11 + {{#if channelClass}}
  12 + <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
  13 + {{/if}}
  14 + </span>
  15 + <a class='detail' _title='{{detail}}'>{{detail}}</a>
  16 + </span>
12 {{/ pop}} 17 {{/ pop}}
13 </span> 18 </span>
14 </div> 19 </div>
  1 +{{> layout/header_jian }}
  2 +{{> default/channel_banner}}
  3 +<!--六个小电视-->
  4 +<div class="tv-area">
  5 + {{# tvs}}
  6 + <span class="tv">
  7 + {{# link}}
  8 + <a class="tv-a" href="{{link}}" target="_blank"></a>
  9 + {{/ link}}
  10 + {{^ link}}
  11 + <span class="tv-a" href="{{link}}" target="_blank"></span>
  12 + {{/ link}}
  13 + <img class="tv-img" src="{{img}}" alt="{{alt}}">
  14 + </span>
  15 + {{/ tvs}}
  16 +</div>
  17 +<!--内容列表-->
  18 +<div class="content clearfix">
  19 + {{# topItems}}
  20 + {{> default/default_item}}
  21 + {{/ topItems}}
  22 + <div class="right-advt">
  23 + {{# advert}}
  24 + <a class="link" href="{{link}}" target="_blank">
  25 + <img src="{{img}}" class="img" alt="{{alt}}"/>
  26 + </a>
  27 + {{/ advert}}
  28 +
  29 + <div class="follow-us-default">
  30 + <div class="title">
  31 + {{# fanti}}
  32 + Follow us
  33 + {{/ fanti}}
  34 +
  35 + {{^ fanti}}
  36 + 关注我们
  37 + {{/ fanti}}
  38 +
  39 + </div>
  40 + <ul class="icons-content">
  41 + <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
  42 + <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
  43 + <li class="li-weixin">
  44 + <a class="icons weixin"></a>
  45 + <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
  46 + </li>
  47 + <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
  48 + <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
  49 + </ul>
  50 + <div class="follow-us-input-content">
  51 + <input type="text" value="" class="followus-input" placeholder="me@email.com">
  52 + <button class="button followus-button">订阅</button>
  53 + </div>
  54 + </div>
  55 + </div>
  56 + <!--中间的广告-->
  57 + {{> default/default_advt}}
  58 + <div class="bottom-item-container">
  59 + <!--下面的位置-->
  60 + {{# bottomItems}}
  61 + {{> default/default_item}}
  62 + {{/ bottomItems}}
  63 + {{> default/default_pop}}
  64 +
  65 + <div class="pager-content-default">
  66 + <span class="channel-index-pager">
  67 + {{# pager}}
  68 + <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
  69 + {{/ pager}}
  70 + </span>
  71 + </div>
  72 + </div>
  73 +</div>
  74 +{{> layout/footer_jian }}
  1 +{{> layout/header_jian }}
  2 +{{> default/channel_banner}}
  3 +<!--六个小电视-->
  4 +<div class="tv-area">
  5 + {{# tvs}}
  6 + <span class="tv">
  7 + {{# link}}
  8 + <a class="tv-a" href="{{link}}" target="_blank"></a>
  9 + {{/ link}}
  10 + {{^ link}}
  11 + <span class="tv-a" href="{{link}}" target="_blank"></span>
  12 + {{/ link}}
  13 + <img class="tv-img" src="{{img}}" alt="{{alt}}">
  14 + </span>
  15 + {{/ tvs}}
  16 +</div>
  17 +<!--内容列表-->
  18 +<div class="content clearfix">
  19 + {{# topItems}}
  20 + {{> default/default_item}}
  21 + {{/ topItems}}
  22 + <div class="right-advt">
  23 + {{# advert}}
  24 + <a class="link" href="{{link}}" target="_blank">
  25 + <img src="{{img}}" class="img" alt="{{alt}}"/>
  26 + </a>
  27 + {{/ advert}}
  28 +
  29 + <div class="follow-us-default">
  30 + <div class="title">
  31 + {{# fanti}}
  32 + Follow us
  33 + {{/ fanti}}
  34 +
  35 + {{^ fanti}}
  36 + 关注我们
  37 + {{/ fanti}}
  38 +
  39 + </div>
  40 + <ul class="icons-content">
  41 + <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
  42 + <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
  43 + <li class="li-weixin">
  44 + <a class="icons weixin"></a>
  45 + <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
  46 + </li>
  47 + <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
  48 + <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
  49 + </ul>
  50 + <div class="follow-us-input-content">
  51 + <input type="text" value="" class="followus-input" placeholder="me@email.com">
  52 + <button class="button followus-button">订阅</button>
  53 + </div>
  54 + </div>
  55 + </div>
  56 + <!--中间的广告-->
  57 + {{> default/default_advt}}
  58 + <div class="bottom-item-container">
  59 + <!--下面的位置-->
  60 + {{# bottomItems}}
  61 + {{> default/default_item}}
  62 + {{/ bottomItems}}
  63 + {{> default/default_pop}}
  64 +
  65 + <div class="pager-content-default">
  66 + <span class="channel-index-pager">
  67 + {{# pager}}
  68 + <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
  69 + {{/ pager}}
  70 + </span>
  71 + </div>
  72 + </div>
  73 +</div>
  74 +{{> layout/footer_jian }}
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{/if}} 8 {{/if}}
9 <a href="{{channelLink}}">{{channel}}</a> 9 <a href="{{channelLink}}">{{channel}}</a>
10 {{#if twoChannel}} 10 {{#if twoChannel}}
11 - <a href="{{twoChannelLink}}">{{twoChannel}}</a> 11 + <a href="{{twoChannelLink}}">,{{twoChannel}}</a>
12 {{/if}} 12 {{/if}}
13 &nbsp;|&nbsp; 13 &nbsp;|&nbsp;
14 <a class="detail-time" href="javascript:;" _time="{{time}}"></a> 14 <a class="detail-time" href="javascript:;" _time="{{time}}"></a>
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 </div> 39 </div>
40 {{> common/menu}} 40 {{> common/menu}}
41 {{> common/menu_withleft}} 41 {{> common/menu_withleft}}
42 -{{> common/environment_js}} 42 +{{> common/environment_hk_js}}
43 {{> common/script}} 43 {{> common/script}}
44 </body> 44 </body>
45 45