From 4d60a6dabcab093f8c5fae6ca08de1912d61ef97 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 17 Mar 2015 17:04:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?=
 =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0footer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 24 +++++++++++++++-----
 app/views/layouts/_new_footer.html.erb  | 29 +++++++++++++++++++++++++
 app/views/layouts/base_courses.html.erb |  2 ++
 config/locales/contacts/zh.yml          |  2 +-
 4 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 app/views/layouts/_new_footer.html.erb

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index 0c7cca7d5..322fae0e3 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -22,14 +22,26 @@
   </p>
   <div id="logo_link">
     <% if @companies.nil? || @companies.count == 0 %>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>l(:label_co_organizer_NUDT)),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>l(:label_co_organizer_EECS)), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>l(:label_co_organizer_BHU)), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>l(:label_co_organizer_CAS)), "http://www.iscas.ac.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>l(:label_co_organizer_InforS)), "http://www.inforbus.com", :target => "_blank" %></span>
+        <span class="footer_logo_link">
+          <%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>l(:label_co_organizer_NUDT)),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %>
+        </span>
+        <span class="footer_logo_link">
+          <%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>l(:label_co_organizer_EECS)), "http://eecs.pku.edu.cn", :target => "_blank" %>
+        </span>
+        <span class="footer_logo_link">
+          <%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>l(:label_co_organizer_BHU)), "http://scse.buaa.edu.cn/", :target => "_blank" %>
+        </span>
+        <span class="footer_logo_link">
+          <%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>l(:label_co_organizer_CAS)), "http://www.iscas.ac.cn", :target => "_blank" %>
+        </span>
+        <span class="footer_logo_link">
+          <%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>l(:label_co_organizer_InforS)), "http://www.inforbus.com", :target => "_blank" %>
+        </span>
       <% else %>
         <% @companies && @companies.each do |company| %>
-            <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>
+            <span class="footer_logo_link">
+              <%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %>
+            </span>
         <% end %>
     <% end %>
  </div>
diff --git a/app/views/layouts/_new_footer.html.erb b/app/views/layouts/_new_footer.html.erb
new file mode 100644
index 000000000..06f8c61e3
--- /dev/null
+++ b/app/views/layouts/_new_footer.html.erb
@@ -0,0 +1,29 @@
+<div id="Footer">
+  <ul class="copyright">
+    <li class="fl mr10"><%= l(:label_hosted_organization)%><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 c_dblue " target="_blank"><%= l(:label_hosted_by)%></a></li>
+    <li><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="fl c_dblue mr30" target="_blank"><%= l(:label_sponsor)%></a></li>
+    <li class="fl mr30"><%= l(:label_rights_reserved)%> </li>
+    <li><a href="http://forge.trustie.net/projects/2/member" class="fl c_dblue mr30" target="_blank"><%= l(:label_contact_us)%></a></li>
+    <li><a href="http://www.miibeian.gov.cn/" class="fl c_dblue" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
+
+  <div class="cl"></div>
+  <ul class="footlogo">
+    <li class="fl mr20">
+      <%= link_to image_tag('/images/footer_logo/nudt.png',:style => "width:90px;height:30px;",:alt=>l(:label_co_organizer_NUDT)),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank"%>
+    </li>
+    <li class="fl mr20">
+      <%= link_to image_tag('/images/footer_logo/peking_eecs.png',:style => "width:90px;height:30px;",:alt=>l(:label_co_organizer_EECS)), "http://eecs.pku.edu.cn", :target => "_blank"%>
+    </li>
+    <li class="fl mr20">
+      <%= link_to image_tag('/images/footer_logo/buaa_scse.png',:style => "width:90px;height:30px;",:alt=>l(:label_co_organizer_BHU)), "http://scse.buaa.edu.cn/", :target => "_blank"%>
+    </li>
+    <li class="fl mr20">
+      <%= link_to image_tag('/images/footer_logo/iscas.png',:style => "width:90px;height:30px;",:alt=>l(:label_co_organizer_CAS)), "http://www.iscas.ac.cn", :target => "_blank"%>
+    </li>
+    <li class="fl mr20">
+      <%= link_to image_tag('/images/footer_logo/inforbus.png',:style => "width:90px;height:30px;",:alt=>l(:label_co_organizer_InforS)), "http://www.inforbus.com", :target => "_blank" %>
+    </li>
+  </ul>
+</div><!--Footer end-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index af03ba9ca..84e0e288d 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -24,6 +24,8 @@
 <div id="Container">
   <%= render :partial => 'layouts/new_header' %>
 
+  <%= render :partial => 'layouts/new_footer' %>
+
   <div id="ajax-indicator" style="display:none;">
   <span>
     <%= l(:label_loading) %>
diff --git a/config/locales/contacts/zh.yml b/config/locales/contacts/zh.yml
index 2d89ed35c..aceaae023 100644
--- a/config/locales/contacts/zh.yml
+++ b/config/locales/contacts/zh.yml
@@ -17,6 +17,6 @@ zh:
   label_co_organizer_BHU: 北京航空航天大学计算机学院
   label_co_organizer_CAS: 中国科学院软件研究所
   label_co_organizer_InforS: 山东中创软件商用中间件股份有限公司
-  label_rights_reserved: 版权©2007~2014
+  label_rights_reserved: 版权©2007~2015
   label_contact_us: 联系我们
   label_license: 湘ICP备09019772
\ No newline at end of file