diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4d80efdf3..ee958f20e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -162,7 +162,7 @@ class ProjectsController < ApplicationController
@trackers = Tracker.sorted.all
@project = Project.new
@project.safe_attributes = params[:project]
- render :layout => 'base'
+ render :layout => 'new_base'
else
redirect_to signin_url
end
@@ -220,7 +220,7 @@ class ProjectsController < ApplicationController
end
else
respond_to do |format|
- format.html { render :action => 'new', :layout => 'base'}#Added by young
+ format.html { render :action => 'new', :layout => 'new_base'}#Added by young
format.api { render_validation_errors(@project) }
end
end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 6a865b203..2db03dce1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -76,6 +76,24 @@ module ProjectsHelper
return result
end
+ # 项目类型
+ def project_type_select
+ type = []
+ option1 = []
+ option1 << l(:label_development_team)
+ option1 << l(:label_development_team)
+ option2 = []
+ option2 << l(:label_research_group)
+ option2 << l(:label_research_group)
+ option3 = []
+ option3 << l(:label_friend_organization)
+ option3 << l(:label_friend_organization)
+ type << option1
+ type << option2
+ type << option3
+ type
+ end
+
# 被邀请成员的状态
def status_for_ivitied(ivite_list, project)
if ivite_list.user.member_of?(project)
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 98612b733..039a9e69c 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,23 +1,73 @@
<% @nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1 %>
-<%= labelled_form_for @project do |f| %>
-
- <%=l(:label_project_new)%>
-
-
-
-
- <%=raw l(:label_project_new_description)%>
-
- <%= render :partial => 'form', :locals => { :f => f } %>
-
- <%= submit_tag l(:button_create), :class => "enterprise"%>
-
-
- <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %>
- <%= javascript_tag "$('#project_name').focus();" %>
-
-<% end %>
+
+
<%= l(:label_project_new)%>
+
+
+
-<% html_title(l(:label_project_new)) -%>
\ No newline at end of file
+<% html_title(l(:label_project_new)) -%>
+
+
\ No newline at end of file
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 457d56dad..7cbb223c6 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -284,7 +284,8 @@ zh:
label_tags_issue: "问题名称"
label_tags_issue_description: 问题描述
- label_tags_project_name: "项目名称:"
+ label_tags_project_name: "项目名称:"
+ label_projects_new_name: "项目名称"
label_tags_project_description: "项目描述"
label_tags_user_mail: "用户邮箱:"
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 599b51c30..b4234f358 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -60,6 +60,7 @@ zh:
label_friend_organization: 圈子模式
label_research_group: 研讨模式
label_development_team: 开发模式
+ label_type_project: 项目类型
label_member: 成员
project_module_attachments: 资源
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index d3c3377f5..491b5bb92 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -505,4 +505,5 @@ function judgeprojectname(){
//用户反馈
function submitProjectFeedback() {
$("#project_feedback_form").submit();
-}
\ No newline at end of file
+}
+
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index bee965a90..f69e828e8 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -3,6 +3,7 @@
.project_content{ width:940px; margin:10px auto;}
.project_left{ float:left;}
.project_right{ width:670px; float:left;background:#fff; padding:10px;}
+.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
/*简介*/
.project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d;}