From 6b526ee438cf5e2ad1e117e627165253ec5ed5f8 Mon Sep 17 00:00:00 2001
From: t430 <senluowanxiangt@163.com>
Date: Tue, 29 Apr 2014 07:47:26 +0800
Subject: [PATCH] fix

---
 app/views/layouts/_base_footer.html.erb.orig | 73 ++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 app/views/layouts/_base_footer.html.erb.orig

diff --git a/app/views/layouts/_base_footer.html.erb.orig b/app/views/layouts/_base_footer.html.erb.orig
new file mode 100644
index 000000000..c2e9c1f3d
--- /dev/null
+++ b/app/views/layouts/_base_footer.html.erb.orig
@@ -0,0 +1,73 @@
+<!--add by huang-->
+<div class="clearfix"></div>
+<<<<<<< HEAD
+<div id="footer" style="margin-left:-5px;padding-top: 50px;clear: both;font-size: 12px;">
+	<div style="border-top:solid 1px #C6E9F1;width: auto;margin-top: 80px;"></div>
+  	<div class="base_footer">
+  		<div align="center">
+  			
+  			<!--gcm-->
+  			<p>
+  				<span>主办单位:</span>
+  				<span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
+                <span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
+  				<span id="copyright">版权@2007~2014</span>
+  				<span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member",:target=>"_blank"%></span>
+  				<span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%></span>
+  				
+  			</p>
+      		<div id="logo_link">
+      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12"%></span>
+      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></span>
+      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/"%></span>
+      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn"%></span>
+      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></span>		
+      		</div>
+      		<!--gcm-->
+      		
+      	</div>
+    </div>
+=======
+<div id="footer" style="margin-left:-5px;padding-top: 150px;clear: both;font-size: 12px;">
+	<div style="border-top:solid 1px #C6E9F1;"></div>
+ <div class="base_footer">
+  <div align="center">
+
+   <!--gcm-->
+   <p>
+    <span>主办单位:</span>
+    <span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
+    <span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
+    <span id="copyright">版权@2007~2014</span>
+    <span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member",:target=>"_blank"%></span>
+    <span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%></span>
+
+  </p>
+  <div id="logo_link">
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12"%></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/"%></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn"%></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></span>		
+ </div>
+ <!--gcm-->
+
+</div>
+</div>
+>>>>>>> develop
+</div>
+</div>
+<div class="debug">
+  <%= debug(params) if Rails.env.development? %>
+
+  <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-46523987-1', 'trustie.net');
+  ga('send', 'pageview');
+
+  </script>
+</div>