末班六定配完成

app/views/layouts/base_org2.html.erb

@@ -137,6 +137,7 @@
       <% if field.status.to_i == 1 %>
           <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
       <% elsif field.status.to_i == 2 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
           <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
             <h2 class="h2-title">业界动态<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
             <div class="cl"></div>
@@ -178,57 +179,7 @@
           <div class="cl"></div>
           </div>
       <% elsif field.status.to_i == 4 %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <h2 class="h2-title">北斗资源<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-            <div class="sn-index-resourcescon">
-              <div class="sn-index-resourcesbox">
-                <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/resources/img-resources01.jpg" width="185" height="125" alt=""/></a>
-                <h3><a href="javascript:void(0);" target="_blank" class="resources-title">仪器资源</a></h3>
-                <div class="resources-tagbox">
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>
-                </div>
-                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-              </div>
-              <div class="sn-index-resourcesbox">
-                <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/resources/img-resources02.jpg" width="185" height="125" alt=""/></a>
-                <h3><a href="javascript:void(0);" target="_blank" class="resources-title">数据资源</a></h3>
-                <div class="resources-tagbox">
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">仿真数据</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">实测数据</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">测试场景</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>
-                </div>
-                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-              </div>
-              <div class="sn-index-resourcesbox">
-                <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/resources/img-resources03.jpg" width="185" height="125" alt=""/></a>
-                <h3><a href="javascript:void(0);" target="_blank" class="resources-title">专家资源</a></h3>
-                <div class="resources-tagbox">
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">人才培养 </a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">技术咨询</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">学术活动</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">教学教材</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">专家库</a>
-                </div>
-                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-              </div>
-              <div class="sn-index-resourcesbox">
-                <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/resources/img-resources04.jpg" width="185" height="125" alt=""/></a>
-                <h3><a href="javascript:void(0);" target="_blank" class="resources-title">研究资源</a></h3>
-                <div class="resources-tagbox">
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">微小课题</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">开源代码</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">辅助工具</a>
-                  <a href="javascript:void(0);" target="_blank" class="resources-tag">技术共享</a>
-                </div>
-                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-              </div>
-              <div class="cl"></div>
-            </div>
-          </div>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
       <% elsif field.status.to_i == 5 %>
           <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
             <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>

app/views/organizations/_org_subfield_leftM2.html.erb

@@ -0,0 +1,27 @@
+<div class="sn-news-smallbox fl">
+  <div class="sn-news-small mb18">
+    <a href="javascript:void(0)" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small01.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void(0)" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void(0)" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small02.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void(0)" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void(0)" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small03.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void(0)" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small ">
+    <a href="javascript:void(0)" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small04.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void(0)" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+</div>
+<div class="cl"></div>

app/views/organizations/_org_subfield_leftMD_default.html.erb

@@ -0,0 +1,11 @@
+<div class="sn-index-resourcesbox">
+  <a href="javascript:void()" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/files-default.jpg" width="185" height="125" alt=""/></a>
+  <h3><a href="javascript:void()" target="_blank" class="resources-title">仪器资源</a></h3>
+  <div class="resources-tagbox">
+    <a href="javascript:void()" target="_blank" class="resources-tag">测试服务</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">开放日</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">仪器共享</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">定制测试</a>
+  </div>
+  <a href="javascript:void()" target="_blank" class="more-btn">更多</a>
+</div>