From 2abb68c00cba170db035219d4e699e9d41456f56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 10:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E9=83=A8=E5=88=86=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb          | 70 +------------------
 app/views/organizations/_org2_footer.html.erb | 12 ++++
 .../organizations/_org_avater_swap.html.erb   |  8 +++
 .../organizations/_org_field_menu.html.erb    | 44 ++++++++++++
 4 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 app/views/organizations/_org2_footer.html.erb
 create mode 100644 app/views/organizations/_org_avater_swap.html.erb
 create mode 100644 app/views/organizations/_org_field_menu.html.erb

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index e51a62e24..c234fd288 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -62,66 +62,15 @@
   <div class="sn-header">
     <div class="sn-row sn-bg-white">
       <div class="sn-logo">
-        <% if @org_logo_attchment.blank? || !User.current.logged? %>
-            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
-        <% else %>
-            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">
-        <% end %>
-        <% if User.current.admin_of_org?(@organization) %>
-            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
-        <% end %>
+        <%= render :partial => 'org_avater_swap', :org_logo_attchment => @org_logo_attchment %>
         <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
-
         <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
         <%= render :partial => 'organizations/org_logined_header' %>
       </div>
     </div>
     <!--导航-->
     <div class="sn-row sn-bg-blue sn-p-relative">
-      <ul class="sn-nav">
-        <% @subfield_content.each do |field| %>
-            <% if is_default_field?(field) %>
-                <% case field.name %>
-                <% when 'activity' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
-                    </li>
-                <% when 'course' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-                    </li>
-                <% when 'project' %>
-                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
-                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-                    </li>
-                <% end %>
-            <% else %>
-                <% if field.field_type == "Post" && field.hide == 0 %>
-                    <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-                    </li>
-                    <!--二级目录-->
-                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
-                      <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
-                        <% field.sub_domains.each do |subdomain| %>
-                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
-                            <li class="sn-subnav-slice">|</li>
-                        <% end %>
-                      </ul>
-                    </div>
-                <% 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>
+      <%= render :partial => "org_field_menu", :locals => {:subfield_content => @subfield_content} %>
     </div>
   </div>
 </header>
@@ -136,20 +85,7 @@
 </div>
 <!--内容结束-->
 <footer>
-  <!--footer-->
-  <div class="sn-row sn-bg-grey2">
-    <div class="sn-footer">
-      <ul class="sn-footer-link">
-        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
-        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
-        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
-      </ul>
-      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
-      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
-        卫星导航仿真与测试开放实验室</div>
-    </div>
-  </div>
+  <%= render :partial => "org2_footer" %>
 </footer>
 
 <!--页面底部-->
diff --git a/app/views/organizations/_org2_footer.html.erb b/app/views/organizations/_org2_footer.html.erb
new file mode 100644
index 000000000..9ff7051c1
--- /dev/null
+++ b/app/views/organizations/_org2_footer.html.erb
@@ -0,0 +1,12 @@
+<div class="sn-row sn-bg-grey2">
+  <div class="sn-footer">
+    <ul class="sn-footer-link">
+      <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+      <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+      <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+      <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+    </ul>
+    <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+    <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />卫星导航仿真与测试开放实验室</div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_avater_swap.html.erb b/app/views/organizations/_org_avater_swap.html.erb
new file mode 100644
index 000000000..70bdf3b1b
--- /dev/null
+++ b/app/views/organizations/_org_avater_swap.html.erb
@@ -0,0 +1,8 @@
+<% if @org_logo_attchment.blank? || !User.current.logged? %>
+    <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
+<% else %>
+    <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">
+<% end %>
+<% if User.current.admin_of_org?(@organization) %>
+    <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_field_menu.html.erb b/app/views/organizations/_org_field_menu.html.erb
new file mode 100644
index 000000000..792bea87e
--- /dev/null
+++ b/app/views/organizations/_org_field_menu.html.erb
@@ -0,0 +1,44 @@
+<ul class="sn-nav">
+  <% subfield_content.each do |field| %>
+      <% if is_default_field?(field) %>
+          <% case field.name %>
+  <% when 'activity' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+              </li>
+          <% when 'course' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+              </li>
+          <% when 'project' %>
+              <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+              </li>
+          <% end %>
+      <% else %>
+          <% if field.field_type == "Post" && field.hide == 0 %>
+              <li class="nav-element">
+                <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+              </li>
+              <!--二级目录-->
+              <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                  <% field.sub_domains.each do |subdomain| %>
+                      <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                      <li class="sn-subnav-slice">|</li>
+                  <% end %>
+                </ul>
+              </div>
+          <% 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>
\ No newline at end of file