From 861469e39fa4795c3352caaf58b2aaef06d0f6f8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 21 Apr 2015 16:11:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=92=8C=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=86=B2=E7=AA=81=202=E3=80=81=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E6=96=B0=E5=BB=BA=E6=A1=86=203=E3=80=81=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BA=93=E6=96=B0=E5=BB=BA=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb   |  1 +
 app/views/messages/_form_project.html.erb |  5 ++---
 app/views/messages/_project_show.html.erb |  3 ++-
 app/views/users/show.html.erb             | 10 +++++-----
 app/views/versions/index.html.erb         |  5 +----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 43cea4b4f..31748014f 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -19,6 +19,7 @@
 <div id="add-message" class="talk_new ml15" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
   <% if User.current.logged? %>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
+          <p class="talk_top"><%= l(:project_module_boards_post) %></p>
           <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
           <p>
             <a href="javascript:void(0)" onclick="submitProjectBoard();" class="blue_btn fl ml55" style="margin-left: 55px"><%= l(:button_submit)%></a>
diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb
index a1ef69fa9..5724acf47 100644
--- a/app/views/messages/_form_project.html.erb
+++ b/app/views/messages/_form_project.html.erb
@@ -1,7 +1,6 @@
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
-<p class="talk_top"><%= l(:label_message_reply) %></p>
 <li>
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
   <% if replying %>
@@ -26,7 +25,7 @@
 </li>
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl" >&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+  <label class="fl ml3" >&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
   <div class="cl"></div>
@@ -35,7 +34,7 @@
 <div class="cl"></div>
 <li>
   <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <div  class="fl">
+  <div  class="fl ml3">
     <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
   </div>
 </li>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 069fd9d80..28b9e28d5 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -88,8 +88,9 @@
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+          <p class="talk_top"><%= l(:label_message_reply) %></p>
           <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-          <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white" style="margin-left: 50px;"><%= l(:button_submit)%></a>
+          <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white ml5" style="margin-left: 50px;"><%= l(:button_submit)%></a>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 055a00a82..aab206151 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -63,12 +63,12 @@
                                                   <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
                                                 </strong>
                                                 &nbsp;
-                                                <% if User.current.language == "zh" %>                                               
+                                                <% if User.current.language == "zh" %>
                                                 <span class="font_lighter">
                                                 <%= l(:label_i_have_feedback) %>
                                                 <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
                                                 <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
-                                                </span>             
+                                                </span>
                                                 <% else %>
                                                 <span class="font_lighter">
                                                 <%= l(:label_i_have_feedback) %>
@@ -80,19 +80,19 @@
                                                 <strong>
                                                   <%= link_to("#{e.user.name}", user_path(e.user_id)) %>
                                                 </strong>
-                                                <% if User.current.language == "zh" %>                                               
+                                                <% if User.current.language == "zh" %>
                                                 <span class="font_lighter">
                                                 <%= l(:label_have_feedback) %>
                                                 <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
                                                 <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
-                                                </span>             
+                                                </span>
                                                 <% else %>
                                                 <span class="font_lighter">
                                                 <%= l(:label_have_feedback) %>
                                                 <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
                                                 <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
                                                 </span>
-                                                <% end %>  
+                                                <% end %>
                                             <% end %>
                                           </td>
                                         </tr>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index cccc53726..0b71fa5e2 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -1,10 +1,6 @@
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_roadmap) %></h2>
 </div>
-<div class="content-title-top">
-  <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'orange_u_btn fl' if User.current.allowed_to?(:manage_versions, @project) %>
-</div>
-<br/><br/>
 <div class="roadmap">
     <fieldset id="filters" class="collapsible collapsed" >
       <legend><%= l(:label_version_display_settings)%></legend>
@@ -19,6 +15,7 @@
               <label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
           <% end %>
           <%= submit_tag l(:button_apply), :class => 'sub_btn ml10', :name => nil %>
+          <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'green_u_btn fr' if User.current.allowed_to?(:manage_versions, @project) %>
       <% end %>
     </fieldset>