From 5d88de3e6e87de3ca659a405ffddb5ad6593def6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 12 Jun 2015 17:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=AF=B9=E9=BD=90=E5=8F=8A=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applied_project/applied_join_project.js.erb  |  1 +
 app/views/projects/_join_project.html.erb        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
index ab5cdd484..491b8aa0f 100644
--- a/app/views/applied_project/applied_join_project.js.erb
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -1,3 +1,4 @@
+// @status: 0 该项目不存在；1 不重复加入；2 成功加入； 3 已是项目成员；其它 加入失败
 <% if @status == 0%>
     alert("<%= l('project.join.tips.notexist') %>");
 <% elsif @status == 1%>
diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb
index 1498830c5..53c149f82 100644
--- a/app/views/projects/_join_project.html.erb
+++ b/app/views/projects/_join_project.html.erb
@@ -21,7 +21,7 @@
       .C_form{ margin:20px 0 0 60px;}
       .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; padding-left: 60px;}
       .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
-      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:150px;}
+      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:140px;}
       .width190{ width:190px; height:26px; border-color:#e1e1e1;}
       .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
       .C_form a:hover{ text-decoration:underline;}
@@ -52,25 +52,25 @@
     </div>
     <div class="C_form">
       <%= form_tag({:controller => 'applied_project',
-                    :action => 'applied_join_project'},
-                   :remote => true,
-                   :method => :post,
-                   :id => 'new-watcher-form') do %>
+                  :action => 'applied_join_project'},
+                  :remote => true,
+                  :method => :post,
+                  :id => 'new-watcher-form') do %>
           <ul>
             <li style="padding-top: 15px;">
               <span class="tips"><%= l('project.join.id.label')%></span>
               <input type="hidden" name="project_join" value="1">
-              <input type="hidden" name="user_id" value="<%= User.current.id%>">
+              <input type="hidden" name="user_id" value="<%= User.current.id %>">
               <input class=" width190" name="project_id" id="project_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
             <li class="mB5" style="width: 260px"><%= l('project.join.id.tips')%></li>
             <li>
               <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
-                <%= l(:label_apply_project)  %>
+                <%= l(:label_apply_project) %>
               </a>
               <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);">
-                <%= l(:button_cancel)%>
+                <%= l(:button_cancel) %>
               </a>
             </li>
           </ul>