From df99d71c7115645ecebeb7949da83db341ad062e Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Jul 2017 14:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E3=80=81=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=92=8C=E6=88=91=E7=9A=84=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=8F=9C=E5=8D=95=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=A4=84=E7=9A=84=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/new.html.erb | 2 +- app/views/homework_bank/edit.html.erb | 2 +- app/views/homework_bank/index.html.erb | 2 +- app/views/homework_bank/new.html.erb | 2 +- app/views/homework_bank/show.html.erb | 2 +- app/views/layouts/_logined_force_header.html.erb | 2 +- app/views/layouts/_unlogin_header.html.erb | 4 ++-- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_edu_course.html.erb | 2 +- app/views/layouts/base_management.html.erb | 6 +++--- app/views/shixuns/new.html.erb | 2 +- app/views/syllabuses/edit.html.erb | 2 +- app/views/syllabuses/index.html.erb | 2 +- app/views/syllabuses/new.html.erb | 2 +- app/views/syllabuses/show.html.erb | 2 +- app/views/users/shixuns.html.erb | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index 93591a739..595a593bd 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -1,7 +1,7 @@

- <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path %> + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path %>

新建班级 diff --git a/app/views/homework_bank/edit.html.erb b/app/views/homework_bank/edit.html.erb index 87fad71b9..d4589d2d1 100644 --- a/app/views/homework_bank/edit.html.erb +++ b/app/views/homework_bank/edit.html.erb @@ -4,7 +4,7 @@

- <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 编辑 + <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 编辑

<%= form_for @homework, :html => {:id => 'homework_common_submit_form'} do |f| %> <% if @homework_type == 1 %> diff --git a/app/views/homework_bank/index.html.erb b/app/views/homework_bank/index.html.erb index ee3b5d3bf..8ca8eddb6 100644 --- a/app/views/homework_bank/index.html.erb +++ b/app/views/homework_bank/index.html.erb @@ -10,7 +10,7 @@
-

<%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path() %> > 题库

+

<%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > 题库

diff --git a/app/views/homework_bank/new.html.erb b/app/views/homework_bank/new.html.erb index ea24008e3..2b00565aa 100644 --- a/app/views/homework_bank/new.html.erb +++ b/app/views/homework_bank/new.html.erb @@ -4,7 +4,7 @@

- <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 新建 + <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 新建

<%= labelled_form_for @homework, :url =>{:controller=>'homework_bank',:action => 'create'}, :html => {:id => 'homework_common_submit_form'}, :method => "post" do |f| %> <% if @homework_type == 1 %> diff --git a/app/views/homework_bank/show.html.erb b/app/views/homework_bank/show.html.erb index dee3499d5..8e863423f 100644 --- a/app/views/homework_bank/show.html.erb +++ b/app/views/homework_bank/show.html.erb @@ -18,7 +18,7 @@

- <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path() %> > <%= @homework.user == User.current ? link_to('我的题库', homework_bank_index_path()) : link_to('公共题库', homework_bank_index_path(:type => 2)) %>

+ <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= @homework.user == User.current ? link_to('我的题库', homework_bank_index_path()) : link_to('公共题库', homework_bank_index_path(:type => 2)) %>

<% unless @homework.is_public %> diff --git a/app/views/layouts/_logined_force_header.html.erb b/app/views/layouts/_logined_force_header.html.erb index 79d3dafb0..a4e356cc9 100644 --- a/app/views/layouts/_logined_force_header.html.erb +++ b/app/views/layouts/_logined_force_header.html.erb @@ -18,7 +18,7 @@

    -
  • 实训课堂
    • +
  • 在线课堂
  • 项目实训
  • 论坛
  • 帮助中心
    • diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index ad4f87747..da653276b 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -18,10 +18,10 @@
      -
    • <%= link_to "项目实训", shixuns_path, :class => "new-nav-a font-16", :target => "_blank" %>
      • +
    • <%= link_to "全部实训", shixuns_path, :class => "new-nav-a font-16" %>
      • -
    • <%= link_to "实训课堂", courses_path, :class => "new-nav-a font-16", :target => "_blank" %>
    • <%= link_to "实训套件", subjects_path, :class => "new-nav-a font-16" %>
      • +
    • <%= link_to "在线课堂", courses_path, :class => "new-nav-a font-16" %>
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index e5b2bdeae..54ba5bc57 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -56,7 +56,7 @@

    <%= link_to User.current.show_real_name, user_path(User.current) %> > - <%= link_to '实训课堂', courses_path %> > + <%= link_to '在线课堂', courses_path %> > <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%> <%#= link_to @course.name, course_path(@course), :title => '班级' %>

    diff --git a/app/views/layouts/base_edu_course.html.erb b/app/views/layouts/base_edu_course.html.erb index 2a2671080..3dc0093c9 100644 --- a/app/views/layouts/base_edu_course.html.erb +++ b/app/views/layouts/base_edu_course.html.erb @@ -26,7 +26,7 @@

    <%= link_to User.current.show_real_name, user_path(User.current) %> > - <%= link_to '实训课堂', courses_path %> > + <%= link_to '在线课堂', courses_path %> > <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%> <%#= link_to @course.name, course_path(@course), :title => '班级' %>

    diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index db8f7b39b..563513c76 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -42,7 +42,7 @@ <% when 9 %> 留言 <% when 10 %> - <%= @sub_type == 1 ? "身份认证":(@sub_type == 2? "适用授权":(@sub_type == 3?"部门审批":(@sub_type == 4?"单位审批":(@sub_type == 5?"项目实训发布":"课程实训发布"))))%> + <%= @sub_type == 1 ? "身份认证":(@sub_type == 2? "适用授权":(@sub_type == 3?"部门审批":(@sub_type == 4?"单位审批":(@sub_type == 5?"全部实训发布":"课程实训发布"))))%> <% when 11 %> 工程认证+ <% when 12 %> @@ -58,7 +58,7 @@
  • <%= link_to "班级列表", classroom_classment_managements_path %>
-
  • 项目实训+ +
  • 全部实训+
    • <%= link_to "实训列表", shixuns_managements_path %>
    • <%= link_to "已发布的实训", publish_shixuns_managements_path %>
      • @@ -92,7 +92,7 @@
    • <%= link_to "试用授权", :controller => "managements", :action => "trial_authorization" %>
    • <%= link_to "部门审批", depart_managements_path %>
    • <%= link_to '单位审批', unit_managements_path %>
      • -
    • <%= link_to '项目实训发布', shixun_authorization_managements_path %>
      • +
    • <%= link_to '全部实训发布', shixun_authorization_managements_path %>
    • <%= link_to '课程实训发布', subject_authorization_managements_path %>
    • diff --git a/app/views/shixuns/new.html.erb b/app/views/shixuns/new.html.erb index 58acf4c74..7c490a727 100644 --- a/app/views/shixuns/new.html.erb +++ b/app/views/shixuns/new.html.erb @@ -1,6 +1,6 @@

    - <%= User.current.show_name %> > 项目实训 > 新建实训 + <%= User.current.show_name %> > 全部实训 > 新建实训

    新建实训

    diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb index 6af31363b..53fbade02 100644 --- a/app/views/syllabuses/edit.html.erb +++ b/app/views/syllabuses/edit.html.erb @@ -1,7 +1,7 @@

    - <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path %> + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path %>

    编辑课程

    diff --git a/app/views/syllabuses/index.html.erb b/app/views/syllabuses/index.html.erb index a51fdb527..9fa5a0303 100644 --- a/app/views/syllabuses/index.html.erb +++ b/app/views/syllabuses/index.html.erb @@ -1,6 +1,6 @@

    - <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path() %> > 我的课堂 + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > 我的课堂

    diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb index 6cfce9128..0d2d00756 100644 --- a/app/views/syllabuses/new.html.erb +++ b/app/views/syllabuses/new.html.erb @@ -1,7 +1,7 @@

    - <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path %> + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path %>

    新建课程

    diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 3a2135910..bca81f4e6 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -6,7 +6,7 @@

    - <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '实训课堂', courses_path %> > <%= @syllabus.title %>

    + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path %> > <%= @syllabus.title %>

    <% if !(@is_syllabus_admin || @is_syllabus_member) %>
    diff --git a/app/views/users/shixuns.html.erb b/app/views/users/shixuns.html.erb index 2bf0e03f1..edb7bd1b2 100644 --- a/app/views/users/shixuns.html.erb +++ b/app/views/users/shixuns.html.erb @@ -1,6 +1,6 @@

    <%= @user.show_name %> > - 项目实训 > 我的实训

    + 全部实训 > 我的实训