Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop

Conflicts:
	mvc-config.json

 {
     "defaultActionName": "index",
     "layout": {
-        "default-layout": "new_layout"
+        "default-layout": "new_layout",
+        "detail": "detail_layout"
     },
     "renderOptions": {
         "login": {
@@ -17,6 +18,7 @@
                 }
             ]
         },
+
         "default": "mvc-config-wangwei.json"
     },
     "ajax": {

@@ -4,38 +4,13 @@
         
         <div class="detail-body">
             {{# content}}
-            {{# video}}
                 {{> detail/detail_video}}
-            {{/ video}}
-
-            <!-- slide图片开始 -->
-            {{# slide}}
                 {{> detail/detail_slide}}
-            {{/ slide}}
-            <!-- slide图片结束 -->
-            
-            {{# bigImg}}
                 {{> detail/detail_img}}
-            {{/ bigImg}}
-            {{# text}}
                 {{> detail/detail_text}}
-            {{/ text}}
-
             {{/ content}}
-            <div class="tag-box">
-                <ul class="taglist clearfix">
-                    <li><a href="javascript:;">Supreme</a></li>
-                    <li><a href="javascript:;">Adldas</a></li>
-                    <li><a href="javascript:;">Nice</a></li>
-                    <li><a href="javascript:;">Nike</a></li>
-                    <li><a href="javascript:;">Jobs</a></li>
-                    <li><a href="javascript:;">King</a></li>
-                    <li><a href="javascript:;">时尚圈</a></li>
-                    <li><a href="javascript:;">yoho男生</a></li>
-                    <li><a href="javascript:;">跑酷</a></li>
-                    <li class="last-child"><a href="javascript:;">香港</a></li>
-                </ul>
-            </div>
+            {{> detail/detail_tag}}
+            {{> detail/detail_status}}
             <div class="stats-btn clearfix">
                 <ul class="statslist clearfix">
                     <li class="current"><a class="clearfix" href="javascript:;"><strong><img src="http://cmsres.dev.yoho.cn/images/detail/wow-icon.png" alt=""></strong><span><img src="http://cmsres.dev.yoho.cn/images/detail/wow-icon2.png" alt=""></span></a></li>

+{{# bigImg}}
 <div class="pic-body">
     <img src="{{src}}" alt="">
-</div>
\ No newline at end of file
+</div>
+{{/ bigImg}}
\ No newline at end of file

+{{# slide}}
 <div class="detail-slide">
     <div class="detail-slide-body">
         <ul class="detail-slide-piclist clearfix">
@@ -15,4 +16,6 @@
         <a href="javascript:;" class="detail-slide-ctrl-prev"></a>
         <a href="javascript:;" class="detail-slide-ctrl-next"></a>
     </div>
-</div>
\ No newline at end of file
+</div>
+{{/ slide}}
+                
\ No newline at end of file

+<div class="stats-btn clearfix">
+    <ul class="statslist clearfix">
+        <li class="current"><a class="clearfix" href="javascript:;"><strong><img src="http://cmsres.dev.yoho.cn/images/detail/wow-icon.png" alt=""></strong><span><img src="http://cmsres.dev.yoho.cn/images/detail/wow-icon2.png" alt=""></span></a></li>
+        <li><a class="clearfix" href="javascript:;"><strong><img src="http://cmsres.dev.yoho.cn/images/detail/zzz-icon.png" alt=""></strong><span><img src="http://cmsres.dev.yoho.cn/images/detail/zzz-icon2.png" alt=""></span></a></li>
+        <li><a class="clearfix" href="javascript:;"><strong><img src="http://cmsres.dev.yoho.cn/images/detail/wtf-icon.png" alt=""></strong><span><img src="http://cmsres.dev.yoho.cn/images/detail/wtf-icon2.png" alt=""></span></a></li>
+        <li class="comments"><a class="clearfix" class="clearfix" href="javascript:;"><span><img src="http://cmsres.dev.yoho.cn/images/detail/comments-icon2.png" alt=""></span><img src="http://cmsres.dev.yoho.cn/images/detail/comments-icon.png" alt=""></a></li>
+    </ul>
+</div>
\ No newline at end of file

+{{# tags}}
+<div class="tag-box">
+    <ul class="taglist clearfix">
+        {{# tagList}}
+            <li><a href="{{src}}">{{name}}</a></li>
+        {{/ tagList}}
+    </ul>
+</div>
+{{/ tags}}
\ No newline at end of file

+{{# text}}
 <div class="text-body">
     <p>{{deps}}</p>
-</div>
\ No newline at end of file
+</div>
+{{/ text}}
\ No newline at end of file

 <div class="detail-title">
     <h1>{{title}}</h1>
     <h2>{{subtitle}}</h2>
-    <p class="detail-category"><a href="javascript:;">By&nbsp;{{author}}&nbsp;</a>／{{class}}&nbsp;／&nbsp;{{time}}</p>
+    <p class="detail-category"><a href="javascript:;">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
 </div>
\ No newline at end of file

+{{# video}}
 <div class="detail-video">
     <div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src=""></div>
     <div class="videoPlaceholder">
@@ -19,3 +20,4 @@
         </div>
     </div>
 </div>
+{{/ video}}