From 4ec8cc9a50b0a74d5a4a87ea0de3a800072f500d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 5 Aug 2016 11:19:36 +0800
Subject: [PATCH] =?UTF-8?q?PR=E6=96=B0=E5=BB=BA=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_development_group.html.erb |  2 +-
 app/views/pull_requests/_form.html.erb         | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 689b4842a..330269b1d 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -60,7 +60,7 @@
 <% if allow_pull_request(@project) %>
     <div class="subNav">
       <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
-      <a class="subnav_green" href="javascript:void(0);">+新建请求</a>
+      <%= link_to "+新建请求", new_project_pull_request_path, :class => "subnav_green" %>
       <% unless @project.project_score.attach_num == 0 %>
           <%#= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
       <% end %>
diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
index 67f99c275..eaf73b137 100644
--- a/app/views/pull_requests/_form.html.erb
+++ b/app/views/pull_requests/_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id, :forked_project_id => @forked_project.try(:gpid)), :id => 'pull_request_form', :method => "post", :remote => true) do %>
     <div class="new-merge-wrap">
-      <div class="merge-option-name fl mt8">标题</div><input type="text" id="pr_name" name="title" class="merge-title-input fl ml30" />
+      <div class="merge-option-name fl mt8"><span class="c_red">*</span>标题</div><input type="text" id="pr_name" name="title" class="merge-title-input fl ml30" />
       <p id ="pull_request_title" class="fl ml100 fontGrey2 mt5 c_red" style="display: none">标题不能为空</p>
       <div class="cl mb10"></div>
       <div class="merge-option-name fl">描述</div><textarea type="text" name="description" class="merge-description-input fl ml30"></textarea>
@@ -10,12 +10,10 @@
     <div class="new-merge-wrap borderBottomNone">
       <div class="merge-option-name fl" style="padding:5px 0">源分支</div>
       <%= select_tag :branch, options_for_select(@source_rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
-      <!--<select name="source_branch" value="source_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>develop</option><option>rep_quality</option></select>-->
       <div class="cl mb10"></div>
       <div class="merge-option-name fl" style="padding:5px 0">目标分支</div>
       <% if @forked_project.nil? %>
-          <%= select_tag :branch, options_for_select(@source_rev), :name => "target_branch", :value => "target_branch",
-                         :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetBranch" %>
+          <%= select_tag :branch, options_for_select(@source_rev), :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetBranch" %>
       <% else %>
           <select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>);" name="source_branch" value="source_branch" class="ml30 fontGrey3 fb fl" style = "padding:5px 0 5px 5px;">
             <option value="source_project_name"><%= @source_project_name %></option>
@@ -26,12 +24,7 @@
                 <option value="source_project_name"><%= rev %></option>
             <% end %>
           </select>
-          <%#= select_tag :branch, options_for_select([@source_project_name, @forked_project_name]), :name => "target_project", :value => "target_project",
-                         :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetProject" %>
-          <%#= select_tag :branch, options_for_select(@source_rev), :name => "target_branch", :value => "target_branch",
-                         :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetBranch" %>
       <% end %>
-      <!--<select name="target_branch" value="source_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>hjq_course</option><option>hjq_beidou</option><option>develop</option><option>dev_huang</option></select>-->
       <div class="cl"></div>
     </div>
     <div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">