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 @@ @@ -23,19 +23,19 @@
23 <body> 23 <body>
24 <div class="emailBox"> 24 <div class="emailBox">
25 <div class="webLogo"></div> 25 <div class="webLogo"></div>
26 - {{ #subscribeCancel}} 26 + {{^ emailAddress}}
27 <h1>取消订阅</h1> 27 <h1>取消订阅</h1>
28 28
29 <p class="emial_cancel">请输入您的电子邮件地址，以取消订阅YOHO!Girls</p> 29 <p class="emial_cancel">请输入您的电子邮件地址，以取消订阅YOHO!Girls</p>
30 30
31 <div class="cancelEmail"> 31 <div class="cancelEmail">
32 <p><input id="email" type="text"></p> 32 <p><input id="email" type="text"></p>
33 - <a href="{{cancelUrl}}">取消订阅</a> 33 + <a href="javascript:window.location.href = '/passport/subscribe/sendcancel?email='+document.getElementById('email').value" class="cancelBtn">取消订阅</a>
34 </div> 34 </div>
35 <p class="newPower">NewPower Co. All Right Reserved</p> 35 <p class="newPower">NewPower Co. All Right Reserved</p>
36 - {{/ subscribeCancel}} 36 + {{/ emailAddress}}
37 37
38 - {{^ subscribeCancel}} 38 + {{# emailAddress}}
39 <h1>取消订阅成功</h1> 39 <h1>取消订阅成功</h1>
40 40
41 <div class="cancelForm"> 41 <div class="cancelForm">
@@ -61,10 +61,29 @@ @@ -61,10 +61,29 @@
61 <p class="pt10"><a class="submitEmail" href="javascript:void(0);">提交</a></p> 61 <p class="pt10"><a class="submitEmail" href="javascript:void(0);">提交</a></p>
62 </div> 62 </div>
63 </div> 63 </div>
64 - <p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a></p> 64 + <p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back YOHO！Girls </a></p>
65 65
66 <p class="newPower">NewPower Co. All Right Reserved</p> 66 <p class="newPower">NewPower Co. All Right Reserved</p>
67 - {{/ subscribeCancel}} 67 + {{/ emailAddress}}
68 </div> 68 </div>
  69 +
  70 +{{^ emailAddress}}
  71 +<script type="text/javascript">
  72 + seajs.use("/js/channel/subscribe",function(email)
  73 + {
  74 + email.noEmail();
  75 + });
  76 +</script>
  77 +{{/ emailAddress}}
  78 +
  79 +{{# emailAddress}}
  80 +<script type="text/javascript">
  81 + seajs.use("js/channel/subscribe",function(email)
  82 + {
  83 + email.hasEmail();
  84 + });
  85 +</script>
  86 +{{/ emailAddress}}
  87 +
69 </body> 88 </body>
70 </html> 89 </html>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index, follow"/> 15 <meta name="googlebot" content="index, follow"/>
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/>
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17"/> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17"/>
  18 + <title>{{title}}</title>
18 <link rel="dns-prefetch" href="//img01.yohoboys.com"/> 19 <link rel="dns-prefetch" href="//img01.yohoboys.com"/>
19 <link rel="dns-prefetch" href="//img02.yohoboys.com"/> 20 <link rel="dns-prefetch" href="//img02.yohoboys.com"/>
20 <link rel="dns-prefetch" href="//video.yohoboys.com"/> 21 <link rel="dns-prefetch" href="//video.yohoboys.com"/>
@@ -23,26 +24,27 @@ @@ -23,26 +24,27 @@
23 <body> 24 <body>
24 <div class="emailBox"> 25 <div class="emailBox">
25 <div class="webLogo"></div> 26 <div class="webLogo"></div>
26 - {{^ subscribeCheck}}  
27 - {{^ success}}  
28 - <h1>验证没有通过，订阅失败！</h1>  
29 - {{/ success}}  
30 - {{# success}} 27 + {{^ isCancel}}
  28 + {{# isFail}}
  29 + <h1>验证没有通过，订阅失败！</h1>
  30 + {{/ isFail}}
  31 +
  32 + {{^ isFail}}
31 <h1> 33 <h1>
32 - 您已订阅！<p>Mail: <span>{{emailUrl}}</span></p> 34 + 您已订阅！<p>Mail: <span>{{emailAddress}}</span></p>
33 </h1> 35 </h1>
34 <p class="isCancel"> 36 <p class="isCancel">
35 一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel" class="underline">取消订阅</a> 37 一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel" class="underline">取消订阅</a>
36 </p> 38 </p>
37 - {{/ success}} 39 + {{/ isFail}}
38 <p class="backyohogirl"> 40 <p class="backyohogirl">
39 <a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a> 41 <a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a>
40 </p> 42 </p>
41 43
42 <p class="newPower">NewPower Co. All Right</p> 44 <p class="newPower">NewPower Co. All Right</p>
43 - {{/ subscribeCheck}} 45 + {{/ isCancel}}
44 46
45 - {{# subscribeCheck}} 47 + {{# isCancel}}
46 <h1>取消订阅成功</h1> 48 <h1>取消订阅成功</h1>
47 49
48 <div class="cancelForm"> 50 <div class="cancelForm">
@@ -71,7 +73,16 @@ @@ -71,7 +73,16 @@
71 <p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a></p> 73 <p class="backyohogirl"><a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a></p>
72 74
73 <p class="newPower">NewPower Co. All Right Reserved</p> 75 <p class="newPower">NewPower Co. All Right Reserved</p>
74 - {{/ subscribeCheck}} 76 + {{/ isCancel}}
75 </div> 77 </div>
  78 +
  79 +{{# isCancel}}
  80 +<script type="text/javascript">
  81 +
  82 + seajs.use("js/channel/subscribe_cancel",function(email)
  83 + {
  84 + });
  85 +</script>
  86 +{{/ isCancel}}
76 </body> 87 </body>
77 </html> 88 </html>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index, follow"/> 15 <meta name="googlebot" content="index, follow"/>
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY"/>
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17"/> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17"/>
  18 + <title>{{title}}</title>
18 <link rel="dns-prefetch" href="//img01.yohoboys.com"/> 19 <link rel="dns-prefetch" href="//img01.yohoboys.com"/>
19 <link rel="dns-prefetch" href="//img02.yohoboys.com"/> 20 <link rel="dns-prefetch" href="//img02.yohoboys.com"/>
20 <link rel="dns-prefetch" href="//video.yohoboys.com"/> 21 <link rel="dns-prefetch" href="//video.yohoboys.com"/>
@@ -23,7 +24,7 @@ @@ -23,7 +24,7 @@
23 <body> 24 <body>
24 <div class="emailBox"> 25 <div class="emailBox">
25 <div class="webLogo"></div> 26 <div class="webLogo"></div>
26 - {{# subscribe}} 27 + {{^ isFinish}}
27 <h1>就要完成了...</h1> 28 <h1>就要完成了...</h1>
28 29
29 <h2>我们需要对您的电子邮件地址进行确认!</h2> 30 <h2>我们需要对您的电子邮件地址进行确认!</h2>
@@ -37,24 +38,24 @@ @@ -37,24 +38,24 @@
37 <p class="newPower">NewPower Co. All Right Reserved</p> 38 <p class="newPower">NewPower Co. All Right Reserved</p>
38 39
39 <div class="btnGroup"> 40 <div class="btnGroup">
40 - <span class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</span>  
41 - <span class="CheckEmail" onClick="history.go(-1);">Check my email</span> 41 + <a class="EmailBack" href="javascript:window.close();">&lt;&lt; Back</a>
  42 + <a class="CheckEmail" onClick="history.go(-1);" href="{{emailServer}}">Check my email</a>
42 </div> 43 </div>
43 - {{/ subscribe}} 44 + {{/ isFinish}}
44 45
45 - {{^ subscribe}} 46 + {{# isFinish}}
46 <h1>您已订阅！</h1> 47 <h1>您已订阅！</h1>
47 - Mail：{{email}} 48 + Mail：{{emailAddress}}
48 <p class="isCancel"> 49 <p class="isCancel">
49 一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel">取消订阅</a> 50 一旦您希望停止接收我们的电子邮件，您可以<a href="/passport/subscribe/cancel">取消订阅</a>
50 </p> 51 </p>
51 52
52 <p class="backyohogirl"> 53 <p class="backyohogirl">
53 - <a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back yoho!girl </a> 54 + <a class="times" href="http://newgirls.test.yoho.cn">&lt;&lt; Back YOHO！Girls </a>
54 </p> 55 </p>
55 56
56 <p class="newPower">NewPower Co. All Right Reserved</p> 57 <p class="newPower">NewPower Co. All Right Reserved</p>
57 - {{/ subscribe}} 58 + {{/ isFinish}}
58 </div> 59 </div>
59 </body> 60 </body>
60 </html> 61 </html>
@@ -7,7 +7,12 @@ @@ -7,7 +7,12 @@
7 <div class="result"> 7 <div class="result">
8 {{^ total}}No result{{/ total}} 8 {{^ total}}No result{{/ total}}
9 {{# total}} 9 {{# total}}
10 - {{val}} results 10 + {{# isSingular}}
  11 + {{val}} result
  12 + {{/ isSingular}}
  13 + {{^ isSingular}}
  14 + {{val}} results
  15 + {{/ isSingular}}
11 {{/ total}} 16 {{/ total}}
12 </div> 17 </div>
13 </div> 18 </div>
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 <p>CopyRight © 2015 南京新与力文化传播有限公司<br />苏ICP备09011225号</p> 17 <p>CopyRight © 2015 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
18 </footer> 18 </footer>
19 </div> 19 </div>
20 -<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>  
21 -<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script>  
22 -<!--<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script>--> 20 +<!--<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
  21 +<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script>-->
  22 +<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script>
23 <script type="text/javascript"> 23 <script type="text/javascript">
24 seajs.use(['js/common'], function (common) { 24 seajs.use(['js/common'], function (common) {
25 common.init(); 25 common.init();
@@ -14,11 +14,12 @@ @@ -14,11 +14,12 @@
14 <meta name="googlebot" content="index, follow"/> 14 <meta name="googlebot" content="index, follow"/>
15 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 15 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
16 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 16 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  17 + <title>{{title}}</title>
17 <link rel="dns-prefetch" href="//img01.yohoboys.com" /> 18 <link rel="dns-prefetch" href="//img01.yohoboys.com" />
18 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 19 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
19 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 20 <link rel="dns-prefetch" href="//video.yohoboys.com" />
20 - <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>  
21 - <!--<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>--> 21 + <!--<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>-->
  22 + <link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>
22 </head> 23 </head>
23 <body id="{{channel}}"> 24 <body id="{{channel}}">
24 <div id="mobile-wrap"> 25 <div id="mobile-wrap">
@@ -43,13 +44,13 @@ @@ -43,13 +44,13 @@
43 <div class="girl-nav-wrapper"> 44 <div class="girl-nav-wrapper">
44 <nav class="girl-nav swiper-container"> 45 <nav class="girl-nav swiper-container">
45 <ul class="swiper-wrapper"> 46 <ul class="swiper-wrapper">
46 - <li data-hash="slide1" class="swiper-slide nav-default"><a href="/mobile.html">home</a></li>  
47 - <li data-hash="slide2" class="swiper-slide nav-fashion"><a href="/fashion/mobile.html">fashion</a></li>  
48 - <li data-hash="slide3" class="swiper-slide nav-beauty"><a href="/beauty/mobile.html">beauty</a></li>  
49 - <li data-hash="slide4" class="swiper-slide nav-sport"><a href="/sports/mobile.html">sport</a></li>  
50 - <li data-hash="slide5" class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html">lifestyle</a></li>  
51 - <li data-hash="slide6" class="swiper-slide nav-magazine"><a href="/magazine/mobile.html">magazine</a></li>  
52 - <li data-hash="slide7" class="swiper-slide nav-video"><a href="/video/mobile.html">video</a></li> 47 + <li class="swiper-slide nav-default"><a href="/mobile.html">home</a></li>
  48 + <li class="swiper-slide nav-fashion"><a href="/fashion/mobile.html">fashion</a></li>
  49 + <li class="swiper-slide nav-beauty"><a href="/beauty/mobile.html">beauty</a></li>
  50 + <li class="swiper-slide nav-sport"><a href="/sports/mobile.html">sport</a></li>
  51 + <li class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html">lifestyle</a></li>
  52 + <li class="swiper-slide nav-magazine"><a href="/magazine/mobile.html">magazine</a></li>
  53 + <li class="swiper-slide nav-video"><a href="/video/mobile.html">video</a></li>
53 </ul> 54 </ul>
54 </nav> 55 </nav>
55 </div> 56 </div>
@@ -14,11 +14,12 @@ @@ -14,11 +14,12 @@
14 <meta name="googlebot" content="index, follow"/> 14 <meta name="googlebot" content="index, follow"/>
15 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 15 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
16 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 16 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  17 + <title>{{title}}</title>
17 <link rel="dns-prefetch" href="//img01.yohoboys.com" /> 18 <link rel="dns-prefetch" href="//img01.yohoboys.com" />
18 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 19 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
19 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 20 <link rel="dns-prefetch" href="//video.yohoboys.com" />
20 - <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>  
21 - <!--<link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>--> 21 + <!--<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/mobile.css"/>-->
  22 + <link rel="stylesheet" type="text/css" href="http://cmsres.dev.yoho.cn/dist/mobile.css"/>
22 </head> 23 </head>
23 <body id="{{channel}}"> 24 <body id="{{channel}}">
24 <div id="mobile-wrap"> 25 <div id="mobile-wrap">