Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

文字说明调整

Browse Source
dev_aliyun
杨树明 6 years ago
parent 38facee68e
commit 58a81ccd23
21 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File

6
app/helpers/application_helper.rb
Unescape View File

@ -3036,11 +3036,11 @@ module ApplicationHelper
elsif @contest elsif @contest
title << (@contest.name.nil? ? "创新源于实践" : @contest.name) title << (@contest.name.nil? ? "创新源于实践" : @contest.name)
elsif @shixun elsif @shixun
title << (@shixun.name.nil? ? "开发社区" : @shixun.name) title << (@shixun.name.nil? ? "实训项目" : @shixun.name)
elsif @my_shixun elsif @my_shixun
title << ("我的实训") title << ("我的实训项目")
elsif params[:controller] == "shixuns" && params[:action] == "index" elsif params[:controller] == "shixuns" && params[:action] == "index"
title << ("开发社区") title << ("实训项目")
elsif @subject elsif @subject
title << (@subject.name.nil? ? "实践课程" : @subject.name) title << (@subject.name.nil? ? "实践课程" : @subject.name)
elsif params[:controller] == "subjects" && params[:action] == "index" elsif params[:controller] == "subjects" && params[:action] == "index"

7
app/views/competitions/_header.html.erb
Unescape View File

@ -74,14 +74,13 @@
<ul class="edu-menu-list edu-menu-lists" style="top:60px;"> <ul class="edu-menu-list edu-menu-lists" style="top:60px;">
<span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span> <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
<li><%= link_to '我的课堂', user_path(User.current) %></li> <li><%= link_to '我的课堂', user_path(User.current) %></li>
<li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li> <li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li>
<li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li> <li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li>
<li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
<li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
<% if User.current.partner.present? %> <% if User.current.partner.present? %>
<li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li> <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
<% end %> <% end %>
<li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
<li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
<% if User.current.department_members.count > 0 %> <% if User.current.department_members.count > 0 %>
<li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li> <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>
<% end %> <% end %>

2
app/views/layouts/_logined_force_header.html.erb
Unescape View File

@ -37,7 +37,7 @@
<span class="task-line"></span> <span class="task-line"></span>
<li><a href="<%= my_account_path %>" class="a_forced">我的主页</a></li> <li><a href="<%= my_account_path %>" class="a_forced">我的主页</a></li>
<li><a href="<%= my_account_path %>" class="a_forced">我的课程</a></li> <li><a href="<%= my_account_path %>" class="a_forced">我的课程</a></li>
<li><a href="<%= shixuns_user_path(User.current) %>" class="a_forced">我的实训</a></li> <li><a href="<%= shixuns_user_path(User.current) %>" class="a_forced">我的实训项目</a></li>
<li><a href="<%= my_account_path %>" class="a_forced">我的留言</a></li> <li><a href="<%= my_account_path %>" class="a_forced">我的留言</a></li>
<span class="task-line"></span> <span class="task-line"></span>
<li><a href="<%= my_account_path %>" class="a_forced">账户管理</a></li> <li><a href="<%= my_account_path %>" class="a_forced">账户管理</a></li>

9
app/views/layouts/_logined_header.html.erb
Unescape View File

@ -7,7 +7,7 @@
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li> <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li> <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
<!-- 精选实训 --> <!-- 精选实训 -->
<li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li> <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
<% careers = Career.published.order("created_at asc") %> <% careers = Career.published.order("created_at asc") %>
<% if careers.present? %> <% if careers.present? %>
@ -49,7 +49,7 @@ display: none; right:110px;">
</ul> </ul>
</div> </div>
<div class="seperateLine"></div> <div class="seperateLine"></div>
<input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/开发社区/交流问答"/> <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/实训项目/交流问答"/>
<a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search"> <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
<i class="iconfont icon-sousuo color-blue mt14 fl"></i> <i class="iconfont icon-sousuo color-blue mt14 fl"></i>
</a> </a>
@ -62,12 +62,11 @@ display: none; right:110px;">
<li><%= link_to '我的翻转课堂', user_path(User.current) %></li> <li><%= link_to '我的翻转课堂', user_path(User.current) %></li>
<li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li> <li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li>
<li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li> <li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li>
<li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
<li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
<% if User.current.partner.present? %> <% if User.current.partner.present? %>
<li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li> <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
<% end %> <% end %>
<li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
<li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
<% if User.current.department_members.count > 0 %> <% if User.current.department_members.count > 0 %>
<li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li> <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>
<% end %> <% end %>

10
app/views/layouts/_public_left_info.html.erb
Unescape View File

@ -16,7 +16,7 @@
<i class="fa fa-product-hunt color-light-green font-20 pl20 pr10 pt5" aria-hidden="true"></i><span>项目</span> <i class="fa fa-product-hunt color-light-green font-20 pl20 pr10 pt5" aria-hidden="true"></i><span>项目</span>
<ul class="color-grey"> <ul class="color-grey">
<li><%= link_to "我的项目", user_project_community_path(User.current) %></li> <li><%= link_to "我的项目", user_project_community_path(User.current) %></li>
<li><a href="javascript:void(0);" target="_self" onclick="new_projects();">新建项目</a></li> <li><a href="javascript:void(0);" target="_self" onclick="new_projects();">新建开发项目</a></li>
<li><%= link_to "加入项目", applied_join_project_path, :method => "post", :remote => true %></li> <li><%= link_to "加入项目", applied_join_project_path, :method => "post", :remote => true %></li>
</ul> </ul>
</div> </div>
@ -37,12 +37,12 @@
<div class="list"> <div class="list">
<i class="fa fa-gamepad color-light-green font-20 pl20 pr10 pt5" aria-hidden="true"></i><span>实训</span> <i class="fa fa-gamepad color-light-green font-20 pl20 pr10 pt5" aria-hidden="true"></i><span>实训</span>
<ul class="color-grey"> <ul class="color-grey">
<li><%= link_to "我的实训", shixuns_user_path(User.current), :target => "_self" %></li> <li><%= link_to "我的实训项目", shixuns_user_path(User.current), :target => "_self" %></li>
<!-- <li><%#= link_to "新建实训", new_shixun_path, :target => "_blank" %></li>--> <!-- <li><%#= link_to "新建实训", new_shixun_path, :target => "_blank" %></li>-->
<% if User.current.mail.blank? %> <% if User.current.mail.blank? %>
<li><a href="javascript:void(0)" onclick="shixun_valication()">新建实训</a></li> <li><a href="javascript:void(0)" onclick="shixun_valication()">新建实训项目</a></li>
<% else %> <% else %>
<li><%= link_to "新建实训", new_shixun_path, :target => "_self" %></li> <li><%= link_to "新建实训项目", new_shixun_path, :target => "_self" %></li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
@ -112,6 +112,6 @@
// 新建实训 // 新建实训
function shixun_valication(){ function shixun_valication(){
sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱');
} }
</script> </script>

4
app/views/layouts/_unlogin_header.html.erb
Unescape View File

@ -9,7 +9,7 @@
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li> <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li> <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
<li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li> <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
<% careers = Career.published.order("created_at asc") %> <% careers = Career.published.order("created_at asc") %>
<% if careers.present? %> <% if careers.present? %>
@ -47,7 +47,7 @@
</ul> </ul>
</div> </div>
<div class="seperateLine"></div> <div class="seperateLine"></div>
<input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/开发社区/交流问答"/> <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/实训项目/交流问答"/>
<a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search"> <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
<!--<svg class="icon fl mt23" width="20px" height="20px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8zM884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" /></svg>--> <!--<svg class="icon fl mt23" width="20px" height="20px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8zM884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" /></svg>-->
<i class="iconfont icon-sousuo color-blue mt14 fl"></i> <i class="iconfont icon-sousuo color-blue mt14 fl"></i>

4
app/views/layouts/base_project_community.html.erb
Unescape View File

@ -56,10 +56,10 @@
</li> </li>
<% if is_current_user %> <% if is_current_user %>
<li id="user_07" class="user_icons_new"> <li id="user_07" class="user_icons_new">
<%= 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;" %>
</li> </li>
<li id="user_08" class="user_icons_addproject mb10"> <li id="user_08" class="user_icons_addproject mb10">
<%= 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;" %>
</li> </li>
<li id="user_09" class="user_icons_myissues"> <li id="user_09" class="user_icons_myissues">
<%= link_to "我发布的issue", user_manage_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %> <%= link_to "我发布的issue", user_manage_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>

4
app/views/layouts/new_base_user_show.html.erb
Unescape View File

@ -208,10 +208,10 @@
</li> </li>
<% if is_current_user %> <% if is_current_user %>
<li id="user_07" class="user_icons_new"> <li id="user_07" class="user_icons_new">
<a href ="javascript:void(0);" disabled="true">新建项目</a> <a href ="javascript:void(0);" disabled="true">新建开发项目</a>
</li> </li>
<li id="user_08" class="user_icons_addproject"> <li id="user_08" class="user_icons_addproject">
<a href ="javascript:void(0);" disabled="true">加入项目</a> <a href ="javascript:void(0);" disabled="true">加入开发项目</a>
</li> </li>
<!--<li id="user_09" class="user_icons_myissues">--> <!--<li id="user_09" class="user_icons_myissues">-->
<!--<a href="#user_09" >我的任务</a>--> <!--<a href="#user_09" >我的任务</a>-->

2
app/views/organizations/_org_course_homework.html.erb
Unescape View File

@ -47,7 +47,7 @@
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
<span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", "https://www.trustie.net/projects/new",:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span> <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建开发项目", "https://www.trustie.net/projects/new",:class=>"c_red",:title=>"新建开发项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
<% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%> <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
<span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span> <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
<% end %> <% end %>

2
app/views/projects/new.html.erb
Unescape View File

@ -10,7 +10,7 @@
<input type="text" style="display: none"/> <!--阻止表单自动填充 --> <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
<input type="password" style="display: none"/> <!--阻止表单自动填充 --> <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
<div class="mb10 edu-back-white"> <div class="mb10 edu-back-white">
<p class="padding10-20 bor-bottom-greyE font-18 color-grey-3">新建项目</p> <p class="padding10-20 bor-bottom-greyE font-18 color-grey-3">新建开发项目</p>
<div class="padding30-20"> <div class="padding30-20">
<p class="color-grey-6 font-16 mb15"><%= l(:label_projects_new_name) %></p> <p class="color-grey-6 font-16 mb15"><%= l(:label_projects_new_name) %></p>
<div class="df"> <div class="df">

2
app/views/student_work/_new_project.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="BluePopupBox" id="popbox02"> <div class="BluePopupBox" id="popbox02">
<%= labelled_form_for(Project.new,:remote => "true") do |f| %> <%= labelled_form_for(Project.new,:remote => "true") do |f| %>
<h2 class="BluePopuph2 fl">新建项目</h2> <h2 class="BluePopuph2 fl">新建开发项目</h2>
<div class="cl"></div> <div class="cl"></div>
<div class=""> <div class="">
<div class="mt10 mb10"> <div class="mt10 mb10">

2
app/views/subjects/_course_shixun_list.html.erb
Unescape View File

@ -59,7 +59,7 @@
function newshixuns(mail){ function newshixuns(mail){
if(mail){ if(mail){
sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱');
}else{ }else{
var a = $("<a href='<%= new_shixun_path %>' target='_blank' style='display:none'>Apple</a>").get(0); var a = $("<a href='<%= new_shixun_path %>' target='_blank' style='display:none'>Apple</a>").get(0);

2
app/views/subjects/_new_shixun_list.html.erb
Unescape View File

@ -83,7 +83,7 @@
function newshixuns(mail){ function newshixuns(mail){
if(mail){ if(mail){
sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱');
}else{ }else{
var a = $("<a href='<%= new_shixun_path %>' target='_blank' style='display:none'>Apple</a>").get(0); var a = $("<a href='<%= new_shixun_path %>' target='_blank' style='display:none'>Apple</a>").get(0);

2
app/views/users/_l_shixun.html.erb
Unescape View File

@ -54,7 +54,7 @@
<div class="inline color-grey-6"> <div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont"> <span class="fl ml10 mr10 squareIconSpan substancefont">
新建实训 新建实训项目
</span> </span>
</div> </div>

2
app/views/users/_user_homework_detail.html.erb
Unescape View File

@ -23,7 +23,7 @@
<div class="cl"></div> <div class="cl"></div>
<% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%> <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%>
<span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span> <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建开发项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建开发项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
<% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%> <% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%>
<span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span> <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
<% end %> <% end %>

4
app/views/users/shixuns.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="edu-class-container " > <div class="edu-class-container " >
<p class="mb10"><a href="<%= user_path(@user) %>" class="color-grey-9"><%= @user.show_real_name %> </a> > <p class="mb10"><a href="<%= user_path(@user) %>" class="color-grey-9"><%= @user.show_real_name %> </a> >
<a href="<%= shixuns_path %>" class="color-grey-9">精选实训 </a> > 我的实训 </p> <a href="<%= shixuns_path %>" class="color-grey-9">精选实训 </a> > 我的实训项目 </p>
<div class="edu-con-bg01" > <div class="edu-con-bg01" >
<div class=""> <div class="">
<div class="edu-tab clearfix mb20"> <div class="edu-tab clearfix mb20">
@ -45,7 +45,7 @@
// 新建实训 // 新建实训
function shixun_new(mail){ function shixun_new(mail){
if(mail){ if(mail){
sure_box_redirect_btn('<%= security_settings_path %>', '新建实训，请先绑定邮箱','绑定邮箱'); sure_box_redirect_btn('<%= security_settings_path %>', '新建实训项目，请先绑定邮箱','绑定邮箱');
}else{ }else{
window.location.href= '<%= new_shixun_path %>'; window.location.href= '<%= new_shixun_path %>';
} }

2
app/views/users/user_projects.html.erb
Unescape View File

@ -1,7 +1,7 @@
<div class="top_new"> <div class="top_new">
<span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span> <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
<% if @user.allowed_to?(:add_project, nil, :global => true) %> <% if @user.allowed_to?(:add_project, nil, :global => true) %>
<a href="<%= url_for(:controller => 'projects', :action => 'new') %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建项目</a> <a href="<%= url_for(:controller => 'projects', :action => 'new') %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建开发项目</a>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</div> </div>

2
app/views/welcome/index.html.erb
Unescape View File

@ -69,7 +69,7 @@
<!--精选实训 改为 开发社区--> <!--精选实训 改为 开发社区-->
<div class="clearfix pt20 educontent pr pb20"> <div class="clearfix pt20 educontent pr pb20">
<div class="edu-txt-center"> <div class="edu-txt-center">
<p class="color-dark edu-txt-center font-24" style="line-height: 30px">开发社区</p> <p class="color-dark edu-txt-center font-24" style="line-height: 30px">实训项目</p>
<p class="color-grey-cd font-12">DEVELOPMENT COMMUNITY</p> <p class="color-grey-cd font-12">DEVELOPMENT COMMUNITY</p>
</div> </div>
<a href="<%= shixuns_path %>" class="moreitem">更多<i class="fa fa-angle-right ml5"></i></a> <a href="<%= shixuns_path %>" class="moreitem">更多<i class="fa fa-angle-right ml5"></i></a>

2
public/assets/wechat/new_project.html
Unescape View File

@ -1,7 +1,7 @@
<div class="post-container"> <div class="post-container">
<div loading-spinner></div> <div loading-spinner></div>
<div class="blue-title">新建项目</div> <div class="blue-title">新建开发项目</div>
<form novalidate name="classForm"> <form novalidate name="classForm">
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div> <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div>
<a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a> <a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>

4
public/assets/wechat/project_list.html
Unescape View File

@ -29,8 +29,8 @@
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">
<a ng-click="newProject()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建项目</a> <a ng-click="newProject()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建开发项目</a>
<a ng-click="joinProject()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">加入项目</a> <a ng-click="joinProject()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">加入开发项目</a>
</div> </div>
<my-alert message="alertService_1.message" title="alertService_1.title" visible="alertService_1.visible" cb="alertService_1.cb"></my-alert> <my-alert message="alertService_1.message" title="alertService_1.title" visible="alertService_1.visible" cb="alertService_1.cb"></my-alert>

12
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -378,7 +378,7 @@ class NewHeader extends Component {
<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}> <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
{/* 精选实训 */} {/* 精选实训 */}
<a href="/shixuns">开发社区</a> <a href="/shixuns">实训项目</a>
<img src="/images/educoder/hot-h.png" className="nav-img"> <img src="/images/educoder/hot-h.png" className="nav-img">
</img> </img>
</li> </li>
@ -441,7 +441,7 @@ class NewHeader extends Component {
<li><a href="javascript:void(0)">用户</a></li> <li><a href="javascript:void(0)">用户</a></li>
</ul> </ul>
</div> </div>
<input type="text" className="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/开发社区/交流问答"/> <input type="text" className="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/实训项目/交流问答"/>
<a href="javascript:void(0)" className="search-icon fl" id="header_keyword_search"> <a href="javascript:void(0)" className="search-icon fl" id="header_keyword_search">
{/*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*/} {/*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*/}
<i className="iconfont icon-sousuo color-blue"></i> <i className="iconfont icon-sousuo color-blue"></i>
@ -466,9 +466,9 @@ class NewHeader extends Component {
<span className="bor-bottom-greyE currentName task-hide">{current_user.username}</span> <span className="bor-bottom-greyE currentName task-hide">{current_user.username}</span>
<li><a href={`/users/${current_user.login}`}>我的课堂</a></li> <li><a href={`/users/${current_user.login}`}>我的课堂</a></li>
{/* p 老师 l 学生 */} {/* p 老师 l 学生 */}
<li><a href={`/users/${current_user.login}?type=${current_user.is_teacher ? 'p_shixun' : 'l_shixun'}`}>我的实训</a></li> <li><a href={`/users/${current_user.login}?type=${current_user.is_teacher ? 'p_shixun' : 'l_shixun'}`}>我的实训项目</a></li>
<li><a href={`/users/${current_user.login}?type=${current_user.is_teacher ? 'p_path' : 'l_path'}`}>我的实践课程</a></li> <li><a href={`/users/${current_user.login}?type=${current_user.is_teacher ? 'p_path' : 'l_path'}`}>我的实践课程</a></li>
<li><a href={`/users/${current_user.login}?type=p_project`}>我的项目</a></li> <li><a href={`/users/${current_user.login}?type=p_project`}>我的开发项目</a></li>
<li><a href={`/users/${current_user.login}?type=a_package`}>我的众包</a></li> <li><a href={`/users/${current_user.login}?type=a_package`}>我的众包</a></li>
<li><a href="/my/account">账号管理</a></li> <li><a href="/my/account">账号管理</a></li>
<li className="bor-top-greyE"><a href="/logout">退出</a></li> <li className="bor-top-greyE"><a href="/logout">退出</a></li>
@ -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.props.user&&this.props.user.is_student=== false || this.props.current_user&&this.props.current_user.is_student==false?
<li><a onClick={()=>this.NewCoursesAndShixuns(1)}>新建课堂</a></li>:"" <li><a onClick={()=>this.NewCoursesAndShixuns(1)}>新建课堂</a></li>:""
} }
<li><a onClick={()=>this.NewCoursesAndShixuns(2)}>新建实训</a></li> <li><a onClick={()=>this.NewCoursesAndShixuns(2)}>新建实训项目</a></li>
<li><a onClick={()=>this.NewCoursesAndShixuns(3)}>新建实践课程</a></li> <li><a onClick={()=>this.NewCoursesAndShixuns(3)}>新建实践课程</a></li>
<li><a onClick={()=>this.NewCoursesAndShixuns(4)}>新建项目</a></li> <li><a onClick={()=>this.NewCoursesAndShixuns(4)}>新建开发项目</a></li>
</ul> </ul>
<ul className="fl with50 edu-txt-center"> <ul className="fl with50 edu-txt-center">
<li> <li>

Write Preview
Loading…
Cancel
Save