From 080b7972a611fbcdd44ef7ec1b55b9eef38ff506 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 26 May 2015 17:43:23 +0800
Subject: [PATCH] ...

---
 app/views/boards/_form_project.html.erb |  3 ++-
 app/views/boards/_project_show.html.erb | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index fd63689bb..e5de9e05b 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -52,7 +52,8 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content ml55">
+
+  <div class="content <%= replying ? '':'ml55' %>">
   <% if replying%>
 
       <%= f.text_area :content,
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index c8d28cee2..fd685f168 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -8,7 +8,7 @@
       <% end %>
     </h2>
     <% if User.current.logged? %>
-        <a href="javascript:void(0)" class="green_btn fr newtalk " nhname="showbtn"><%= l(:label_message_new) %></a>
+        <a href="javascript:void(0)" class="green_btn fr newtalk " id="new_topic_btn" nhname="showbtn"><%= l(:label_message_new) %></a>
     <% end %>
     <div class="cl"></div>
   </div>
@@ -20,7 +20,7 @@
   <% end %>
   <div class="cl"></div>
   <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
+    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:none;">
       <ul>
         <%= render :partial => 'project_new_topic' %>
       </ul>
@@ -92,8 +92,8 @@
                 <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
                 <div class="fl" nhname="toolbar_container"></div>
                 <div style="padding-top:5px;" class="fr">
-                  <a href="javascript:void(0)" nhname="cancelbtn" class="blue_btn fr ml10" style=""><%= l(:button_cancel)%></a>
-                  <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
+                  <a href="javascript:void(0)" nhname="cancelbtn" class="grey_btn fr ml10" style=""><%= l(:button_cancel)%></a>
+                  <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:button_submit)%></a>
                 </div>
               <% end %>
               <div class="cl"></div>
@@ -356,6 +356,9 @@
               }
               nh_init_board(params);
           });
+          <% if(!@flag.nil? && @flag=='true') %>
+              if($("#new_topic_btn")!=undefined)$("#new_topic_btn").click();
+          <% end %>
       });
   });
 </script>
\ No newline at end of file