From 2d93cd4bdc921b8c08f011696d50999beb95140b Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 8 May 2015 13:33:18 +0800
Subject: [PATCH] Signed-off-by: alan <547533434@qq.com>

---
 app/views/boards/_course_show.html.erb  | 18 ++++++++++--------
 app/views/boards/_project_show.html.erb | 21 ++++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index adc064e1a..f05f9befd 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -37,21 +37,23 @@
             <div class="talkmain_txt fl mt5">
               <% author = topic.author.to_s + "：" %>
               <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-              <% if topic.course_editable_by?(User.current) %>
-                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;
-                          margin-left: 60px;"><%= l(:button_edit) %></a>
+
+              <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+              <% if topic.editable_by?(User.current) %>
+                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
+                          margin-left: 20px;"><%= l(:button_edit) %></a>
+              <% end %>
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
               <% end %>
               <%= link_to(
                           l(:button_delete),
                           {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
                           :method => :post,
                           :data => {:confirm => l(:text_are_you_sure)},
-                          :class => 'talk_edit fr'
+                          :class => 'talk_edit fr',
+                          :style => ' margin-right: 10px;'
                   ) if topic.destroyable_by?(User.current) %>
-              <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-              <% if topic.sticky? %>
-                  <a href="javascript:void(0)" class="talk_up fr c_red"  style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-              <% end %>
 
 
               <br/>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 124472f5c..a9698f546 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -37,21 +37,24 @@
             <div class="talkmain_txt fl mt5">
                <% author = topic.author.to_s + "：" %>
               <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-             <% if topic.editable_by?(User.current) %>
-              <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;
-                  margin-left: 60px;"><%= l(:button_edit) %></a>
+
+              <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+              <% if topic.editable_by?(User.current) %>
+                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
+                          margin-left: 20px;"><%= l(:button_edit) %></a>
+              <% end %>
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
               <% end %>
-                  <%= link_to(
+              <%= link_to(
                           l(:button_delete),
                           {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
                           :method => :post,
                           :data => {:confirm => l(:text_are_you_sure)},
-                          :class => 'talk_edit fr'
+                          :class => 'talk_edit fr',
+                          :style => ' margin-right: 10px;'
                   ) if topic.destroyable_by?(User.current) %>
-              <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-                	<% if topic.sticky? %>
-                		<a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-                	<% end %>
+
 
               <div class="cl"></div>