Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
Showing
11 changed files
with
30 additions
and
23 deletions
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | <div class="magazine-more"> | 22 | <div class="magazine-more"> |
| 23 | <time>2014.10.15 ／全智贤</time> | 23 | <time>2014.10.15 ／全智贤</time> |
| 24 | <span>RBM 15</span> | 24 | <span>RBM 15</span> |
| 25 | - <a href="{{buyLink}}" class="buy">立即购买</a> | 25 | + {{# buyLink}}<a href="{{.}}" class="buy">立即购买</a>{{/ buyLink}} |
| 26 | </div> | 26 | </div> |
| 27 | </div> | 27 | </div> |
| 28 | {{/magazineBanner}} | 28 | {{/magazineBanner}} |
| @@ -22,7 +22,6 @@ | @@ -22,7 +22,6 @@ | ||
| 22 | <div class="magazine-more"> | 22 | <div class="magazine-more"> |
| 23 | <time>2014.10.15 ／全智賢</time> | 23 | <time>2014.10.15 ／全智賢</time> |
| 24 | <span>RBM 15</span> | 24 | <span>RBM 15</span> |
| 25 | - <a href="{{buyLink}}" class="buy">立即購買</a> | ||
| 26 | </div> | 25 | </div> |
| 27 | </div> | 26 | </div> |
| 28 | {{/magazineBanner}} | 27 | {{/magazineBanner}} |
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | {{#content}} | 6 | {{#content}} |
| 7 | <li class="content-item channel-{{channelType}}"> | 7 | <li class="content-item channel-{{channelType}}"> |
| 8 | <a class="img-link" href="{{link}}" target="_blank"> | 8 | <a class="img-link" href="{{link}}" target="_blank"> |
| 9 | - <img src="{{img}}" alt=""/> | 9 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> | 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> |
| 11 | </a> | 11 | </a> |
| 12 | 12 | ||
| @@ -18,7 +18,9 @@ | @@ -18,7 +18,9 @@ | ||
| 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 19 | </h3> | 19 | </h3> |
| 20 | <time> | 20 | <time> |
| 21 | - <a href="{{channelLink}}" target="_blank">{{channel}}</a> | <span time="{{time}}" class="time-format"></span> | 21 | + {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} |
| 22 | + {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | ||
| 23 | + <span time="{{time}}" class="time-format"></span> | ||
| 22 | </time> | 24 | </time> |
| 23 | <p> | 25 | <p> |
| 24 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> | 26 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> |
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | {{#content}} | 6 | {{#content}} |
| 7 | <li class="content-item channel-{{channelType}}"> | 7 | <li class="content-item channel-{{channelType}}"> |
| 8 | <a class="img-link" href="{{link}}" target="_blank"> | 8 | <a class="img-link" href="{{link}}" target="_blank"> |
| 9 | - <img src="{{img}}" alt=""/> | 9 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> | 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> |
| 11 | </a> | 11 | </a> |
| 12 | 12 | ||
| @@ -18,7 +18,9 @@ | @@ -18,7 +18,9 @@ | ||
| 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 19 | </h3> | 19 | </h3> |
| 20 | <time> | 20 | <time> |
| 21 | - <a href="{{channelLink}}" target="_blank">{{channel}}</a> | <span time="{{time}}" class="time-format"></span> | 21 | + {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} |
| 22 | + {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | ||
| 23 | + <span time="{{time}}" class="time-format"></span> | ||
| 22 | </time> | 24 | </time> |
| 23 | <p> | 25 | <p> |
| 24 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> | 26 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> |
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | {{# content}} | 16 | {{# content}} |
| 17 | <li class="content-item channel-{{channelType}}"> | 17 | <li class="content-item channel-{{channelType}}"> |
| 18 | <a class="img-link" href="{{link}}" target="_blank"> | 18 | <a class="img-link" href="{{link}}" target="_blank"> |
| 19 | - <img src="{{img}}" alt=""/> | 19 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 20 | </a> | 20 | </a> |
| 21 | <h2> | 21 | <h2> |
| 22 | <a href="{{link}}" target="_blank">{{title}}</a> | 22 | <a href="{{link}}" target="_blank">{{title}}</a> |
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | {{# pop}} | 37 | {{# pop}} |
| 38 | <li id="{{type}}-pop" class="content-item"> | 38 | <li id="{{type}}-pop" class="content-item"> |
| 39 | <a class="img-link" href="{{link}}" target="_blank"> | 39 | <a class="img-link" href="{{link}}" target="_blank"> |
| 40 | - <img src="{{img}}" alt=""/> | 40 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 41 | </a> | 41 | </a> |
| 42 | <h2> | 42 | <h2> |
| 43 | <a href="{{link}}" target="_blank">{{title}}</a> | 43 | <a href="{{link}}" target="_blank">{{title}}</a> |
| @@ -46,7 +46,9 @@ | @@ -46,7 +46,9 @@ | ||
| 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 47 | </h3> | 47 | </h3> |
| 48 | <time> | 48 | <time> |
| 49 | - <a href="{{channelLink}}" target="_blank">{{channel}}</a> | <span time="{{time}}" class="time-format"></span> | 49 | + {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} |
| 50 | + {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | ||
| 51 | + <span time="{{time}}" class="time-format"></span> | ||
| 50 | </time> | 52 | </time> |
| 51 | <p> | 53 | <p> |
| 52 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> | 54 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> |
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | {{# content}} | 16 | {{# content}} |
| 17 | <li class="content-item channel-{{channelType}}"> | 17 | <li class="content-item channel-{{channelType}}"> |
| 18 | <a class="img-link" href="{{link}}" target="_blank"> | 18 | <a class="img-link" href="{{link}}" target="_blank"> |
| 19 | - <img src="{{img}}" alt=""/> | 19 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 20 | </a> | 20 | </a> |
| 21 | <h2> | 21 | <h2> |
| 22 | <a href="{{link}}" target="_blank">{{title}}</a> | 22 | <a href="{{link}}" target="_blank">{{title}}</a> |
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | {{# pop}} | 37 | {{# pop}} |
| 38 | <li id="{{type}}-pop" class="content-item"> | 38 | <li id="{{type}}-pop" class="content-item"> |
| 39 | <a class="img-link" href="{{link}}" target="_blank"> | 39 | <a class="img-link" href="{{link}}" target="_blank"> |
| 40 | - <img src="{{img}}" alt=""/> | 40 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 41 | </a> | 41 | </a> |
| 42 | <h2> | 42 | <h2> |
| 43 | <a href="{{link}}" target="_blank">{{title}}</a> | 43 | <a href="{{link}}" target="_blank">{{title}}</a> |
| @@ -46,7 +46,9 @@ | @@ -46,7 +46,9 @@ | ||
| 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 47 | </h3> | 47 | </h3> |
| 48 | <time> | 48 | <time> |
| 49 | - <a href="{{channelLink}}" target="_blank">{{channel}}</a> | <span time="{{time}}" class="time-format"></span> | 49 | + {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} |
| 50 | + {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | ||
| 51 | + <span time="{{time}}" class="time-format"></span> | ||
| 50 | </time> | 52 | </time> |
| 51 | <p> | 53 | <p> |
| 52 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> | 54 | <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a> |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <span class="search_btn"></span> | 5 | <span class="search_btn"></span> |
| 6 | </div> | 6 | </div> |
| 7 | <div class="result"> | 7 | <div class="result"> |
| 8 | - {{^ noq}} | 8 | + {{# noq}} |
| 9 | {{# total}} | 9 | {{# total}} |
| 10 | {{# isSingular}} | 10 | {{# isSingular}} |
| 11 | {{val}} result | 11 | {{val}} result |
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | {{/ noq}} | 22 | {{/ noq}} |
| 23 | </div> | 23 | </div> |
| 24 | </div> | 24 | </div> |
| 25 | -{{^ noq}} | 25 | +{{# noq}} |
| 26 | {{^ total}} | 26 | {{^ total}} |
| 27 | <div style="text-align:center;font-size:20px;">未搜索到相关结果</div> | 27 | <div style="text-align:center;font-size:20px;">未搜索到相关结果</div> |
| 28 | {{/ total}} | 28 | {{/ total}} |
| 1 | -{{> layout/writer_header_hk320}} | 1 | +{{> layout/writer_header320}} |
| 2 | <div class="search"> | 2 | <div class="search"> |
| 3 | <div class="search_input"> | 3 | <div class="search_input"> |
| 4 | <input type="text" placeholder="{{searchText}}" autocomplete="off" class="ac_input"> | 4 | <input type="text" placeholder="{{searchText}}" autocomplete="off" class="ac_input"> |
| 5 | <span class="search_btn"></span> | 5 | <span class="search_btn"></span> |
| 6 | </div> | 6 | </div> |
| 7 | <div class="result"> | 7 | <div class="result"> |
| 8 | - {{^ noq}} | 8 | + {{# noq}} |
| 9 | {{# total}} | 9 | {{# total}} |
| 10 | {{# isSingular}} | 10 | {{# isSingular}} |
| 11 | {{val}} result | 11 | {{val}} result |
| @@ -22,9 +22,9 @@ | @@ -22,9 +22,9 @@ | ||
| 22 | {{/ noq}} | 22 | {{/ noq}} |
| 23 | </div> | 23 | </div> |
| 24 | </div> | 24 | </div> |
| 25 | -{{^ noq}} | 25 | +{{# noq}} |
| 26 | {{^ total}} | 26 | {{^ total}} |
| 27 | -<div style="text-align:center;font-size:20px;">未搜索到相关结果</div> | 27 | +<div style="text-align:center;font-size:20px;">未搜索到相關結果</div> |
| 28 | {{/ total}} | 28 | {{/ total}} |
| 29 | {{/ noq}} | 29 | {{/ noq}} |
| 30 | <!--content--> | 30 | <!--content--> |
| @@ -36,5 +36,5 @@ | @@ -36,5 +36,5 @@ | ||
| 36 | {{> channel/page320}} | 36 | {{> channel/page320}} |
| 37 | 37 | ||
| 38 | </div> | 38 | </div> |
| 39 | -{{> default/download_hk320}} | ||
| 40 | -{{> layout/footer_hk320}} | ||
| 39 | +{{> default/download320}} | ||
| 40 | +{{> layout/footer320}} |
| 1 | {{#content}} | 1 | {{#content}} |
| 2 | <li class="content-item channel-{{channelType}}"> | 2 | <li class="content-item channel-{{channelType}}"> |
| 3 | <a class="img-link" href="{{link}}" target="_blank"> | 3 | <a class="img-link" href="{{link}}" target="_blank"> |
| 4 | - <img src="{{img}}" alt=""/> | 4 | + <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 5 | </a> | 5 | </a> |
| 6 | <h2> | 6 | <h2> |
| 7 | <a href="{{link}}" target="_blank">{{title}}</a> | 7 | <a href="{{link}}" target="_blank">{{title}}</a> |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <span class="come-back">返回顶部</span> | 3 | <span class="come-back">返回顶部</span> |
| 4 | <div class="login-language"> | 4 | <div class="login-language"> |
| 5 | <span class="side-bar-header">登录</span> | 5 | <span class="side-bar-header">登录</span> |
| 6 | - <a class="language" href="/go/location">简繁体</a> | 6 | + <a class="language" href="/go/location">繁体</a> |
| 7 | </div> | 7 | </div> |
| 8 | <ul class="info"> | 8 | <ul class="info"> |
| 9 | <li><a href="http://newgirls.test.yoho.cn/channel/about/index">关于</a></li> | 9 | <li><a href="http://newgirls.test.yoho.cn/channel/about/index">关于</a></li> |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <span class="come-back">返回頂部</span> | 3 | <span class="come-back">返回頂部</span> |
| 4 | <div class="login-language"> | 4 | <div class="login-language"> |
| 5 | <span class="side-bar-header">登錄</span> | 5 | <span class="side-bar-header">登錄</span> |
| 6 | - <a class="language" href="/go/location">簡繁體</a> | 6 | + <a class="language" href="/go/location">簡體</a> |
| 7 | </div> | 7 | </div> |
| 8 | <ul class="info"> | 8 | <ul class="info"> |
| 9 | <li><a href="http://newgirls.test.yoho.cn/channel/about/index">關於</a></li> | 9 | <li><a href="http://newgirls.test.yoho.cn/channel/about/index">關於</a></li> |
-
Please register or login to post a comment