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 30 additions and 32 deletions
{{# showFollowus}}
<div class="content-item-without-border" style="margin-top:0;">
<div class="follow-us">
{{^ fanti}}
... ... @@ -29,3 +31,4 @@
</div>
</div>
</div>
{{/ showFollowus}}
\ No newline at end of file
... ...
<div class="detail-title">
<h1>{{title}}</h1>
<h2>{{subtitle}}</h2>
{{#if author}}
<p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
{{^}}
<p class="detail-category">{{class}}&nbsp;|&nbsp;{{time}}</p>
{{/if}}
</div>
\ No newline at end of file
... ...
... ... @@ -23,12 +23,12 @@
<div class="bottom-right">
<div class="div-right">
<span class="span-links">
<a class="links" href="{{aboutUsUrl}}">關於我們</a><a class="line"></a>
<a class="links" href="{{contactusUrl}}">聯繫我們</a><a class="line"></a>
<a class="links" href="{{serversUrl}}">版權聲明</a><a class="line"></a>
<a class="links" href="{{privacyUrl}}">隱私條款</a><a class="line"></a>
<a class="links" href="{{feedbackUrl}}">意見反饋</a><a class="line"></a>
<a class="links" href="{{linksUrl}}">友情鏈接</a>
<a class="links" href="./channel/about/index">關於我們</a><a class="line"></a>
<a class="links" href="./channel/about/contactus">聯繫我們</a><a class="line"></a>
<a class="links" href="./channel/about/servers">版權聲明</a><a class="line"></a>
<a class="links" href="./channel/about/privacy">隱私條款</a><a class="line"></a>
<a class="links" href="./channel/about/feedback">意見反饋</a><a class="line"></a>
<a class="links" href="./channel/about/links">友情鏈接</a>
</span>
<span class="span-right">
CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號
... ...
<div class="return-to-top" style="opacity: 0.7;"></div>
<div class="bottom-content">
<div class="return-to-top" style="opacity: 0.7;"></div>
<div class="bottom-content">
<div class="boys">
<span class="boybitmap"></span>
<span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
... ... @@ -22,32 +19,25 @@
<a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
</span>
</div>
</div>
<div class="bottom-right">
</div>
<div class="bottom-right">
<div class="div-right">
<span class="span-links">
<a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a>
<a class="links" href="{{contactusUrl}}">联系我们</a><a class="line"></a>
<a class="links" href="{{serversUrl}}">版权声明</a><a class="line"></a>
<a class="links" href="{{privacyUrl}}">隐私条款</a><a class="line"></a>
<a class="links" href="{{feedbackUrl}}">意见反馈</a><a class="line"></a>
<a class="links" href="{{linksUrl}}">友情链接</a>
<a class="links" href="channel/about/index">关于我们</a><a class="line"></a>
<a class="links" href="./channel/about/contactus">联系我们</a><a class="line"></a>
<a class="links" href="./channel/about/servers">版权声明</a><a class="line"></a>
<a class="links" href="./channel/about/privacy">隐私条款</a><a class="line"></a>
<a class="links" href="./channel/about/feedback">意见反馈</a><a class="line"></a>
<a class="links" href="./channel/about/links">友情链接</a>
</span>
<span class="span-right">
CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
</span>
</div>
</div>
</body>
{{> common/menu}}
{{> common/menu_withleft}}
<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>
{{> common/script}}
</div>
{{> common/menu}}
{{> common/menu_withleft}}
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
{{> common/script}}
</body>
</html>
... ...