配置八种类型更新

app/helpers/organizations_helper.rb

@@ -63,13 +63,37 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左上"
     option1 << "1"
     type << option1
     option2 = []
-    option2 << "图片"
+    option2 << "左中一"
-    option2 << "0"
+    option2 << "2"
     type << option2
+    option3 = []
+    option3 << "左中二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "左中下"
+    option4 << "4"
+    type << option4
+    option5 = []
+    option5 << "左下"
+    option5 << "5"
+    type << option5
+    option6 = []
+    option6 << "右上"
+    option6 << "6"
+    type << option6
+    option7 = []
+    option7 << "右中"
+    option7 << "7"
+    type << option7
+    option8 = []
+    option8 << "右下"
+    option8 << "8"
+    type << option8
     type
   end
 

app/views/layouts/base_org2.html.erb

@@ -87,32 +87,58 @@
         <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
       </div>
     </div>
+    <!--导航-->
     <div class="sn-row sn-bg-blue">
       <ul class="sn-nav">
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">首页</a></li>
+        <% @subfield_content.each do |field| %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">业界动态</a></li>
+            <% if is_default_field?(field) %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">仪器资源</a></li>
+                <% case field.name %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">数据资源</a></li>
+                <% when 'activity' %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">专家资源</a></li>
+                    <li class="nav-element">
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">研究资源</a></li>
+                        <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">精英培训</a></li>
+                    </li>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">关于我们</a></li>
+                <% when 'course' %>
-        <li class="nav-element"><a href="javascript:void()" class="sn-link-white">北斗开源社区</a></li>
+                    <li class="nav-element">
-      </ul>
+                        <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-    </div>
+                    </li>
-    <div class="sn-row sn-p-absolute sn-grey-opacity" style="display:block; z-index:99;">
+                <% when 'project' %>
-      <ul class="sn-sub-nav">
+                    <li class="nav-element">
-        <li><a href="javascript:void()" class="sn-link-grey">简介</a></li>
+                        <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-        <li class="sn-subnav-slice">|</li>
+                    </li>
-        <li><a href="javascript:void()" class="sn-link-grey">仿真数据</a></li>
+                <% end %>
-        <li class="sn-subnav-slice">|</li>
+            <% else %>
-        <li><a href="javascript:void()" class="sn-link-grey">实测数据</a></li>
+                <% if field.field_type == "Post" && field.hide == 0 %>
-        <li class="sn-subnav-slice">|</li>
+                    <li class="nav-element">
-        <li><a href="javascript:void()" class="sn-link-grey">测试场景</a></li>
+                        <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-        <li class="sn-subnav-slice">|</li>
+                    </li>
-        <li><a href="javascript:void()" class="sn-link-grey">数据定制</a></li>
+                <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                    <li class="nav-element">
+                        <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% end %>
+            <% end %>
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <li class="nav-element">
+                <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+            </li>
+        <% end %>
       </ul>
     </div>
+
+    <!--<div class="sn-row sn-p-absolute sn-grey-opacity" style="display:block; z-index:99;">-->
+      <!--<ul class="sn-sub-nav">-->
+        <!--<li><a href="javascript:void()" class="sn-link-grey">简介</a></li>-->
+        <!--<li class="sn-subnav-slice">|</li>-->
+        <!--<li><a href="javascript:void()" class="sn-link-grey">仿真数据</a></li>-->
+        <!--<li class="sn-subnav-slice">|</li>-->
+        <!--<li><a href="javascript:void()" class="sn-link-grey">实测数据</a></li>-->
+        <!--<li class="sn-subnav-slice">|</li>-->
+        <!--<li><a href="javascript:void()" class="sn-link-grey">测试场景</a></li>-->
+        <!--<li class="sn-subnav-slice">|</li>-->
+        <!--<li><a href="javascript:void()" class="sn-link-grey">数据定制</a></li>-->
+      <!--</ul>-->
+    <!--</div>-->
   </div>
 </header>
 <!--内容开始-->