From 14a6dec46a0de8b1f156dde6d048fbd3cd01f3cd Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 23 Oct 2014 15:44:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=B4=B4=E5=90=A7=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb | 6 ++----
 public/stylesheets/nyan.css           | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index df897151e..9d0eba923 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/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? %>
-              <%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %>
-          <% end %>
+              <%= 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)) %>
           </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 1693b3a09..7b35559e6 100644
--- a/public/stylesheets/nyan.css
+++ b/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;
 }

From 5f7d7c821c95d4b86ad3b734115324235120e1e8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 23 Oct 2014 15:56:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E9=A1=B5=E8=84=9A=EF=BC=88=E4=BD=BF?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E5=90=88=E7=90=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index a4071e887..1c8627ac7 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/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-->