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 @@
<!--magazine-banner-->
{{#magazineBanner}}
<div class="magazine-banner">
<div class="{{^isOne}}swiper-container{{/isOne}} public-banner">
<div class="{{^only}}swiper-container{{/only}} public-banner">
<ul class="swiper-wrapper">
{{#bannerItem}}
<li class="swiper-slide">
... ... @@ -13,11 +13,11 @@
{{/bannerItem}}
</ul>
</div>
{{^isOne}}
{{^only}}
<div class="pagination-wrap">
<div class="pagination"></div>
</div>
{{/isOne}}
{{/only}}
<div class="magazine-more">
<time>2014.10.15 ／全智贤</time>
<span>RBM 15</span>
... ...
... ... @@ -2,12 +2,12 @@
{{> channel/banner320}}
<div class="video swiper-container">
<ul class="swiper-wrapper">
{{#video}}
{{#tvs}}
<li class="swiper-slide">
<a href="{{link}}" target="_blank"></a>
<img src="{{img}}" alt="">
</li>
{{/video}}
{{/tvs}}
</ul>
</div>
<!--content-->
... ...
... ... @@ -10,7 +10,7 @@
<a href="{{subChannelLink}}">
{{subChannel}}
</a>
&nbsp;/&nbsp;&nbsp;<span>{{date}}</span>
&nbsp;/&nbsp;&nbsp;<span></span>
</span>
<a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>
<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>
... ...
<div class="pager-content">
<div class="channel-index-pager pager-channel-{{channel}}">
<a class="pager-item pager-item-choosen">1</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">2</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-3.html">3</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-4.html">4</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-5.html">5</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-6.html">6</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-7.html">7</a>
<a class="ellipsis">...</a><a class="pager-item" href="http://newboys.test.yoho.cn/index-78.html">78</a>
<a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">&gt;</a>
</div>
</div>
\ No newline at end of file
... ... @@ -4,7 +4,7 @@
<span class="arrow-bottom girl-channel-arrow"></span>
</a>
<div class="item-text-area">
<span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / {{date}}</span>
<span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span>
<a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>
<a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a>
<a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>
... ...
... ... @@ -44,4 +44,5 @@
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
{{> common/script}}
</html>
\ No newline at end of file
</html>
... ...
<div class="return-to-top" style="opacity: 0.7;"></div>
<div class="bottom-content">
<div class="boys">
... ... @@ -50,5 +51,3 @@
</script>
{{> common/script}}
</html>
... ...
<!doctype html>
<html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{{title}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0 user-scalable=no" />
<meta content="yes" name="apple-mobile-web-app-capable" />
<meta content="telephone=no" name="format-detection" />
<meta content="black" name="apple-mobile-web-app-status-bar-style" />
<meta name="keywords" content="{{keywords}}" />
<meta name="description" content="{{description}}" />
<meta name="author" content="yohogirls.com" />
<meta name="robots" content="index, follow"/>
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Yoho!Girls | No Fashion, No Life!</title>
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
</head>
<body>
<!--开头的集团导航-->
... ... @@ -30,13 +17,136 @@
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
<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>
<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>
</ul>
</div>
<!--高的集团导航-->
<div class="enterprise" id="maxEnterprise">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">時尚</a>
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美麗</a>
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sport-choosen">
<a class="text">sports</a>
<a class="hover-text">運動</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sport">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">視頻</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<div class="left-menu">
{{# videoSubmenu}}
<a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
{{/ videoSubmenu}}
</div>
<div class="right-content">
</div>
<div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine magazine-choosen ">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">雜誌</a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="../search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
<input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
<a searchURL="..\search" class="home-search-button" id="search-button" style="display: none;" value=""></a>
</span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
<div class="enterprise-header-content enterprise-header-fixed">
<ul class="enterprise-header">
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集團官網</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有貨</span><a href="http://www.yohobuy.com" target="_blank">潮流購物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
<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>
</ul>
</div>
<div class="minEnterprise" id="minEnterprise" style="display:none;">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
... ... @@ -46,25 +156,7 @@
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">测试添加热播资讯</span>
<span class="text detail">热播资讯添加</span>
</div>
<div class="content-item-menu">
<a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">再次发布一条新资讯</span>
<span class="text detail">测试发布资讯</span>
</div>
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
<span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
<span class="text">测试封面图片添加测试封面图片添加</span>
<span class="text detail">测试封面测试封面测试</span>
</div>
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
<div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
</div>
</span>
... ... @@ -78,54 +170,18 @@
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">测试添加热播资讯</span>
<span class="text detail">热播资讯添加</span>
</div>
<div class="content-item-menu">
<a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">再次发布一条新资讯</span>
<span class="text detail">测试发布资讯</span>
</div>
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
<span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
<span class="text">测试封面图片添加测试封面图片添加</span>
<span class="text detail">测试封面测试封面测试</span>
</div>
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
<div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sports sports-choosen">
<span class="menu-link-channel menu-link-sport sports-choosen">
<a class="text">sports</a>
<a class="hover-text">運動</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sports">
<div class="submenu submenu-sport">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">测试添加热播资讯</span>
<span class="text detail">热播资讯添加</span>
</div>
<div class="content-item-menu">
<a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">再次发布一条新资讯</span>
<span class="text detail">测试发布资讯</span>
</div>
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
<span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
<span class="text">测试封面图片添加测试封面图片添加</span>
<span class="text detail">测试封面测试封面测试</span>
</div>
<div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
<div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
</div>
</span>
</div>
... ... @@ -136,25 +192,7 @@
<a class="menu" href="/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">测试添加热播资讯</span>
<span class="text detail">热播资讯添加</span>
</div>
<div class="content-item-menu">
<a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">再次发布一条新资讯</span>
<span class="text detail">测试发布资讯</span>
</div>
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
<span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
<span class="text">测试封面图片添加测试封面图片添加</span>
<span class="text detail">测试封面测试封面测试</span>
</div>
<div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
<div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
</div>
</span>
</div>
... ... @@ -163,32 +201,20 @@
<a class="text">video</a>
<a class="hover-text">視頻</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">测试添加热播资讯</span>
<span class="text detail">热播资讯添加</span>
</div>
<div class="content-item-menu">
<a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>
<a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>
<span class="text">再次发布一条新资讯</span>
<span class="text detail">测试发布资讯</span>
</div>
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>
<span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>
<span class="text">测试封面图片添加测试封面图片添加</span>
<span class="text detail">测试封面测试封面测试</span>
</div>
<div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
</div>
<div class="submenu submenu-video">
<div class="left-menu">
{{# videoSubmenu}}
<a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
{{/ videoSubmenu}}
</div>
<div class="right-content">
</div>
<div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-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>
<a class="menu" href="/magazine/index.html"></a>
... ... @@ -197,8 +223,6 @@
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
... ... @@ -210,5 +234,7 @@
</div>
</div>
</div>
{{# scrollToContent}}
<input type="hidden" id="scrollToContent"/>
{{/ scrollToContent}}
... ...
... ... @@ -235,3 +235,8 @@
</div>
</div>
</div>
{{# scrollToContent}}
<input type="hidden" id="scrollToContent"/>
{{/ scrollToContent}}
... ...