Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/layouts/_base_footer.html.erb

@@ -15,11 +15,11 @@
   				
   			</p>
       		<div id="logo_link">
-      			<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.jpg',: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/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.jpg',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></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.jpg',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.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.jpg',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.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.jpg',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></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-->