From dc81db1d8b22ad7e2edb89d5cd97161c3b819042 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Apr 2015 11:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb | 38 ++++++++++---------------
 public/stylesheets/public.css           |  8 +++---
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 69866aa2c..7af313188 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -8,13 +8,16 @@
     }
 </script>
 <div class="project_r_h">
-  <h2 class="project_h2"><%= h @board.name %></h2>
+  <h2 class="project_h2">
+    <% if User.current.language == "zh"%>
+        <%= h @board.name %>
+    <% else %>
+        <%= l(:project_module_boards) %>
+    <% end %>
+  </h2>
 </div>
 <div id="add-message" class="talk_new ml15" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
   <% if User.current.logged? %>
-      <div class="project_r_h">
-        <h2 class="project_h2"><%= l(:project_module_boards_post) %></h2>
-      </div>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
           <p>
@@ -42,18 +45,10 @@
 
 <!-- 内容显示部分 -->
  <div class="project_right">
-    	<div class="project_r_h">
-        	<h2 class="project_h2">
-        		<% if User.current.language == "zh"%>
-        		<%= h @board.name %>
-        		<% else %>
-        		<%= l(:project_module_boards) %>
-        		<% end %>
-            </h2>
-        </div>
+
         <div class="talk_top">
-        	<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) %>  
+        	<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>
@@ -66,16 +61,13 @@
           <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' %>
       		<div class="talk_txt fl">
-      			<div>
-                	<span><%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %></span>
+      			<%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %>
                 	<% if topic.sticky? %>
-                		<span class="talk_up" style="float:right;"><%= l(:label_board_sticky)%></span>
+                		<a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
                 	<% end %>
-                </div>
-                <div class="problem_line">
-                	<span><%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span>
-                	&nbsp;<span><%= l(:label_post_by_time)%><%= format_time topic.created_on %></span> 
-				</div>
+                <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>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9261c10e..16d5ccd13 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -159,10 +159,10 @@ a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
 /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; }*/
-.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
+.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
+.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
+.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
 /* commonpic */
 .pic_date{ display:block; background:url(../images/new_project/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
 .pic_add{ display:block; background:url(../images/new_project/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}