ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 54dae804ee56059bce95fecc889f075ff089c3f7 2 parents 1c6f21f0 1ab5e227

Merge branch 'web_develop' into develop

Inline Side-by-side
Showing 11 changed files with 78 additions and 34 deletions
<div class="{{# no-border}}content-item-without-border{{/ no-border}}{{^ no-border}}content-item{{/ no-border}} {{# isMid}} content-item-mid{{/ isMid}}">
<span class="content-item-detail-a-img">
<a href="{{link}}" target="_blank" class="link" title="{{title}}" onclick="YOHODCLICK('channel','web','content')">
<img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
<img class="lazy pic" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==" data-original="{{img}}" alt="{{title}}" style="display: inline;">
<span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span>
</a>
<a href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}" onclick="YOHODCLICK('channel','web','content')"></a>
... ...
... ... @@ -2,6 +2,7 @@
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
{{/ devEnvironment}}
{{# prevEnvironment}}
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
{{/ prevEnvironment}}
... ... @@ -10,4 +11,5 @@
{{/ testEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
{{/ prodEnvironment}}
\ No newline at end of file
{{/ prodEnvironment}}
... ...
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ devEnvironment}}{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prevEnvironment}}{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ testEnvironment}}{{# prodEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prodEnvironment}}
\ No newline at end of file
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ devEnvironment}}{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prevEnvironment}}{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ testEnvironment}}{{# prodEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prodEnvironment}}
... ...
{{# WEnvironment}}
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
{{/ WEnvironment}}
{{^ WEnvironment}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_hk.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
{{/ WEnvironment}}
\ No newline at end of file
{{# devEnvironment}}
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
{{/ devEnvironment}}
{{# prevEnvironment}}
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
{{/ prevEnvironment}}
{{# testEnvironment}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
{{/ testEnvironment}}
{{# prodEnvironment}}
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
{{/ prodEnvironment}}
\ No newline at end of file
... ...
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}}{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}}{{# prodEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prodEnvironment}}
\ No newline at end of file
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}}{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}}{{# prodEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prodEnvironment}}
... ...
... ... @@ -2,7 +2,10 @@
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
{{/ devEnvironment}}
{{# prevEnvironment}}
{{# prevEnvironment}}
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
... ... @@ -13,15 +16,19 @@
{{# testEnvironment}}
{{# testEnvironment}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
{{/ testEnvironment}}
{{# prodEnvironment}}
{{# prodEnvironment}}
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
... ...
<div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}} {{# channelType}}content-{{.}}{{/ channelType}}">
<a href="{{link}}" target="_blank" class="img-link" title="{{title}}" onclick="YOHODCLICK('home','web','content')">
<img class="img lazy" data-original="{{img}}" alt="{{title}}"/>
<a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
<img class="img lazy" data-original="{{img}}" alt="{{title}}" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=="/>
<span class="arrow-bottom girl-channel-arrow"></span>
{{# isVideo}}<span class="video-icon-Fragment"></span>{{/ isVideo}}
</a>
... ... @@ -15,7 +17,7 @@
</span>{{# title}}
<a class="item-title" href="{{link}}" target="_blank" _title="{{title}}" onclick="YOHODCLICK('home','web','content')" style="text-align:left;" >{{.}}</a>{{/ title}}
{{# subtitle}}
<a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}" style="margin-top:5px;text-align:left;" onclick="YOHODCLICK('home','web','content')">{{.}}</a>
<a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}" style="margin-top:10px;text-align:left;" onclick="YOHODCLICK('home','web','content')">{{.}}</a>
{{/ subtitle}}
<a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}"
style="text-align:left;" onclick="YOHODCLICK('home','web','content')">{{content}}</a>
... ...
... ... @@ -4,7 +4,7 @@
<span class="pop-img-container swiper-wrapper">
{{# pop}}
<span class="pop-link swiper-slide" href="{{link}}" target="_blank">
<a><img src="{{img}}" class="img"/></a>
<a class="a-img"><img src="{{img}}"/></a>
<a href="{{link}}" class="title"_title="{{title}}" onclick="YOHODCLICK('home','web','popContent')">{{title}}</a>
<span class="date default-pop-date" _time="{{time}}">
{{#if channelClass}}
... ...
... ... @@ -16,7 +16,9 @@
<p>CopyRight &copy; 2015 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
</footer>
</div>
{{> common/environment320_js}}
<script type="text/javascript">
seajs.use(['js/common'], function (common)
{
... ...
... ... @@ -16,7 +16,9 @@
<p>CopyRight &copy; 2015 南京新與力文化傳播有限公司<br />蘇ICP備09011225號</p>
</footer>
</div>
{{> common/environment320_js}}
<script type="text/javascript">
seajs.use(['js/common'], function (common)
{
... ...
... ... @@ -46,7 +46,7 @@
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html" onclick="YOHODCLICK('channel','web','homeCN')"></a></div>
<div class="menubar-header menubar-header-{{channel}}">
<div class="menubar">
<div class="menu-item menu-item-fashion">
<div class="menu-item menu-item-fashion menu-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
... ... @@ -58,7 +58,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<div class="menu-item menu-item-sports menu-beauty">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美容</a>
... ... @@ -70,7 +70,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<div class="menu-item menu-item-lifestyle menu-sport">
<span class="menu-link-channel menu-link-sport sports-choosen">
<a class="text">sport</a>
<a class="hover-text">运动</a>
... ... @@ -82,7 +82,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-lifestyle">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
... ... @@ -94,7 +94,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-video">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
... ... @@ -112,7 +112,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-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>
... ... @@ -147,7 +147,7 @@
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="/index.html" onclick="YOHODCLICK('channel','web','homeCN')"></a></div>
<div class="menubar-header menubar-header-{{channel}}">
<div class="menubar">
<div class="menu-item menu-item-fashion">
<div class="menu-item menu-item-fashion menu-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
... ... @@ -159,7 +159,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<div class="menu-item menu-item-sports menu-beauty">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
... ... @@ -171,7 +171,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<div class="menu-item menu-item-lifestyle menu-sport">
<span class="menu-link-channel menu-link-sport sports-choosen">
<a class="text">sport</a>
<a class="hover-text">运动</a>
... ... @@ -183,7 +183,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-lifestyle">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
... ... @@ -195,7 +195,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-video">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
... ... @@ -213,7 +213,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<div class="menu-item menu-item-map menu-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>
... ...