ued / yohogirls_mustache · Commits

Go to a project

Authored by 2586703@qq.com
Commit 216f5b7c37ad80df7a575de429adcba39c6d6c48 2 parents aed18f59 8689d020

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

Conflicts:
	partials/common/environment_images.html
Inline Side-by-side
Showing 6 changed files with 68 additions and 42 deletions
{{# success}}<!doctype html>
<!doctype html>
<html lang="en">
<head>
... ... @@ -17,31 +18,9 @@
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
{{> common/environment_css}}
</head>
{{^ isFinish}}
<body>
<div class="emailBox">
<h1>就要完成了...</h1>
<p class="mb5">我们需要对您的电子邮件地址进行确认！</p>
{{^ success}}
<p class="mb20">发送邮件失败，请返回再次发送。</p>
{{/ success}}
{{# success}}
<p class="mb20">完成订阅过程，请点击我们刚刚发给您的电子邮件中的链接。</p>
{{/ success}}
<p class="black">NewPower Co. All Right Reserved</p>
<div class="btnGroup clearfix">
<a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>
<a class="CheckEmail" href="{{emailServer}}">Check my email</a>
</div>
</div>
{{/ isFinish}}
</head><body>
{{# isFinish}}
{{#if isFinish}}
<div class="emailBox">
<div class="webLogo">
... ... @@ -60,8 +39,27 @@
<p class="backYohoBoys"><a class="times" href="javascript:history.go(-1)">&lt;&lt; Back YOHO！Girls </a></p>
<p class="black">NewPower Co. All Right Reserved</p>
</div>
{{else}}
<div class="emailBox">
<h1>就要完成了...</h1>
<p class="mb5">我们需要对您的电子邮件地址进行确认！</p>
{{^ success}}
<p class="mb20">发送邮件失败，请返回再次发送。</p>
{{/ success}}
{{/ isFinish}}
{{# success}}
<p class="mb20">完成订阅过程，请点击我们刚刚发给您的电子邮件中的链接。</p>
{{/ success}}
<p class="black">NewPower Co. All Right Reserved</p>
<div class="btnGroup clearfix">
<a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>
<a class="CheckEmail" href="{{emailServer}}">Check my email</a>
</div>
</div>
{{/if}}
</body>
... ...
... ... @@ -14,7 +14,7 @@
{{#if fanti}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>Sorry,Nothing Found!</strong></p>
{{else}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>为搜索到相关结果！</strong></p>
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>未搜索到相关结果！</strong></p>
{{/if}}
{{/if}}
... ...
{{# WEnvironment}}
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
{{/ WEnvironment}}
{{# devEnvironment}}
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
{{/ devEnvironment}}
{{^ WEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
{{/ WEnvironment}}
\ No newline at end of file
{{# prevEnvironment}}
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
{{/ prevEnvironment}}
{{# testEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
{{/ 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
... ...
{{# WEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ WEnvironment}}
{{^ WEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ WEnvironment}}
\ 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}}
\ No newline at end of file
... ...
{{# WEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ WEnvironment}}
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}
{{^ WEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ WEnvironment}}
\ No newline at end of file
{{# 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}}
... ...
{{# WEnvironment}}
{{# devEnvironment}}
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
{{/ WEnvironment}}
{{/ devEnvironment}}
{{^ WEnvironment}}
{{^ 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>
{{/ WEnvironment}}
\ No newline at end of file
{{/ 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}}
... ...