From fe94efeb39aa9a75a0a78bec44d67c6eb3c9f17f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 16 Apr 2015 10:50:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/settings/_new_versions.html.erb  | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index 06e704495..75216ebb3 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -1,3 +1,10 @@
+<script>
+    function pro_st_show_ban()
+    {
+        $("#pro_st_edit_ban").toggle();
+    }
+
+</script>
 <% if @project.shared_versions.any? %>
 <table class="pro_table">
   <tbody>
@@ -44,12 +51,45 @@
       <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put, :class =>"c_orange fr" %>
   <% end %>
 <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ban();"></a>
-  <%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'c_blue fl' if User.current.allowed_to?(:manage_versions, @project) %>
+  <%= link_to l(:label_version_new),"#", :class => 'c_blue fl',:onclick=>"pro_st_show_ban();" if User.current.allowed_to?(:manage_versions, @project) %>
 <div class="cl"></div>
+<%= form_for :version, :url => project_versions_path(@project),:html=>{:id=>"new_project_version_form"} do |f| %>
 <div id="pro_st_edit_ban" class="pro_st_edit_ban">
-
+  <ul>
+    <li >
+      <label class="label02"><span class="c_red">*</span>&nbsp;名称&nbsp;&nbsp;：</label>
+      <%= f.text_field :name, :maxlength => 60, :required => true %>
+    </li>
+    <li >
+      <label class="label02">&nbsp;描述 &nbsp;&nbsp;：</label>
+      <%= f.text_field :description, :maxlength => 60 %>
+    </li>
+    <li >
+      <label class="label02">&nbsp;状态&nbsp;&nbsp;：</label>
+      <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
+    </li>
+    <li >
+      <label class="label02">&nbsp;Wiki 页面&nbsp;&nbsp;：</label>
+      <%= f.text_field :wiki_page_title, :size =>60, :label => :label_wiki_page, :disabled => @project.wiki.nil? %>
+    </li>
+    <li >
+      <label class="label02">&nbsp;日期  &nbsp;&nbsp;：</label>
+      <%= f.text_field :effective_date, :size => 10, :readonly => true %>
+      <%= calendar_for('version_effective_date') %>
+    </li>
+    <div class="cl mb10"></div>
+    <li >
+      <label class="label02">&nbsp;共享  &nbsp;&nbsp;：</label>
+      <select id="" name="version[sharing]">
+        <option value="" selected="selected">不共享  </option>
+        <option value="">共享  </option>
+      </select>
+    </li>
+    <a href="#" onclick="$('#new_project_version_form').submit();" class="blue_btn ml110">保存</a>
+  </ul>
 
 </div>
+<% end %>
 
 
 

From 38672458b04f5521363d8a3935ea98fb902a3cb7 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 16 Apr 2015 11:07:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC=20=20?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_versions.html.erb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index 1d16a21e1..7d513f192 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -74,16 +74,13 @@
     </li>
     <li >
       <label class="label02">&nbsp;日期  &nbsp;&nbsp;：</label>
-      <%= f.text_field :effective_date, :size => 10, :readonly => true %>
+      <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>" fl" %>
       <%= calendar_for('version_effective_date') %>
     </li>
     <div class="cl mb10"></div>
     <li >
       <label class="label02">&nbsp;共享  &nbsp;&nbsp;：</label>
-      <select id="" name="version[sharing]">
-        <option value="" selected="selected">不共享  </option>
-        <option value="">共享  </option>
-      </select>
+      <%= f.select :sharing,  @project.versions.build.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
     </li>
     <a href="#" onclick="$('#new_project_version_form').submit();" class="blue_btn ml110">保存</a>
   </ul>