Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/forums/_forum_list.html.erb

@@ -1,12 +1,10 @@
 <!-- added by fq -->
-<div style="padding-top: 10px">
+<div class="forums-list">
 <% if forums.any? %>
 	<% forums.each do |forum| %>
 	<div class="forums-index">
 		<div class="forums-inex-avatar">
-          <% unless forum.creator.nil? %>
+              <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
-              <%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %>
-          <% end %>
           </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>

app/views/layouts/_base_footer.html.erb

@@ -7,12 +7,31 @@
 
    <!--gcm-->
    <p>
-    <%= @organizer.description.html_safe unless @organizer.nil?%>
+    <% if @organizer.nil? %>
+        <p>
+          <span>主办单位</span>
+          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47">国防科学技术大学并行与分布处理国家重点实验室</a></span>
+          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41">计算机科学与技术系</a></span>
+          <span id="copyright">版权©2007~2014</span>
+          <span class="footer_text_link" id="contact_us"><a target="_blank" href="http://forge.trustie.net/projects/2/member">联系我们</a></span>
+          <span class="footer_text_link" id="record"><a target="_blank" href="http://www.miibeian.gov.cn/">湘ICP备09019772</a></span>
+        </p>
+    <% else %>
+      <%= @organizer.description.html_safe %>
+    <% end %>
   </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=>"国防科学技术大学计算机学院"),"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=>"北京大学信息科学技术学院软件研究所"), "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=>"北京航空航天大学计算机学院"), "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=>"中国科学院软件研究所"), "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=>"山东中创软件商用中间件股份有限公司"), "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>
         <% end %>
+    <% end %>
  </div>
  <!--gcm-->
 

public/stylesheets/nyan.css

@@ -672,7 +672,10 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
 
 /* 贴吧 forum memo
 *******************************************************************************/
-
+.forums-list{
+    padding-top: 10px;
+    min-height: 400px;
+}
 div.actions input[type="text"] {
     padding: 3px;
     width: 100%;
@@ -861,8 +864,10 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -box-sizing: border-box;
+    min-height: 200px;
 }
 
+
 .resource_sum {
     height: auto;
 }