diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c497cb4e..3a2b0560 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3036,11 +3036,11 @@ module ApplicationHelper elsif @contest title << (@contest.name.nil? ? "创新源于实践" : @contest.name) elsif @shixun - title << (@shixun.name.nil? ? "开发社区" : @shixun.name) + title << (@shixun.name.nil? ? "实训项目" : @shixun.name) elsif @my_shixun - title << ("我的实训") + title << ("我的实训项目") elsif params[:controller] == "shixuns" && params[:action] == "index" - title << ("开发社区") + title << ("实训项目") elsif @subject title << (@subject.name.nil? ? "实践课程" : @subject.name) elsif params[:controller] == "subjects" && params[:action] == "index" diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb index d41ba5e4..ea9589de 100644 --- a/app/views/competitions/_header.html.erb +++ b/app/views/competitions/_header.html.erb @@ -74,14 +74,13 @@
- + @@ -62,12 +62,11 @@ display: none; right:110px;">
  • <%= link_to '我的翻转课堂', user_path(User.current) %>
  • <%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %>
  • <%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %>
    • +
  • <%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %>
    • +
  • <%= link_to '我的众包', user_path(User.current, :type => 'a_package') %>
    • <% if User.current.partner.present? %>
  • <%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %>
    • <% end %> -
  • <%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %>
    • -
  • <%= link_to '我的众包', user_path(User.current, :type => 'a_package') %>
    • - <% if User.current.department_members.count > 0 %>
  • <%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %>
    • <% end %> diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb index 29e9ede5..0ff6fd66 100644 --- a/app/views/layouts/_public_left_info.html.erb +++ b/app/views/layouts/_public_left_info.html.erb @@ -16,7 +16,7 @@ 项目 @@ -37,12 +37,12 @@
    实训
    @@ -112,6 +112,6 @@ // 新建实训 function shixun_valication(){ - sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); + sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱'); } \ No newline at end of file diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 471a42c2..9875099d 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -9,7 +9,7 @@
  • "><%= link_to "实践课程", subjects_path %>
  • "><%= link_to "翻转课堂", courses_path %>
    • -
  • "><%= link_to "开发社区", shixuns_path %>
    • +
  • "><%= link_to "实训项目", shixuns_path %>
    • <% careers = Career.published.order("created_at asc") %> <% if careers.present? %> @@ -47,7 +47,7 @@
    - + diff --git a/app/views/layouts/base_project_community.html.erb b/app/views/layouts/base_project_community.html.erb index e1e0b7ef..5e9d167a 100644 --- a/app/views/layouts/base_project_community.html.erb +++ b/app/views/layouts/base_project_community.html.erb @@ -56,10 +56,10 @@ <% if is_current_user %>
  • - <%= link_to "新建项目", new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %> + <%= link_to "新建开发项目", new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
  • - <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %> + <%= link_to "加入开发项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
  • <%= link_to "我发布的issue", user_manage_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %> diff --git a/app/views/layouts/new_base_user_show.html.erb b/app/views/layouts/new_base_user_show.html.erb index 1b767d00..760eb944 100644 --- a/app/views/layouts/new_base_user_show.html.erb +++ b/app/views/layouts/new_base_user_show.html.erb @@ -208,10 +208,10 @@
    • <% if is_current_user %>
  • - 新建项目 + 新建开发项目
  • - 加入项目 + 加入开发项目
    • diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 0e9f3d79..314c755f 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -47,7 +47,7 @@ <% end%>
    <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> - 系统提示：该作业要求各组长<%=link_to "创建项目", "https://www.trustie.net/projects/new",:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ + 系统提示：该作业要求各组长<%=link_to "创建开发项目", "https://www.trustie.net/projects/new",:class=>"c_red",:title=>"新建开发项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%> 系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！ <% end %> diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 9cf8ed12..78acf6c6 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -10,7 +10,7 @@
    -

    新建项目

    +

    新建开发项目

    <%= l(:label_projects_new_name) %>

    diff --git a/app/views/student_work/_new_project.html.erb b/app/views/student_work/_new_project.html.erb index 3d9214c7..0d69382d 100644 --- a/app/views/student_work/_new_project.html.erb +++ b/app/views/student_work/_new_project.html.erb @@ -1,6 +1,6 @@
    <%= labelled_form_for(Project.new,:remote => "true") do |f| %> -

    新建项目

    +

    新建开发项目

    diff --git a/app/views/subjects/_course_shixun_list.html.erb b/app/views/subjects/_course_shixun_list.html.erb index af409ec1..9cc13588 100644 --- a/app/views/subjects/_course_shixun_list.html.erb +++ b/app/views/subjects/_course_shixun_list.html.erb @@ -59,7 +59,7 @@ function newshixuns(mail){ if(mail){ - sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); + sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱'); }else{ var a = $("Apple").get(0); diff --git a/app/views/subjects/_new_shixun_list.html.erb b/app/views/subjects/_new_shixun_list.html.erb index 17aafc08..0693b13c 100644 --- a/app/views/subjects/_new_shixun_list.html.erb +++ b/app/views/subjects/_new_shixun_list.html.erb @@ -83,7 +83,7 @@ function newshixuns(mail){ if(mail){ - sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); + sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱'); }else{ var a = $("Apple").get(0); diff --git a/app/views/users/_l_shixun.html.erb b/app/views/users/_l_shixun.html.erb index 2b65ab07..f6575ea5 100644 --- a/app/views/users/_l_shixun.html.erb +++ b/app/views/users/_l_shixun.html.erb @@ -54,7 +54,7 @@
    - 新建实训 + 新建实训项目
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 1434fe5b..156d3d53 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -23,7 +23,7 @@
    <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%> - 系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ + 系统提示：该作业要求各组长<%=link_to "创建开发项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建开发项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ <% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%> 系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！ <% end %> diff --git a/app/views/users/shixuns.html.erb b/app/views/users/shixuns.html.erb index 4c709872..d36950d1 100644 --- a/app/views/users/shixuns.html.erb +++ b/app/views/users/shixuns.html.erb @@ -1,6 +1,6 @@

    <%= @user.show_real_name %> > - 精选实训 > 我的实训

    + 精选实训 > 我的实训项目

    @@ -45,7 +45,7 @@ // 新建实训 function shixun_new(mail){ if(mail){ - sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); + sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱'); }else{ window.location.href= '<%= new_shixun_path %>'; } diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 009bfe6a..667bf388 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -1,7 +1,7 @@
    <% if @user.allowed_to?(:add_project, nil, :global => true) %> - 新建项目 + 新建开发项目 <% end %>
    diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index f7a6dbc4..29370db3 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -69,7 +69,7 @@
    -

    开发社区

    +

    实训项目

    DEVELOPMENT COMMUNITY

    更多 diff --git a/public/assets/wechat/new_project.html b/public/assets/wechat/new_project.html index 103651ef..eedd0a9c 100644 --- a/public/assets/wechat/new_project.html +++ b/public/assets/wechat/new_project.html @@ -1,7 +1,7 @@
    -
    新建项目
    +
    新建开发项目
    项目名称
    完成 diff --git a/public/assets/wechat/project_list.html b/public/assets/wechat/project_list.html index d9313b6a..b92e69ab 100644 --- a/public/assets/wechat/project_list.html +++ b/public/assets/wechat/project_list.html @@ -29,8 +29,8 @@
    - 新建项目 - 加入项目 + 新建开发项目 + 加入开发项目
    diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 31e6d8db..7d938057 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -378,7 +378,7 @@ class NewHeader extends Component {
  • {/* 精选实训 */} - 开发社区 + 实训项目
    • @@ -441,7 +441,7 @@ class NewHeader extends Component {
  • 用户
    • - + {/**/} @@ -466,9 +466,9 @@ class NewHeader extends Component { {current_user.username}
  • 我的课堂
    • {/* p 老师 l 学生 */} -
  • 我的实训
    • +
  • 我的实训项目
  • 我的实践课程
    • -
  • 我的项目
    • +
  • 我的开发项目
  • 我的众包
  • 账号管理
  • 退出
    • @@ -514,9 +514,9 @@ class NewHeader extends Component { this.props.user&&this.props.user.is_student=== false || this.props.current_user&&this.props.current_user.is_student==false?
  • this.NewCoursesAndShixuns(1)}>新建课堂
    • :"" } -
  • this.NewCoursesAndShixuns(2)}>新建实训
    • +
  • this.NewCoursesAndShixuns(2)}>新建实训项目
  • this.NewCoursesAndShixuns(3)}>新建实践课程
    • -
  • this.NewCoursesAndShixuns(4)}>新建项目
    • +
  • this.NewCoursesAndShixuns(4)}>新建开发项目