From d37e026d6896bb386abec853b19655fd3d4fb8ee Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Tue, 12 Nov 2019 17:23:38 +0800
Subject: [PATCH] FIX create project revision

---
 ReadMe.txt                      |  87 ++++----
 app/models/project.rb           |   8 +-
 app/models/project_category.rb  |   2 +
 app/models/project_language.rb  |   2 +
 app/views/projects/new.html.erb | 376 +++++++++++---------------------
 config/locales/zh.yml           |   6 +
 6 files changed, 187 insertions(+), 294 deletions(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index 895e7ffb8..b96bfa407 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,7 +1,7 @@
 ===================================[2014-04-09]=================================
-kw: 域名, 二级域名, subdomain, forge, course, contest
-域名跳转（forge/course/contest）这几个设置在settings.yml中
-但是跳转在development模式下会导致无法开发
+kw: 锟斤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷, subdomain, forge, course, contest
+锟斤拷锟斤拷锟斤拷转锟斤拷forge/course/contest锟斤拷锟解几锟斤拷锟斤拷锟斤拷锟斤拷settings.yml锟斤拷
+锟斤拷锟斤拷锟斤拷转锟斤拷development模式锟铰会导锟斤拷锟睫凤拷锟斤拷锟斤拷
 
 app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
@@ -10,90 +10,95 @@ app/models/setting.rb :165
       define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/
     end
   end
-  程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
-  为了开发方便，使之功能在development模式下失效。 
+  锟斤拷锟津部凤拷锟斤拷锟斤拷锟斤拷锟狡讹拷锟斤拷subdomain锟斤拷锟斤拷锟斤拷使锟斤拷锟斤拷锟节讹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷转锟斤拷
+  为锟剿匡拷锟斤拷锟斤拷锟姐，使之锟斤拷锟斤拷锟斤拷development模式锟斤拷失效锟斤拷
 
 
 ===================================[2014-04-09]=================================
-kw: 菜单, 导航栏, layout
-网页上方的导航条没有用Redmine::MenuManager
-MenuManager的样式无法定制，菜单显示条件if中的proc执行行为没有了解
+kw: 锟剿碉拷, 锟斤拷锟斤拷锟斤拷, layout
+锟斤拷页锟较凤拷锟侥碉拷锟斤拷锟斤拷没锟斤拷锟斤拷Redmine::MenuManager
+MenuManager锟斤拷锟斤拷式锟睫凤拷锟斤拷锟狡ｏ拷锟剿碉拷锟斤拷示锟斤拷锟斤拷if锟叫碉拷proc执锟斤拷锟斤拷为没锟斤拷锟剿斤拷
 
-#导航栏匹配域名显示和改变
+#锟斤拷锟斤拷锟斤拷匹锟斤拷锟斤拷锟斤拷锟斤拷示锟酵改憋拷
 app\helper\application_helper.rb
-render_dynamic_nav 方法中，利用变量，可以设置在layout中具体显示哪些条目
+render_dynamic_nav 锟斤拷锟斤拷锟叫ｏ拷锟斤拷锟矫憋拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷layout锟叫撅拷锟斤拷锟斤拷示锟斤拷些锟斤拷目
 
 app\views\layouts\_base_header.html.erb
-需要显示的条目，由具体的实例变量设置（在各个layout中）
+锟斤拷要锟斤拷示锟斤拷锟斤拷目锟斤拷锟缴撅拷锟斤拷锟斤拷实锟斤拷锟斤拷锟斤拷锟斤拷锟矫ｏ拷锟节革拷锟斤拷layout锟叫ｏ拷
 
 
 ===================================[2014-04-09]=================================
-kw: home_path, 首页, 跳转, 二级域名, welcome
-#首页根据域名匹配进入不同的页面
+kw: home_path, 锟斤拷页, 锟斤拷转, 锟斤拷锟斤拷锟斤拷锟斤拷, welcome
+#锟斤拷页锟斤拷锟斤拷锟斤拷锟斤拷匹锟斤拷锟斤拷锟诫不同锟斤拷页锟斤拷
 app\controller\welcome_controller.rb
-#entry_select 放射设置二级域名所显示的首页
+#entry_select 锟斤拷锟斤拷锟斤拷锟矫讹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷示锟斤拷锟斤拷页
 
 
 
 ===================================[2014-06-06]=================================
 kw: user_scores
-user_scores表结构有问题，需要运行
+user_scores锟斤拷锟结构锟斤拷锟斤拷锟解，锟斤拷要锟斤拷锟斤拷
 bundle exec rake db:migrate:down VERSION=20140410021724
 bundle exec rake db:migrate:up VERSION=20140410021724
 
 
 
 ===================================[2014-07-08]=================================
-kw: CKEditor, 富文本, 编辑器
-CKEditor插件加载方法
-1.把插件文件夹拷入plugins文件夹，确保文件夹名为redmine_ckeditor
-2.运行 bundle install --without development test
-3.运行 rake redmine:plugins:migrate RAILS_ENV=production
-4.启动服务器
-5.配置CKEditor插件(Administration > Plugins > Configure)
-6.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
-注意：一定要先配置CKEditor插件再见文本格式更改，不然，数据库不会生成对应记录，会报错。。
+kw: CKEditor, 锟斤拷锟侥憋拷, 锟洁辑锟斤拷
+CKEditor锟斤拷锟斤拷锟斤拷锟截凤拷锟斤拷
+1.锟窖诧拷锟斤拷锟侥硷拷锟叫匡拷锟斤拷plugins锟侥硷拷锟叫ｏ拷确锟斤拷锟侥硷拷锟斤拷锟斤拷为redmine_ckeditor
+2.锟斤拷锟斤拷 bundle install --without development test
+3.锟斤拷锟斤拷 rake redmine:plugins:migrate RAILS_ENV=production
+4.锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷
+5.锟斤拷锟斤拷CKEditor锟斤拷锟斤拷(Administration > Plugins > Configure)
+6.锟斤拷锟侥憋拷锟斤拷式 (Administration > Settings > General > Text formatting)锟斤拷为CKEditor
+注锟解：一锟斤拷要锟斤拷锟斤拷锟斤拷CKEditor锟斤拷锟斤拷锟劫硷拷锟侥憋拷锟斤拷式锟斤拷锟侥ｏ拷锟斤拷然锟斤拷锟斤拷锟捷库不锟斤拷锟斤拷锟缴讹拷应锟斤拷录锟斤拷锟结报锟斤拷锟斤拷锟斤拷
 
 
 
 ===================================[2014-07-19]=================================
-kw: 首页, 定制, forge, course, contest, 排序
-若遇到首页定制报错问题请尝试如下操作
-如果运行迁移文件有报错与‘sort_type’相关 
-先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202
-在按如下步骤执行，未报与之相关的则直接按如下步骤执行
-1.运行 bundle exec rake db:migrate:down version=20140719080032
-2.运行 bundle exec rake db:migrate:up version=20140719080032
+kw: 锟斤拷页, 锟斤拷锟斤拷, forge, course, contest, 锟斤拷锟斤拷
+锟斤拷锟斤拷锟斤拷锟斤拷页锟斤拷锟狡憋拷锟斤拷锟斤拷锟斤拷锟诫尝锟斤拷锟斤拷锟铰诧拷锟斤拷
+锟斤拷锟斤拷锟斤拷锟斤拷迁锟斤拷锟侥硷拷锟叫憋拷锟斤拷锟诫‘sort_type锟斤拷锟斤拷锟斤拷
+锟斤拷锟斤拷锟斤拷 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202
+锟节帮拷锟斤拷锟铰诧拷锟斤拷执锟叫ｏ拷未锟斤拷锟斤拷之锟斤拷锟截碉拷锟斤拷直锟接帮拷锟斤拷锟铰诧拷锟斤拷执锟斤拷
+1.锟斤拷锟斤拷 bundle exec rake db:migrate:down version=20140719080032
+2.锟斤拷锟斤拷 bundle exec rake db:migrate:up version=20140719080032
 ===================================[2014-07-30]=================================
-kw: 首页, 定制, forge, course, contest, 排序，image_width 
+kw: 锟斤拷页, 锟斤拷锟斤拷, forge, course, contest, 锟斤拷锟斤拷锟斤拷image_width
 
-undefined image_width 问题
+undefined image_width 锟斤拷锟斤拷
 bundle exec rake db:migrate:down version=20140725062302
 bundle exec rake db:migrate:up version=20140725062302
 
 =================================[2014-07-19]=====================================
-kw: Mysql2::Error,存储过程,CALL sp_project_status_cursor();
+kw: Mysql2::Error,锟芥储锟斤拷锟斤拷,CALL sp_project_status_cursor();
 bundle exec rake db:migrate:down version=20130828004955
 bundle exec rake db:migrate:up version=20130828004955
 
 =================================[2014-08-13]====================================
-kw:配置支持的图片格式
-默认支持如下格式："bmp,jpeg,jpg,png,gif"
-可在configuration.yml中修改，格式：pic_types: "bmp,jpeg,jpg,png,gif"(注意：pic_types若前面有#号需去掉)
-配置完成后重启服务
+kw:锟斤拷锟斤拷支锟街碉拷图片锟斤拷式
+默锟斤拷支锟斤拷锟斤拷锟铰革拷式锟斤拷"bmp,jpeg,jpg,png,gif"
+锟斤拷锟斤拷configuration.yml锟斤拷锟睫改ｏ拷锟斤拷式锟斤拷pic_types: "bmp,jpeg,jpg,png,gif"(注锟解：pic_types锟斤拷前锟斤拷锟斤拷#锟斤拷锟斤拷去锟斤拷)
+锟斤拷锟斤拷锟斤拷锟缴猴拷锟斤拷锟斤拷锟斤拷锟斤拷
 
 =================================[2014-08-16]====================================
-kw:数据迁移，project_scores表已存在
+kw:锟斤拷锟斤拷迁锟狡ｏ拷project_scores锟斤拷锟窖达拷锟斤拷
 bundle exec rake db:migrate:down VERSION=20140811022947
 bundle exec rake db:migrate:up VERSION=20140811022947
 bundle exec rake db:migrate
 bundle exec rake project_score:calculate
 =================================[2014-10-17]====================================
-kw:数据迁移，web_footer_oranizers表已存在
+kw:锟斤拷锟斤拷迁锟狡ｏ拷web_footer_oranizers锟斤拷锟窖达拷锟斤拷
 bundle exec rake db:migrate:down VERSION=20141013014908
 bundle exec rake db:migrate:up VERSION=20141013014908
 bundle exec rake db:migrate
-kw:数据迁移，web_footer_companies表已存在
+kw:锟斤拷锟斤拷迁锟狡ｏ拷web_footer_companies锟斤拷锟窖达拷锟斤拷
 bundle exec rake db:migrate:down VERSION=20141013023400
 bundle exec rake db:migrate:up VERSION=20141013023400
 bundle exec rake db:migrate
+
+=================================[2019-11-12]====================================
+鍒濆鍖栧紑婧愰」鐩浉鍏崇殑licenses鍜宨gnores
+bundle exec rake licenses:init
+bundle exec rake ignores:init
diff --git a/app/models/project.rb b/app/models/project.rb
index df6948a4e..63cfa4d87 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -43,6 +43,8 @@ class Project < ActiveRecord::Base
     end
   end
 
+  belongs_to :ignore
+  belongs_to :license
   belongs_to :project_category , :counter_cache => true
   belongs_to :project_language , :counter_cache => true
   belongs_to :owner, :class_name => 'User', :foreign_key => :user_id
@@ -852,7 +854,11 @@ class Project < ActiveRecord::Base
     'dts_test',
     'attachmenttype',
     'enterprise_name',
-    'gpid'
+    'gpid',
+    'project_category_id',
+    'project_language_id',
+    'license_id',
+    'ignore_id'
 
 
 
diff --git a/app/models/project_category.rb b/app/models/project_category.rb
index 756d79637..c36f53047 100644
--- a/app/models/project_category.rb
+++ b/app/models/project_category.rb
@@ -4,4 +4,6 @@ class ProjectCategory < ActiveRecord::Base
   has_ancestry
 
   has_many :projects
+
+  scope :desc_with_position, -> { order('position DESC') }
 end
diff --git a/app/models/project_language.rb b/app/models/project_language.rb
index 5976cb283..a6c23bb90 100644
--- a/app/models/project_language.rb
+++ b/app/models/project_language.rb
@@ -3,4 +3,6 @@ class ProjectLanguage < ActiveRecord::Base
   attr_accessible :name, :position, :projects_count
 
   has_many :projects
+
+  scope :desc_with_position, -> { order('position DESC') }
 end
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index ba54f0763..514d46bc1 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,265 +1,137 @@
-<% if false %>
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<% end %>
-<%= error_messages_for 'project' %>
-<div class="project_r_h02">
-  <h2 class="project_h2"><%= l(:label_project_new)%></h2>
-</div>
-<div class="hwork_new">
-  <ul>
-    <%= labelled_form_for @project do |f| %>
-        <li  class="ml45 mb10">
-          <input type="text" style="display: none"/> <!--闃绘琛ㄥ崟鑷姩濉厖 -->
-          <input type="password" style="display: none"/> <!--闃绘琛ㄥ崟鑷姩濉厖 -->
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_projects_new_name)%>&nbsp;&nbsp;:</label>
-          <input  type="text" name="project[name]" id="project_name" class="project_new_input project_new_input_project_new" maxlength="100" placeholder="渚嬪锛氬洟闃熷崗浣滄柟娉曚笌鏈哄埗鐮旂┒" onkeyup="regex_project_name();">
-          <p class="c_orange ml70" id="project_name_notice" style="display: none;">椤圭洰鍚嶇О涓嶈兘涓虹┖</p>
-        </li>
-        <div class="cl"></div>
-       <!-- <li  class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%#= l(:label_type_project)%>&nbsp;&nbsp;锛�</label>
-          <%#= select_tag :project_new_type, options_for_select([["寮�鍙戞ā寮�", "1"], ["鐮旇妯″紡", "2"], ["鍦堝瓙妯″紡", "3"]]) %>
-          <span class=" ml15 c_orange" id = "project_newtype_select"><%#= l(:label_type_des_development) %></span>
-        </li>
-        <div class="cl"></div>-->
-        <li class="ml45 mb10">
-          <label class="fl mr5">&nbsp;&nbsp;<%= l(:label_tags_project_description) %>&nbsp;&nbsp;:</label>
-          <%= f.kindeditor  :description, :editor_id => 'project_create_editor',
-                           :owner_id => @project.nil? ? 0: @project.id,
-                           :owner_type => OwnerTypeHelper::PROJECT,
-                           :width => '86%',
-                           :height => 300,
-                           :minHeight=> 300,
-                           :class => 'courses_text ml5 fl',
-                           :input_html => { :id => 'description',
-                                            :class => 'courses_text fl',
-                                            :maxlength => 5000 }
-          %>
-          <!--<textarea  name="project[description]" placeholder="鏈�澶�3000涓眽瀛�(鎴�6000涓嫳鏂囧瓧绗�)"  class="courses_text fl"  ></textarea>-->
-          <div class="cl"></div>
-        </li>
-        <li>
-          <p style="display: none" >
-            <%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
-                             value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
-            <% unless @project.identifier_frozen? %>
-                <em class="info">
-                  <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %>
-                  <%= l(:text_project_identifier_info).html_safe %>
-                </em>
-            <% end %></p>
-        </li>
-        <li class="mb5 ml70">
-          <label >&nbsp;鍏紑&nbsp;锛�</label>
-          <input id="project_is_public" name="project[is_public]"  type="checkbox" value="1" checked="checked">
-          <span class="c_grey">锛堟墦閽╀负鍏紑椤圭洰锛屼笉鎵撻挬涓虹鏈夐」鐩紱绉佹湁椤圭洰浠呴」鐩垚鍛樺彲瑙併�傦級</span>
-          <div class="cl"></div>
-        </li>
-        <li class=" ml90" >
-          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_project();" >鎻愪氦</a>
-          <% if @course %>
-              <%= link_to "鍙栨秷",homework_common_index_path(:course => @course.id),:class => "grey_btn fl c_white ml10"%>
-          <% elsif @contest %>
-              <%= link_to "鍙栨秷",works_path(:contest => @contest.id),:class => "grey_btn fl c_white ml10"%>
-          <% else %>
-              <%= link_to "鍙栨秷",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
-          <% end %>
-          <div class="cl"></div>
-        </li>
-    <% end%>
-  </ul>
-</div><!--talknew end-->
-<div class="cl"></div>
-
 <% html_title(l(:label_project_new)) -%>
 
-<script>
-    //////////////////////////////////////////////////////////////
-    //鏂板缓椤圭洰
-    //楠岃瘉椤圭洰鍚嶇О
-    function regex_project_name()
-    {
-        var name = $.trim($("#project_name").val());
-        if(name.length == 0)
-        {
-            $("#project_name_notice").show();
-            return false;
-        }
-        else
-        {
-            $("#project_name_notice").hide();
-            return true;
-        }
-    }
-
-    //鎻愪氦鏂板缓椤圭洰
-    function submit_new_project()
-    {
-        project_create_editor.sync();
-        if(regex_project_name())
-        {
-            $("#new_project").submit();
-        }
-    }
-
-    $(function(){
-        $('#project_new_type').change(function(){
-            var type = $('#project_new_type').val();
-            if(type == '1'){
-                $(this).next().html("<%= l(:label_type_des_development)%>");
-            }
-            else if(type == '2'){
-                $(this).next().html("<%= l(:label_type_des_research)%>");
-            }
-            else if(type == '3'){
-                $(this).next().html("<%= l(:label_type_des_friend)%>");
-            }
-//            var p1=$(this).children('option:selected').val("鐮旇妯″紡锛氶潰鍚戝皬缁勭爺绌讹紝鏀寔浠诲姟鍒嗗伐銆佽鍧涗氦娴併�佽祫婧愬垎浜瓑銆�");//杩欏氨鏄痵elected鐨勫��
-//            var p2=$('#param2').val();//鑾峰彇鏈〉闈㈠叾浠栨爣绛剧殑鍊�
-        })
-
-    })
-</script>
-<% end %>
-<%= javascript_include_tag "/codemirror/lib/codemirror", "/codemirror/mode/javascript/javascript", "/codemirror/addon/hint/show-hint", "/codemirror/addon/hint/javascript-hint", "/codemirror/addon/selection/active-line", "/codemirror/addon/lint/javascript-lint", "/codemirror/addon/lint/css-lint", "/codemirror/addon/lint/lint", "/codemirror/addon/lint/json-lint", "/editormd/lib/codemirror/addon/lint/css-lint" %>
+<%= javascript_include_tag "/editormd/lib/codemirror/addon/lint/css-lint" %>
 <%= stylesheet_link_tag "/codemirror/lib/codemirror" %>
 <%= stylesheet_link_tag '/editormd/css/editormd' %>
 <%= javascript_include_tag '/editormd/editormd' %>
 <div class="s_m_Panel">
   <p class="f22 color-grey3 mt20 mb10"><%= l(:label_project_new)%></p>
-  <div class="back_white padding30 mb50 submitForm">
-    <li>
-      <span class="form_span requiredTag">椤圭洰鍚嶇О锛�</span>
-      <div class="flex1">
-        <input type="text" class="choose_100_35" name="p_name" maxlength="60" placeholder="璇疯緭鍏ユ爣棰橈紝鏈�澶ч檺鍒�60瀛楃"/>
-        <p class="notice_form"><span id="project_name_notice" class="none">璇疯緭鍏ラ」鐩悕绉�</span></p>
-      </div>
-    </li>
-    <li>
-      <span class="form_span requiredTag">椤圭洰璇█锛�</span>
-      <div class="flex1">
-        <select class="choose_100_35" name="p_language">
-          <option value="0">璇烽�夋嫨椤圭洰璇█</option>
-          <option value="1">111</option>
-        </select>
-        <p class="notice_form"><span id="project_language_notice" class="none">璇烽�夋嫨椤圭洰璇█</span></p>
-      </div>
-      <span class="form_span requiredTag ml50">娣诲姞寮�婧愯鍙瘉锛�</span>
-      <div class="flex1">
-        <select class="choose_100_35" name="p_tag">
-          <option value="0">璇烽�夋嫨寮�婧愯鍙瘉</option>
-          <option value="1">111</option>
-        </select>
-        <p class="notice_form"><span id="project_tag_notice" class="none">璇烽�夋嫨寮�婧愯鍙瘉</span></p>
-      </div>
-    </li>
-    <li>
-      <span class="form_span requiredTag">椤圭洰绫诲埆锛�</span>
-      <div class="flex1">
-        <select class="choose_100_35" name="p_type">
-          <option value="0">璇烽�夋嫨椤圭洰绫诲埆</option>
-          <option value="1">111</option>
-        </select>
-        <p class="notice_form"><span id="project_type_notice" class="none">璇烽�夋嫨椤圭洰璇█</span></p>
-      </div>
-      <span class="form_span requiredTag ml30">娣诲姞.gitignore妯℃澘锛�</span>
-      <div class="flex1">
-        <select class="choose_100_35" name="p_modal">
-          <option value="0">璇烽�夋嫨.gitignore妯℃澘</option>
-          <option value="1">111</option>
-        </select>
-        <p class="notice_form"><span id="project_modal_notice" class="none">璇烽�夋嫨寮�婧愯鍙瘉</span></p>
-      </div>
-    </li>
-    <li>
-      <span class="form_span">椤圭洰绠�浠嬶細</span>
-      <div class="flex1" id="projects_introduction">
-          <textarea name="shixun[description]"><%#= @introduction_sample || @shixun.description %></textarea>
-      </div>
-    </li>
-    <li>
-      <span class="form_span">鍏紑锛�</span>
-      <div class="flex1 pt8">
-        <input type="checkbox" class="magic-checkbox p_cursor" name="isPublic" id="isPublic"/>
-        <label for="isPublic" class="fontGrey4 p_cursor">锛堟墦閽╀负鍏紑椤圭洰锛屼笉鎵撻挬涓虹鏈夐」鐩紱绉佹湁椤圭洰浠呴」鐩垚鍛樺彲瑙侊級</label>
-      </div>
-    </li>
-    <ul class="edu-txt-center mt30">
-      <span class="inline">
-        <a href="javascript:void(0)" class="btn_big_default mr30">鍙栨秷</a>
-        <a href="javascript:void(0)" type="submit" class="btn_big_default btn_big_blue" onclick="submit_project_create();">纭畾</a>
-      </span>
-    </ul>
-  </div>
+  <%= labelled_form_for @project do |f| %>
+    <div class="back_white padding30 mb50 submitForm">
+      <li>
+        <span class="form_span requiredTag"><%= l(:lable_project_name)%>锛�</span>
+        <div class="flex1">
+          <%= f.text_field :name, :class=>"choose_100_35" ,:placeholder=>"璇疯緭鍏ユ爣棰橈紝鏈�澶ч檺鍒�60瀛楃", :maxlength => "60", :no_label => true %>
+          <p class="notice_form"><span id="project_name_notice" class="none">璇疯緭鍏ラ」鐩悕绉�</span></p>
+        </div>
+      </li>
+      <li>
+        <span class="form_span requiredTag"><%= l(:lable_project_language)%>锛�</span>
+        <div class="flex1">
+          <%= f.select :project_language_id, (ProjectLanguage.desc_with_position.collect { |pl| [pl.name, pl.id] }),
+                      {:no_label => true, :required => true}, :class => "choose_100_35"  %>
+          <p class="notice_form"><span id="project_language_notice" class="none">璇烽�夋嫨椤圭洰璇█</span></p>
+        </div>
+        <span class="form_span requiredTag ml50"><%= l(:lable_project_add_license) %>锛�</span>
+        <div class="flex1">
+          <%= f.select :license_id, options_for_select(License.all.collect { |c| [c.name, c.id]}, @project.license_id),
+                       {:required => true, :no_label => true}, multi: false, :class => "choose_100_35" %>
+          <p class="notice_form"><span id="project_tag_notice" class="none">璇烽�夋嫨寮�婧愯鍙瘉</span></p>
+        </div>
+      </li>
+      <li>
+        <span class="form_span requiredTag"><%= l(:lable_project_category) %>锛�</span>
+        <div class="flex1">
+          <%= f.select :project_category_id, options_for_select(ProjectCategory.desc_with_position.collect { |c| [c.name, c.id]}, @project.project_category_id),
+                       {:required => true, :no_label => true}, multi: false, :class => "choose_100_35" %>
+          <p class="notice_form"><span id="project_type_notice" class="none">璇烽�夋嫨椤圭洰璇█</span></p>
+        </div>
+        <span class="form_span requiredTag ml30"><%= l(:lable_project_add_gitignore) %>锛�</span>
+        <div class="flex1">
+          <%= f.select :ignore_id, options_for_select(Ignore.all.collect { |c| [c.name, c.id]}, @project.ignore_id),
+                       {:required => true, :no_label => true}, multi: false, :class => "choose_100_35" %>
+          <p class="notice_form"><span id="project_modal_notice" class="none">璇烽�夋嫨寮�婧愯鍙瘉</span></p>
+        </div>
+      </li>
+      <li>
+        <span class="form_span"><%= l(:lable_project_description) %>锛�</span>
+        <div class="flex1" id="projects_introduction">
+          <textarea name="project[description]"><%= @project.description %></textarea>
+        </div>
+      </li>
+      <li>
+        <span class="form_span">鍏紑锛�</span>
+        <div class="flex1 pt8">
+          <input type="checkbox" checked name="project[is_public]" value="1" id="project_is_public" class="magic-checkbox p_cursor" >
+          <label for="project_is_public" class="fontGrey4 p_cursor">锛堟墦閽╀负鍏紑椤圭洰锛屼笉鎵撻挬涓虹鏈夐」鐩紱绉佹湁椤圭洰浠呴」鐩垚鍛樺彲瑙侊級</label>
+        </div>
+      </li>
+      <ul class="edu-txt-center mt30">
+        <span class="inline">
+          <a href="javascript:void(0)" class="btn_big_default mr30">鍙栨秷</a>
+          <a href="javascript:void(0)" type="submit" class="btn_big_default btn_big_blue" onclick="submit_project_create();">纭畾</a>
+        </span>
+      </ul>
+    </div>
+  <% end %>
 </div>
 <script>
-    /* ------------------------------- 绠�浠媘d ------------------------------*/
-    var shixun_editormd = editormd("projects_introduction", {
-        width: "100%",
-        height: 240,
-        syncScrolling: "single",
-        //浣犵殑lib鐩綍鐨勮矾寰勶紝鎴戣繖杈圭敤JSP鍋氭祴璇曠殑
-        path: "/editormd/lib/",
-        tex: true,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
+  /* ------------------------------- 绠�浠媘d ------------------------------*/
+  var shixun_editormd = editormd("projects_introduction", {
+    width: "100%",
+    height: 240,
+    syncScrolling: "single",
+    //浣犵殑lib鐩綍鐨勮矾寰勶紝鎴戣繖杈圭敤JSP鍋氭祴璇曠殑
+    path: "/editormd/lib/",
+    tex: true,
+    toolbarIcons: function () {
+        // Or return editormd.toolbarModes[name]; // full, simple, mini
+        // Using "||" set icons align right.
+        return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+    },
 
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //杩欎釜閰嶇疆鍦╯imple.html涓苟娌℃湁锛屼絾鏄负浜嗚兘澶熸彁浜よ〃鍗曪紝浣跨敤杩欎釜閰嶇疆鍙互璁╂瀯閫犲嚭鏉ョ殑HTML浠ｇ爜鐩存帴鍦ㄧ浜屼釜闅愯棌鐨則extarea鍩熶腑锛屾柟渚縫ost鎻愪氦琛ㄥ崟銆�
-        saveHTMLToTextarea: true,
-        autoFocus: false,
-        // 鐢ㄤ簬澧炲姞鑷畾涔夊伐鍏锋爮鐨勫姛鑳斤紝鍙互鐩存帴鎻掑叆HTML鏍囩锛屼笉浣跨敤榛樿鐨勫厓绱犲垱寤哄浘鏍�
-        dialogMaskOpacity: 0.6,
-        placeholder: "璇疯緭鍏ラ」鐩畝浠嬪唴瀹�",
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: "<%#= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
-    });
+    toolbarCustomIcons: {
+        testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+        testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+    },
+    //杩欎釜閰嶇疆鍦╯imple.html涓苟娌℃湁锛屼絾鏄负浜嗚兘澶熸彁浜よ〃鍗曪紝浣跨敤杩欎釜閰嶇疆鍙互璁╂瀯閫犲嚭鏉ョ殑HTML浠ｇ爜鐩存帴鍦ㄧ浜屼釜闅愯棌鐨則extarea鍩熶腑锛屾柟渚縫ost鎻愪氦琛ㄥ崟銆�
+    saveHTMLToTextarea: true,
+    autoFocus: false,
+    // 鐢ㄤ簬澧炲姞鑷畾涔夊伐鍏锋爮鐨勫姛鑳斤紝鍙互鐩存帴鎻掑叆HTML鏍囩锛屼笉浣跨敤榛樿鐨勫厓绱犲垱寤哄浘鏍�
+    dialogMaskOpacity: 0.6,
+    placeholder: "璇疯緭鍏ラ」鐩畝浠嬪唴瀹�",
+    imageUpload: true,
+    imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+    imageUploadURL: "<%#= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
+  });
 
 //    纭畾鎻愪氦---check
-    function  submit_project_create() {
-        var name=$("input[name='p_name']").val();
-        var language=$("select[name='p_language'] option:selected").val();
-        var tag=$("select[name='p_tag'] option:selected").val();
-        var type=$("select[name='p_type'] option:selected").val();
-        var modal=$("select[name='p_modal'] option:selected").val();
-        if(!name){
-            $("#project_name_notice").removeClass("none");
-            return;
-        }else{
-            $("#project_name_notice").addClass("none");
-        }
-        if(language == "0"){
-            $("#project_language_notice").removeClass("none");
-            return;
-        }else{
-            $("#project_language_notice").addClass("none");
-        }
-        if(tag == "0"){
-            $("#project_tag_notice").removeClass("none");
-            return;
-        }else{
-            $("#project_tag_notice").addClass("none");
-        }
-        if(type == "0"){
-            $("#project_type_notice").removeClass("none");
-            return;
-        }else{
-            $("#project_type_notice").addClass("none");
-        }
-        if(modal == "0"){
-            $("#project_modal_notice").removeClass("none");
-            return;
-        }else{
-            $("#project_modal_notice").addClass("none");
-        }
-
+  function  submit_project_create() {
+    var name=$("input[name='project[name]']").val();
+    var language=$("select[name='project[project_language_id]'] option:selected").val();
+    var tag=$("select[name='project[license_id]'] option:selected").val();
+    var type=$("select[name='project[project_category_id]'] option:selected").val();
+    var modal=$("select[name='project[ignore_id]'] option:selected").val();
+    if(!name){
+      $("#project_name_notice").removeClass("none");
+      return;
+    }else{
+      $("#project_name_notice").addClass("none");
     }
-</script>
\ No newline at end of file
+    if(language == "0"){
+      $("#project_language_notice").removeClass("none");
+      return;
+    }else{
+      $("#project_language_notice").addClass("none");
+    }
+    if(tag == "0"){
+      $("#project_tag_notice").removeClass("none");
+      return;
+    }else{
+      $("#project_tag_notice").addClass("none");
+    }
+    if(type == "0"){
+      $("#project_type_notice").removeClass("none");
+      return;
+    }else{
+      $("#project_type_notice").addClass("none");
+    }
+    if(modal == "0"){
+        $("#project_modal_notice").removeClass("none");
+        return;
+    }else{
+        $("#project_modal_notice").addClass("none");
+    }
+    $("#new_project").submit();
+  }
+</script>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 758ca7437..8fed6408c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -918,6 +918,12 @@ zh:
   label_user_search: "鎼滅储鐢ㄦ埛锛�"
   label_mobile_version: "绉诲姩绔増鏈鐞�"
 
+  lable_project_name: "椤圭洰鍚嶇О"
+  lable_project_description: "椤圭洰绠�浠�"
+  lable_project_category: "椤圭洰绫诲埆"
+  lable_project_language: "椤圭洰璇█"
+  lable_project_add_gitignore: "娣诲姞.gitignore妯℃澘"
+  lable_project_add_license: "娣诲姞寮�婧愯鍙瘉"
 
 
   button_create_and_continue: 鍒涘缓骞剁户缁�