Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

@@ -11,7 +11,6 @@
         </div>
     </div>
     {{> magazine/e_zine}}
-    {{> magazine/mags_app_download}}
 </div>
 {{> common/share}}
-{{> layout/footer_jian}}
\ No newline at end of file
+{{> layout/footer_jian}}

 <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;<a href="{{channelLink}}">{{class}}</a>&nbsp;|&nbsp;<a class="detail-time" href="{{twoChannelLink}}" _time="{{time}}"></a></p>
-    {{^}}
-        <p class="detail-category"><a href="{{channelLink}}">{{class}}</a>&nbsp;|&nbsp;<a class="detail-time" href="{{twoChannelLink}}" _time="{{time}}"></span></a>
-    {{/if}}
-    
+        <p class="detail-category">
+            {{#if author}}
+            <a href="{{url}}">By&nbsp;{{author}}</a>
+            &nbsp;|&nbsp;
+            {{/if}}
+            <a href="{{channelLink}}">{{channel}}</a>
+            {{#if twoChannel}}
+            <a href="{{twoChannelLink}}">{{twoChannel}}</a>
+            {{/if}}
+            &nbsp;|&nbsp;
+            <a class="detail-time" href="javascript:;" _time="{{time}}"></a>
+        </p>
 </div>
\ No newline at end of file