- <% 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)) %>
<%= link_to h(forum.name), forum_path(forum) %>
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 @@
- <%= @organizer.description.html_safe unless @organizer.nil?%>
+ <% if @organizer.nil? %>
+
+ 主办单位
+
+
+ 版权©2007~2014
+
+
+
+ <% else %>
+ <%= @organizer.description.html_safe %>
+ <% end %>
+ <% if @companies.nil? || @companies.count == 0 %>
+
+
+
+
+
+ <% else %>
<% @companies && @companies.each do |company| %>
<% end %>
+ <% end %>
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;
}