<% if @issue.description? %>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index 5250cd1a0..ace425d08 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -7,7 +7,7 @@
paginator: the paginator that renders the pagination tags inside
-%>
<%= paginator.render do -%>
-
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 3b2bd8dfe..a7ed0aa25 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -68,7 +68,7 @@
- <%=link_to "主页", home_path %> >
+ <%=link_to l(:field_homepage), home_path %> >
<%=link_to @user.name, user_path %>
@@ -343,7 +343,7 @@
<% if @user.user_extensions.identity == 2 %>
<%= render_menu :user_enterprise_menu %>
<% else %>
- <%= render_menu :user_menu,@user %>
+ <%= render_menu :user_menu, @user %>
<% end %>
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
new file mode 100644
index 000000000..1735bd899
--- /dev/null
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+<%= @subject %>
+
+<% if @attachments.first || @course_news.first || @bids.first ||
+ @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
+
+ <%= l(:label_course_overview)%>
+ <% unless @course_news.first.nil? %>
+
+
+
+ <%= l(:label_course_news) %>
+ (<%= @course_news.count %>)
+
+
+ <% @course_news.each do |course_new|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_project_notice) %>
+
+ <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(course_new.created_on) %>
+
+ <% end %>
+
+
+
+ <% end %>
+ <% if !@bids.first.nil? || !@homeworks.first.nil? %>
+
+
+ <%= l(:label_homework_overview) %>(<%= @bids.count %>)
+ <% unless @bids.first.nil?%>
+ <% @bids.each do |bid| %>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'), course_url(bid.courses.first, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_course_homework) %>
+
+ <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(:id => bid.id,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(bid.created_on) %>
+
+ <% end %>
+ <% end %>
+ <% unless @homeworks.first.nil? %>
+ <% @homeworks.each do |homework| %>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_course_submit_homework) %>
+
+ <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(:id => homework.bid.id,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(homework.created_on) %>
+
+ <% end %>
+ <% end %>
+
+
+
+ <% end %>
+
+ <% unless @course_journal_messages.first.nil? %>
+
+
+
+ <%= l(:view_course_journals_for_messages) %>
+ (<%= @course_journal_messages.count %>)
+
+
+ <% @course_journal_messages.each do |course_journal_message|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_send_course_journals_for_messages) %>
+
+ <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(course_journal_message.created_on) %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% unless @course_messages.first.nil? %>
+
+
+
+ <%= l(:view_borad_course) %>
+ (<%= @course_journal_messages.count %>)
+
+
+ <% @course_messages.each do |course_message|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_send_course_messages) %>
+
+ <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(course_message.created_on) %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% unless @attachments.first.nil? %>
+
+
+ <%= l(:label_course_attendingcontestwork_download) %>
+ (<%= @attachments.count %>)
+
+
+ <% @attachments.each do |attachment|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_course_file_upload) %>
+
+ <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(attachment.created_on) %>
+
+ <% end %>
+
+
+ <% end %>
+
+ <% end %>
+ <% if @issues.first || @project_messages.first %>
+
+ <%= l(:label_project_overview_new)%>
+ <% unless @issues.first.nil? %>
+
+
+ <%= l(:label_issue_tracking) %>
+ (<%= @issues.count %>)
+
+
+ <% @issues.each do |issue|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_project_issue) %>
+
+ <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(issue.created_on) %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% unless @project_messages.first.nil? %>
+
+
+ <%= l(:project_moule_boards_show) %>
+ (<%= @project_messages.count %>)
+
+
+ <% @project_messages.each do |project_message|%>
+ -
+ ▪
+ [
+
+ <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
+ :class=> "wmail_column",
+ :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ ]
+
+ <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+ <%= l(:label_send_course_messages) %>
+
+ <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(project_message.created_on) %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+
+
+
+ <% end %>
+ <% unless @user_journal_messages.first.nil? %>
+
+ <%= l(:label_activities) %>
+
+
+
+ <%= l(:label_user_message) %>
+ (<%= @user_journal_messages.count %>)
+
+
+ <% @user_journal_messages.each do |user_journal_message|%>
+ -
+ ▪
+
+ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
+ :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ <%= l(:label_show_your_message) %>
+
+ <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(user_journal_message.created_on) %>
+
+ <% end %>
+
+
+
+
+
+ <% end %>
+ <% if @forums.first || @memos.first %>
+
+ <%= l(:lable_bar_active) %>
+ <% unless @forums.first.nil? %>
+
+
+ <%= l(:label_user_forum) %>
+ (<%= @forums.count %>)
+
+
+ <% @forums.each do |forum|%>
+ -
+ ▪
+
+ <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
+ :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ <%= l(:label_forum_new) %>
+
+ <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(forum.created_at) %>
+
+ <% end %>
+
+
+
+ <% end %>
+ <% unless @memos.first.nil? %>
+
+
+ <%= l(:label_user_message_forum) %>
+ (<%= @memos.count %>)
+
+
+ <% @memos.each do |memo|%>
+ -
+ ▪
+
+ <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
+ :class => "wmail_name",
+ :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+ <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
+
+ <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)),
+ :class => 'wmail_info',
+ :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+ %>
+ <%= format_time(memo.created_at) %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+<% end %>
+
+
+
+
+
+
+ - <%= l(:mail_issue_content)%>
+
+
<%= @subject %>
+ <%= link_to @project_url, @project_url%>
+
+
+
+
+
+
+
<% if @memo.attachments.any?%>
<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
- <%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options} %>
+ <%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
<% end %>
@@ -136,7 +136,7 @@
<% if reply.attachments.any?%>
<% options = {:author => true, :deletable => reply.deleted_attach_able_by?(User.current) } %>
- <%= render :partial => 'attachments/links', :locals => {:attachments => reply.attachments, :options => options} %>
+ <%= render :partial => 'attachments/links', :locals => {:attachments => reply.attachments, :options => options, :is_float => true} %>
<% end %>
|
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 47cfb4221..554f50633 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -151,9 +151,9 @@
<% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %>
- <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
+ <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID) %>
<% else %>
- <%= text_field_tag :no, nil, :placeholder => "请输入学号" %>
+ <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID) %>
<% end %>
@@ -217,18 +217,18 @@
<% if User.current.user_extensions.nil? %>
-
+ readonly>
<% else %>
<% if User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
-
+ readonly>
<% elsif User.current.user_extensions.school.nil? %>
-
+ readonly>
<% else %>
diff --git a/app/views/organization/_form.html.erb b/app/views/organization/_form.html.erb
new file mode 100644
index 000000000..80cc76850
--- /dev/null
+++ b/app/views/organization/_form.html.erb
@@ -0,0 +1,21 @@
+<%= error_messages_for 'project' %>
+
+<% unless @organizations.new_record? %>
+
+ <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organizations} %>
+
+<% end %>
+
+
+ <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %>
+
+
+
+ <%#= l(:field_description)%>
+
+
+
+
diff --git a/app/views/organization/edit.html.erb b/app/views/organization/edit.html.erb
new file mode 100644
index 000000000..60b7c06a0
--- /dev/null
+++ b/app/views/organization/edit.html.erb
@@ -0,0 +1,25 @@
+<%= form_for(@organization) do |f|%>
+
+ <%=l(:label_organization_edit)%>
+
+
+ <%= error_messages_for 'project' %>
+
+ <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organization} %>
+
+
+
+ <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %>
+
+
+ <%= submit_tag l(:button_create), :class => "enterprise"%>
+
+
+
+ <%= l(:label_all_enterprises) %>
+
+
+ <% if @organizations.empty? %>
+
+ <%= l(:label_enterprise_nil) %>
+
+ <% else %>
+ <% @organizations.each do |organization| %>
+ <% unless organization.name.blank? %>
+
+ -
+
+ <%= link_to organization.name, home_path(:organization => organization.id) %>
+
+
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+ <%=l(:label_organization_new)%>
+
+
+ <%= 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 %>
+
+<% html_title(l(:label_organization_new)) -%>
\ No newline at end of file
diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb
deleted file mode 100644
index 45813ced5..000000000
--- a/app/views/organizations/index.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= l(:label_all_enterprises) %>
-
-
<%= l(:label_all_enterprises) %>
-
- <% if @projects.count == 0 %>
-
<%= l(:label_enterprise_nil) %>
- <% else %>
- <% @projects.each do |organization| %>
- <% unless organization.enterprise_name.blank? %>
-
- -
- <%= link_to organization.enterprise_name, home_path(:organization => organization) %>
-
- <% end %>
- <% end %>
- <% end %>
-
-
");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("poll_alert_form");
\ No newline at end of file
diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb
index a2d8e28fa..94369678d 100644
--- a/app/views/poll/republish_poll.js.erb
+++ b/app/views/poll/republish_poll.js.erb
@@ -1,2 +1,10 @@
$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
-alert("取消成功");
\ No newline at end of file
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
+showModal('ajax-modal', '180px');
+$('#ajax-modal').css('height','80px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("" +
+ "");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("poll_alert_form");
\ No newline at end of file
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 97f75fda4..d0544cadb 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -1,35 +1,62 @@
<%= error_messages_for 'project' %>
<% unless @project.new_record? %>
-<%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %>
+
+ <%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %>
+
<% end %>
-<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %>
+
+ <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %>
+
<%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
-<%= f.text_field :enterprise_name, :size => 60, :style => "width:490px;" %>
-<%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
+
+ <%#= f.text_field :enterprise_name, :size => 60, :style => "width:490px;" %>
+
+ <%= select_tag :organization_id,options_for_select(project_organizations_id_option,@project.organization_id),{} %>
+
+
+ <%= 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? %>
- <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %>
+
+ <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %>
+ <%= l(:text_project_identifier_info).html_safe %>
+
<% end %>
-<%= f.check_box :is_public, :style => "margin-left:10px;" %>
-<%= f.hidden_field :hidden_repo, :style => "margin-left:10px;" %>
+
+
+ <%= f.check_box :is_public, :style => "margin-left:10px;" %>
+
+
+
+
+ <%= f.check_box :hidden_repo, :style => "margin-left:10px;" %>
+
+
-<%= f.text_field :project_type, :value => 0 %>
+
+ <%= f.text_field :project_type, :value => 0 %>
+
<%= wikitoolbar_for 'project_description' %>
<% @project.custom_field_values.each do |value| %>
- <%= custom_field_tag_with_label :project, value %>
+
+ <%= custom_field_tag_with_label :project, value %>
+
<% end %>
<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb
index fdc60904d..98ab5dcd2 100644
--- a/app/views/projects/_join_project.html.erb
+++ b/app/views/projects/_join_project.html.erb
@@ -1,7 +1,7 @@
- 快速进入项目通道
+ <%= l('project.join.title')%>