From 749e10592d65205991dfd6c6664f2580daddfbe0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 7 Mar 2015 14:47:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_invite_members_by_mail.html.erb | 5 ++++-
 app/views/projects/invite_members_by_mail.html.erb  | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb
index 68ab6fae4..12c8d31ad 100644
--- a/app/views/projects/_invite_members_by_mail.html.erb
+++ b/app/views/projects/_invite_members_by_mail.html.erb
@@ -1,10 +1,13 @@
+<div class="project_r_h">
+  <h2 class="project_h2">邀请加入</h2>
+</div>
 <div  class="floatbox" style="margin:100px;">
   <div ><a href="#" class="box_close"></a></div>
   <div class="cl"></div>
   <div class="box_main">
     <h3 class="box_h3">发送邮件邀请新用户</h3>
     <p class="box_p">输入好友邮箱地址，Trustie帮您免费发送！</p>
-    <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %>
+    <p style="padding-lef:20px;"><%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %></p>
     <ul>
       <li >
             <%= text_field_tag 'mail',  '邮箱', :class => "fb_item fl" %>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index c38aec404..c2a519167 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,2 +1 @@
-<%= stylesheet_link_tag  'project', :media => 'all' %>
 <%= render :partial => "invite_members_by_mail"%>
\ No newline at end of file

From ba09213023dbabc9cb7c16f7cebb863e60c0e6bb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 7 Mar 2015 15:32:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=81=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_project_news.html.erb               |  7 +++----
 app/views/news/_project_show.html.erb               |  3 +++
 app/views/projects/_invite_members_by_mail.html.erb | 10 ++--------
 app/views/projects/_tools_expand.html.erb           |  3 +++
 app/views/projects/invite_members.html.erb          |  2 +-
 config/locales/zh.yml                               |  1 +
 public/stylesheets/application.css                  |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index 4d20c62f7..a1966ea53 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
@@ -66,10 +69,6 @@
      label_tips = l(:label_news)
    end
 %>
-
-<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= label_tips %>
-</span>
 <% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %>
     <%= link_to(btn_tips,
                 new_project_news_path(@project),
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 7b4c209b0..874e89e1f 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb
index 12c8d31ad..1f6365664 100644
--- a/app/views/projects/_invite_members_by_mail.html.erb
+++ b/app/views/projects/_invite_members_by_mail.html.erb
@@ -1,22 +1,16 @@
 <div class="project_r_h">
   <h2 class="project_h2">邀请加入</h2>
 </div>
-<div  class="floatbox" style="margin:100px;">
+<div  class="floatbox" style="margin:120px;">
   <div ><a href="#" class="box_close"></a></div>
   <div class="cl"></div>
   <div class="box_main">
     <h3 class="box_h3">发送邮件邀请新用户</h3>
     <p class="box_p">输入好友邮箱地址，Trustie帮您免费发送！</p>
     <p style="padding-lef:20px;"><%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %></p>
-    <ul>
-      <li >
             <%= text_field_tag 'mail',  '邮箱', :class => "fb_item fl" %>
-      </li>
       <div class="cl"></div>
-
-      <div class="cl"></div>
-    </ul>
-    <%= submit_tag '免费发送', :class=> "btn_free" %>
+    <%= submit_tag '免费发送', :style=> "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
 
     <% end %>
   </div>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index aaf48f0ec..fed10b3f2 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -3,6 +3,9 @@
         <%= link_to l(:label_settings), settings_project_path(@project) %>
     <% end %>
 </li>
+<li>
+  <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+</li>
 <li>
 	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
 </li>
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index e57696fc3..8b0a5a183 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -39,7 +39,7 @@
           <% end %>
         </p>
         <p>
-          <%= submit_tag l(:button_add), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
+          <%= submit_tag l(:label_invite_members), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
         </p>
        <% end %>
       <% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2763a59ad..4abc2eee5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1928,6 +1928,7 @@ zh:
   label_bids_task_list: 作业列表
   label_join_course: 加入
   label_invite_project: 邀请您加入项目
+  label_invite_members: 邀请用户
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 70b49de3b..c80012f6a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -91,7 +91,7 @@ a:hover.more{ color:#64bdd9;}
 .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*邮件邀请*/
-.box_main{ width:345px; margin:0 auto;}
+.box_main{ width:345px; margin:0 auto;padding-left:40px;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
 .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}