Merge branch 'develop' into test

调试冲突
Conflicts:
	partials/layout/footer_jian.html

+
+{{# showFollowus}}
 <div class="content-item-without-border" style="margin-top:0;">
 <div class="content-item-without-border" style="margin-top:0;">
     <div class="follow-us">
     <div class="follow-us">
         {{^ fanti}}
         {{^ fanti}}
@@ -29,3 +31,4 @@
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+{{/ showFollowus}}

 <div class="detail-title">
 <div class="detail-title">
     <h1>{{title}}</h1>
     <h1>{{title}}</h1>
     <h2>{{subtitle}}</h2>
     <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"><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>
 </div>

@@ -23,12 +23,12 @@
 <div class="bottom-right">
 <div class="bottom-right">
     <div class="div-right">
     <div class="div-right">
         <span class="span-links">
         <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>
         <span class="span-right">
         <span class="span-right">
             CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號
             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">
     <div class="boys">
         <span class="boybitmap"></span>
         <span class="boybitmap"></span>
         <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
         <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
@@ -22,32 +19,25 @@
             <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
             <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
         </span>
         </span>
     </div>
     </div>
-        </div>
-        <div class="bottom-right">
+</div>
+<div class="bottom-right">
     <div class="div-right">
     <div class="div-right">
         <span class="span-links">
         <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>
         <span class="span-right">
         <span class="span-right">
             CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
             CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
         </span>
         </span>
     </div>
     </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>
 </html>