讨论区列表样式冲突

app/views/boards/_form.html.erb

@@ -13,3 +13,18 @@
   </p>
 <% end %>
 </div>
+
+
+
+<div class="talk_txt fl">
+  <%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %>
+  <% if topic.sticky? %>
+      <a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
+  <% end %>
+  <br/>
+  <%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %>
+  &nbsp;<%= l(:label_post_by_time)%><%= format_time topic.created_on %>
+</div>
+<span class="talk_btn fr"><%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;line-height: 18px;" %></span>
+<div class="cl"></div>
+</div><!--讨论主类容 end-->

app/views/boards/_project_show.html.erb

@@ -44,19 +44,17 @@
 <% end %>
 
 <!-- 内容显示部分 -->
- <div class="project_right">
+<div class="talk_top">
-
+<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
-        <div class="talk_top">
+<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
-        	<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
-        		<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
         		<span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
                     		         :class => 'problem_new_btn fl c_dorange',
                     		         :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
   				<% end %>
-            <div class="cl"></div>
+<div class="cl"></div>
-            </div>
+</div>
           <!-- 帖子内容显示      -->
-          <% if @topics.any? %>
+<% if @topics.any? %>
       		<% @topics.each do |topic| %>
           <div class="problem_main">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"32",:height=>"32"), user_path(topic.author),:class => 'problem_pic talk_pic fl' %>
@@ -76,7 +74,7 @@
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
-   <ul class="wlist">
+<ul class="wlist">
      <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
    </ul>
    <!--讨论主类容 end-->