ued / yohogirls_mustache · Commits

Go to a project

Authored by 2586703@qq.com
Commit 0e469e7ba14cf89465067279c6f0b3b20fa20891 2 parents 9b35fb82 180f9c12

Merge branch 'develop' into test 

调试冲突
Conflicts:
	partials/layout/footer_jian.html
Inline Side-by-side
Showing 4 changed files with 58 additions and 60 deletions
  1 +
  2 +{{# showFollowus}}
1 <div class="content-item-without-border" style="margin-top:0;"> 3 <div class="content-item-without-border" style="margin-top:0;">
2 <div class="follow-us"> 4 <div class="follow-us">
3 {{^ fanti}} 5 {{^ fanti}}
@@ -28,4 +30,5 @@ @@ -28,4 +30,5 @@
28 {{/ fanti}} 30 {{/ fanti}}
29 </div> 31 </div>
30 </div> 32 </div>
31 -</div>  
  33 +</div>
  34 +{{/ showFollowus}}
1 <div class="detail-title"> 1 <div class="detail-title">
2 <h1>{{title}}</h1> 2 <h1>{{title}}</h1>
3 <h2>{{subtitle}}</h2> 3 <h2>{{subtitle}}</h2>
4 - <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p> 4 + {{#if author}}
  5 + <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
  6 + {{^}}
  7 + <p class="detail-category">{{class}}&nbsp;|&nbsp;{{time}}</p>
  8 + {{/if}}
  9 +
5 </div> 10 </div>
@@ -23,12 +23,12 @@ @@ -23,12 +23,12 @@
23 <div class="bottom-right"> 23 <div class="bottom-right">
24 <div class="div-right"> 24 <div class="div-right">
25 <span class="span-links"> 25 <span class="span-links">
26 - <a class="links" href="{{aboutUsUrl}}">關於我們</a><a class="line"></a>  
27 - <a class="links" href="{{contactusUrl}}">聯繫我們</a><a class="line"></a>  
28 - <a class="links" href="{{serversUrl}}">版權聲明</a><a class="line"></a>  
29 - <a class="links" href="{{privacyUrl}}">隱私條款</a><a class="line"></a>  
30 - <a class="links" href="{{feedbackUrl}}">意見反饋</a><a class="line"></a>  
31 - <a class="links" href="{{linksUrl}}">友情鏈接</a> 26 + <a class="links" href="./channel/about/index">關於我們</a><a class="line"></a>
  27 + <a class="links" href="./channel/about/contactus">聯繫我們</a><a class="line"></a>
  28 + <a class="links" href="./channel/about/servers">版權聲明</a><a class="line"></a>
  29 + <a class="links" href="./channel/about/privacy">隱私條款</a><a class="line"></a>
  30 + <a class="links" href="./channel/about/feedback">意見反饋</a><a class="line"></a>
  31 + <a class="links" href="./channel/about/links">友情鏈接</a>
32 </span> 32 </span>
33 <span class="span-right"> 33 <span class="span-right">
34 CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號 34 CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號
1 -  
2 -  
3 -  
4 - <div class="return-to-top" style="opacity: 0.7;"></div>  
5 - <div class="bottom-content">  
6 - <div class="boys">  
7 - <span class="boybitmap"></span>  
8 - <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>  
9 - <span class="text-area">  
10 - <a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a>  
11 - <a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a>  
12 - <a class="detail" target="_blank" href="{{boyDownloadUrl}}">线上周刊，潮流百科生活</a>  
13 - </span>  
14 - </div>  
15 - <span class='split-line'></span>  
16 - <div class="girls">  
17 - <span class="girlbitmap"></span>  
18 - <span class="icon"><a href="{{girlDownloadUrl}}" target="_blank"></a></span>  
19 - <span class="text-area">  
20 - <a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a>  
21 - <a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a>  
22 - <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>  
23 - </span>  
24 - </div>  
25 - </div>  
26 - <div class="bottom-right">  
27 - <div class="div-right">  
28 - <span class="span-links">  
29 - <a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a>  
30 - <a class="links" href="{{contactusUrl}}">联系我们</a><a class="line"></a>  
31 - <a class="links" href="{{serversUrl}}">版权声明</a><a class="line"></a>  
32 - <a class="links" href="{{privacyUrl}}">隐私条款</a><a class="line"></a>  
33 - <a class="links" href="{{feedbackUrl}}">意见反馈</a><a class="line"></a>  
34 - <a class="links" href="{{linksUrl}}">友情链接</a>  
35 - </span>  
36 - <span class="span-right">  
37 - CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号  
38 - </span>  
39 - </div>  
40 - </div>  
41 -  
42 - </body>  
43 - {{> common/menu}}  
44 - {{> common/menu_withleft}}  
45 -  
46 -  
47 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>  
48 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>  
49 - <script type="text/javascript">  
50 - seajs.use("index");  
51 - </script>  
52 - {{> common/script}} 1 +<div class="return-to-top" style="opacity: 0.7;"></div>
  2 +<div class="bottom-content">
  3 + <div class="boys">
  4 + <span class="boybitmap"></span>
  5 + <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
  6 + <span class="text-area">
  7 + <a class="title" target="_blank" href="{{boyDownloadUrl}}">YOHO!BOYS</a>
  8 + <a class="subtitle" target="_blank" href="{{boyDownloadUrl}}">We love to Play &amp; Lean</a>
  9 + <a class="detail" target="_blank" href="{{boyDownloadUrl}}">线上周刊，潮流百科生活</a>
  10 + </span>
  11 + </div>
  12 + <span class='split-line'></span>
  13 + <div class="girls">
  14 + <span class="girlbitmap"></span>
  15 + <span class="icon"><a href="{{girlDownloadUrl}}" target="_blank"></a></span>
  16 + <span class="text-area">
  17 + <a class="title" target="_blank" href="{{girlDownloadUrl}}">YOHO!GIRLS</a>
  18 + <a class="subtitle" target="_blank" href="{{girlDownloadUrl}}">No Fashion,No Life</a>
  19 + <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
  20 + </span>
  21 + </div>
  22 +</div>
  23 +<div class="bottom-right">
  24 + <div class="div-right">
  25 + <span class="span-links">
  26 + <a class="links" href="channel/about/index">关于我们</a><a class="line"></a>
  27 + <a class="links" href="./channel/about/contactus">联系我们</a><a class="line"></a>
  28 + <a class="links" href="./channel/about/servers">版权声明</a><a class="line"></a>
  29 + <a class="links" href="./channel/about/privacy">隐私条款</a><a class="line"></a>
  30 + <a class="links" href="./channel/about/feedback">意见反馈</a><a class="line"></a>
  31 + <a class="links" href="./channel/about/links">友情链接</a>
  32 + </span>
  33 + <span class="span-right">
  34 + CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
  35 + </span>
  36 + </div>
  37 +</div>
  38 +{{> common/menu}}
  39 +{{> common/menu_withleft}}
  40 +<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
  41 +{{> common/script}}
  42 +</body>
53 </html> 43 </html>