From 440eb8dc7f3eea315d2885d04e72b2f9b63bd765 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Apr 2015 19:08:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E4=B8=80=E6=8E=92=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=202=E3=80=81=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=BA=E5=88=B6=E6=8D=A2=E8=A1=8C=203=E3=80=81?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=8F=90=E7=A4=BA=E7=94=A8=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form_project.html.erb         |  2 +-
 app/views/projects/settings/_new_members.html.erb |  8 ++++----
 app/views/projects/show.html.erb                  | 14 +++++++-------
 config/locales/zh.yml                             |  1 +
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb
index af8aeb3a5..3e932b047 100644
--- a/app/views/messages/_form_project.html.erb
+++ b/app/views/messages/_form_project.html.erb
@@ -1,7 +1,7 @@
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
-<p class="talk_top"><%= l(:label_message_new) %></p>
+<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 %>
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 0d273fc29..3356a351a 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -16,15 +16,15 @@
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-          <%= link_to_user_header member.principal,false,:class => "w150 c_orange fl" %>
-          <span class="w150 fl">
+          <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
+          <span class="w210 fl">
         <%= h member.roles.sort.collect(&:to_s).join(', ') %>
             <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                   :method => :put,
                                   :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
                 ) do |f| %>
             <% roles.each do |role| %>
-                <ul style="text-align: left;" class="ml20">
+                <ul style="text-align: left;" class="m115">
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>
@@ -32,7 +32,7 @@
                 <!--<br/>-->
             <% end %>
                 <%= hidden_field_tag 'membership[role_ids][]', '' %>
-                <div class="ml20">
+                <div class="m130">
                   <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                     <%= l(:button_change)%>
                   </a>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b45621850..d4cfd88c8 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -9,7 +9,7 @@
         <% if e.forge_act_type == "ProjectCreateInfo"%>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user),  :width => "42", :height => "42") %></a>
-                <div class="problem_txt fl mt5">
+                <div class="problem_txt fl mt5 break_word">
                     <%= link_to e.user,  user_path(e.user), :class => "problem_name c_orange fl" %> <span class="fl"> <%= l(:label_project_create) %> ：</span>
                     <%= link_to e.project.name, :class => "problem_tit fl fb" %></a><br />
                     <p class="mt5"><br /> <%= l :label_create_time %> ：<%= format_time(e.project.created_on) %></p>
@@ -24,7 +24,7 @@
         <% if e.forge_act_type == "Issue" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -44,7 +44,7 @@
         <% elsif e.forge_act_type == "Journal" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -60,7 +60,7 @@
             <% elsif e.forge_act_type == "Message" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -80,7 +80,7 @@
         <% elsif e.forge_act_type == "News" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -98,7 +98,7 @@
         <% elsif e.forge_act_type == "Document" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -113,7 +113,7 @@
         <% elsif e.forge_act_type == "Attachment" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5">
+              <div class="problem_txt fl mt5 break_word">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 6f1218788..a34ab933e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -717,6 +717,7 @@ zh:
   label_message_plural: 帖子
   label_message_last: 最新的帖子
   label_message_new: 发布新帖
+  label_message_reply: 回复帖子
   label_message_posted: 发帖成功
 
   label_send_information: 给用户发送帐号信息

From d1e7777040d361ef1994078ecf51ed1b97c07f5b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Apr 2015 20:00:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/watcherlist.html.erb | 3 +--
 config/locales/projects/zh.yml          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index 4eacf836f..76e7c9d04 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -12,8 +12,7 @@
             <%= user.nil? ? '' : (image_tag(url_to_avatar(user), :width => 32, :height => 32))  %>
           </a>
           <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-          <%= link_to_user(user) %>
-
+          <%= link_to(user.name, user_path(user),:class => "ml10 c_blue02") %>
           <span class="fr c_grey"><%= format_date(user.created_on) %></span>
         </div>
         <div class="cl"></div>
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 8b957d68b..bd09f2538 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -239,6 +239,7 @@ zh:
 
   # 新建问题
   field_tracker: 跟踪
+  field_untracker: 取消跟踪
   field_subject: 主题
   field_quote: 描述
   label_change_properties: 修改属性