ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit a5338e52a0d76f5f09cfe38aeabada0d03f78af6 1 parent 4cc72762

修改订阅模板与pc保持统一字段

Inline Side-by-side
Showing 7 changed files with 77 additions and 39 deletions
... ... @@ -23,19 +23,19 @@
<body>
<div class="emailBox">
<div class="webLogo"></div>
{{ #subscribeCancel}}
{{^ emailAddress}}
<h1>取消订阅</h1>
<p class="emial_cancel">请输入您的电子邮件地址，以取消订阅YOHO!Girls</p>
<div class="cancelEmail">
<p><input id="email" type="text"></p>
<a href="{{cancelUrl}}">取消订阅</a>
<a href="javascript:window.location.href = '/passport/subscribe/sendcancel?email='+document.getElementById('email').value" class="cancelBtn">取消订阅</a>
</div>
<p class="newPower">NewPower Co. All Right Reserved</p>
{{/ subscribeCancel}}
{{/ emailAddress}}
{{^ subscribeCancel}}
{{# emailAddress}}
<h1>取消订阅成功</h1>
<div class="cancelForm">
... ... @@ -61,10 +61,29 @@
<p class="pt10"><a class="submitEmail" href="javascript:void(0);">提交</a></p>
</div>
</div>
<p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a></p>
<p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back YOHO！Girls </a></p>
<p class="newPower">NewPower Co. All Right Reserved</p>
{{/ subscribeCancel}}
{{/ emailAddress}}
</div>
{{^ emailAddress}}
<script type="text/javascript">
seajs.use("/js/channel/subscribe",function(email)
{
email.noEmail();
});
</script>
{{/ emailAddress}}
{{# emailAddress}}
<script type="text/javascript">
seajs.use("js/channel/subscribe",function(email)
{
email.hasEmail();
});
</script>
{{/ emailAddress}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/>
<meta property="wb:webmaster" content="5ffc4cd75e724a17"/>
<title>{{title}}</title>
<link rel="dns-prefetch" href="//img01.yohoboys.com"/>
<link rel="dns-prefetch" href="//img02.yohoboys.com"/>
<link rel="dns-prefetch" href="//video.yohoboys.com"/>
... ... @@ -23,26 +24,27 @@
<body>
<div class="emailBox">
<div class="webLogo"></div>
{{^ subscribeCheck}}
{{^ success}}
<h1>验证没有通过，订阅失败！</h1>
{{/ success}}
{{# success}}
{{^ isCancel}}
{{# isFail}}
<h1>验证没有通过，订阅失败！</h1>
{{/ isFail}}
{{^ isFail}}
<h1>
您已订阅！<p>Mail: <span>{{emailUrl}}</span></p>
您已订阅！<p>Mail: <span>{{emailAddress}}</span></p>
</h1>
<p class="isCancel">
一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel" class="underline">取消订阅</a>
</p>
{{/ success}}
{{/ isFail}}
<p class="backyohogirl">
<a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a>
</p>
<p class="newPower">NewPower Co. All Right</p>
{{/ subscribeCheck}}
{{/ isCancel}}
{{# subscribeCheck}}
{{# isCancel}}
<h1>取消订阅成功</h1>
<div class="cancelForm">
... ... @@ -71,7 +73,16 @@
<p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a></p>
<p class="newPower">NewPower Co. All Right Reserved</p>
{{/ subscribeCheck}}
{{/ isCancel}}
</div>
{{# isCancel}}
<script type="text/javascript">
seajs.use("js/channel/subscribe_cancel",function(email)
{
});
</script>
{{/ isCancel}}
</body>
</html>
... ...
... ... @@ -15,6 +15,7 @@
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/>
<meta property="wb:webmaster" content="5ffc4cd75e724a17"/>
<title>{{title}}</title>
<link rel="dns-prefetch" href="//img01.yohoboys.com"/>
<link rel="dns-prefetch" href="//img02.yohoboys.com"/>
<link rel="dns-prefetch" href="//video.yohoboys.com"/>
... ... @@ -23,7 +24,7 @@
<body>
<div class="emailBox">
<div class="webLogo"></div>
{{# subscribe}}
{{^ isFinish}}
<h1>就要完成了...</h1>
<h2>我们需要对您的电子邮件地址进行确认!</h2>
... ... @@ -37,24 +38,24 @@
<p class="newPower">NewPower Co. All Right Reserved</p>
<div class="btnGroup">
<span class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</span>
<span class="CheckEmail" onClick="history.go(-1);">Check my email</span>
<a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>
<a class="CheckEmail" onClick="history.go(-1);" href="{{emailServer}}">Check my email</a>
</div>
{{/ subscribe}}
{{/ isFinish}}
{{^ subscribe}}
{{# isFinish}}
<h1>您已订阅！</h1>
Mail：{{email}}
Mail：{{emailAddress}}
<p class="isCancel">
一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel">取消订阅</a>
</p>
<p class="backyohogirl">
<a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a>
<a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back YOHO！Girls </a>
</p>
<p class="newPower">NewPower Co. All Right Reserved</p>
{{/ subscribe}}
{{/ isFinish}}
</div>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -7,7 +7,12 @@
<div class="result">
{{^ total}}No result{{/ total}}
{{# total}}
{{val}} results
{{# isSingular}}
{{val}} result
{{/ isSingular}}
{{^ isSingular}}
{{val}} results
{{/ isSingular}}
{{/ total}}
</div>
</div>
... ...
... ... @@ -17,9 +17,9 @@
<p>CopyRight © 2015 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
</footer>
</div>
<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/mobile.js"></script>
<!--<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script>-->
<!--<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/mobile.js"></script>-->
<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script>
<script type="text/javascript">
seajs.use(['js/common'], function (common) {
common.init();
... ...
... ... @@ -14,11 +14,12 @@
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<title>{{title}}</title>
<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/mobile.css"/>
<!--<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>-->
<!--<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>-->
<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>
</head>
<body id="{{channel}}">
<div id="mobile-wrap">
... ... @@ -43,13 +44,13 @@
<div class="girl-nav-wrapper">
<nav class="girl-nav swiper-container">
<ul class="swiper-wrapper">
<li data-hash="slide1" class="swiper-slide nav-default"><a href="/mobile.html">home</a></li>
<li data-hash="slide2" class="swiper-slide nav-fashion"><a href="/fashion/mobile.html">fashion</a></li>
<li data-hash="slide3" class="swiper-slide nav-beauty"><a href="/beauty/mobile.html">beauty</a></li>
<li data-hash="slide4" class="swiper-slide nav-sport"><a href="/sports/mobile.html">sport</a></li>
<li data-hash="slide5" class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html">lifestyle</a></li>
<li data-hash="slide6" class="swiper-slide nav-magazine"><a href="/magazine/mobile.html">magazine</a></li>
<li data-hash="slide7" class="swiper-slide nav-video"><a href="/video/mobile.html">video</a></li>
<li class="swiper-slide nav-default"><a href="/mobile.html">home</a></li>
<li class="swiper-slide nav-fashion"><a href="/fashion/mobile.html">fashion</a></li>
<li class="swiper-slide nav-beauty"><a href="/beauty/mobile.html">beauty</a></li>
<li class="swiper-slide nav-sport"><a href="/sports/mobile.html">sport</a></li>
<li class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html">lifestyle</a></li>
<li class="swiper-slide nav-magazine"><a href="/magazine/mobile.html">magazine</a></li>
<li class="swiper-slide nav-video"><a href="/video/mobile.html">video</a></li>
</ul>
</nav>
</div>
\ No newline at end of file
... ...
... ... @@ -14,11 +14,12 @@
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<title>{{title}}</title>
<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/mobile.css"/>
<!--<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>-->
<!--<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>-->
<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>
</head>
<body id="{{channel}}">
<div id="mobile-wrap">
... ...