diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 58e9369cd..2ea12ceb1 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -8,7 +8,7 @@
  • <%= @syllabuses_num %>
    全部
  • <%= @create_syllabuses_count + @join_syllabuses_count %>
    我的课堂
    • <%= link_to "+ 新建".html_safe, new_course_path, :class => "color-light-green fr font-16" , :style => "line-height:56px"%> - <%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr10 font-16" , :style => "line-height:56px" %> + <%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr30 font-16" , :style => "line-height:56px" %> diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb index 1f7909cbd..ef4a50277 100644 --- a/app/views/layouts/_public_left_info.html.erb +++ b/app/views/layouts/_public_left_info.html.erb @@ -49,6 +49,7 @@ + + + + +
    + +

    + 创新使者 > + 镜像管理 +

    + + + +
    + +
    + + +添加 +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号镜像ID镜像名称镜像主类别镜像小类别镜像描述状态修改时间操作
    1drfhuko4java1.8-jfinal5.0 +

    java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;

    + + + +     		+

    docert1.5;centos2.5;

    + +     		镜像是。。。。未发布2017-08-15 10:34 + 删除 + 修改 + 保存 +
    2edftg3grpython3.6-mysql1.5 +

    java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;

    + + + +     		+

    docert1.5;centos2.5;

    + + +     		镜像是。。。。已发布2017-08-15 10:34 + 修改 + 保存 +
    +
    + +
    +
    +

    镜像修改

    + +
    +
    +
    + + +
    +
    + +
    + +
      +
    • + + +
      • +
    +
    +
    +
    + +
    + +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    + + +
    +
    + + + + + + + + + +
    +
    +
    + 取消 + 确定 +
    +
    + +
    + + + diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index 5ba904ebc..571e4f9e1 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/editormd.min.js' %> -
    +
      diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb index 1e4239f9b..237f6b178 100644 --- a/app/views/shixuns/_shixun_list.html.erb +++ b/app/views/shixuns/_shixun_list.html.erb @@ -38,7 +38,7 @@
    • <%= shixun.challenges.count %>
      • -
    • <%= shixun.myshixuns.count %>
      • +
    • <%= shixun.myshixuns.count %>
    • <%= shixun.shixun_score %>
    diff --git a/app/views/shixuns/collaborators.html.erb b/app/views/shixuns/collaborators.html.erb index 35f5610e9..e181d1b6c 100644 --- a/app/views/shixuns/collaborators.html.erb +++ b/app/views/shixuns/collaborators.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= image_tag(url_to_avatar(@shixun.owner), :width => 60, :height => 60, :class => 'panel-list-img mr15 mt5') %>
      diff --git a/app/views/shixuns/new.html.erb b/app/views/shixuns/new.html.erb index 7c490a727..649c1ebf8 100644 --- a/app/views/shixuns/new.html.erb +++ b/app/views/shixuns/new.html.erb @@ -2,7 +2,7 @@

      <%= User.current.show_name %> > 全部实训 > 新建实训

      -
      +

      新建实训

      <%= render :partial => 'form' %> diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb index 5e124ab1a..61f53afdf 100644 --- a/app/views/subjects/_subject_list.html.erb +++ b/app/views/subjects/_subject_list.html.erb @@ -14,13 +14,13 @@
      <% else %> <% @subjects.each do |subject| %> -
      - <% if subject.status < 2 && !User.current.manager_of_subject?(subject) %> -
      -
      -
      非试用内容，需要授权
      -
      - <% end %> +
      + <% if subject.status < 2 && !User.current.manager_of_subject?(subject) %> +
      +
      +
      非试用内容，需要授权
      +
      + <% end %>

      <%= subject.name %> @@ -31,7 +31,7 @@

      <%# if !subject.user.user_extensions.school_id.blank? && subject.user.user_extensions.school %> - <%#= subject.user.user_extensions.school.name %> + <%#= subject.user.user_extensions.school.name %> <%# end %>

      @@ -58,11 +58,45 @@

    -
    +
    + <% end %> <% end %>
    - + + <% if @subjects_count > 16 %>
    diff --git a/app/views/subjects/index.html.erb b/app/views/subjects/index.html.erb index 78f6d5987..0bd34bfda 100644 --- a/app/views/subjects/index.html.erb +++ b/app/views/subjects/index.html.erb @@ -2,7 +2,7 @@
    -

    实训套件

    +

    实训课程

      diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index 495504139..9ad122938 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -11,14 +11,22 @@ <%= labelled_form_for @subject do |f| %>
    • - +
      请输入名称
      • +
    • - +
      • +
    • <%= link_to "取消", subjects_path(), :class => "task-btn fl mr10 ml20" %> diff --git a/app/views/syllabuses/_syllabus_members.html.erb b/app/views/syllabuses/_syllabus_members.html.erb index e46a21afa..622022e38 100644 --- a/app/views/syllabuses/_syllabus_members.html.erb +++ b/app/views/syllabuses/_syllabus_members.html.erb @@ -1,33 +1,33 @@ <% @members.each_with_index do |member, index| %> -
      +
      <% user = member.user %> <%= link_to image_tag(url_to_avatar(user), :width => "40", :height => "40", :alt => "头像",:class => "bor-radius-all"), user_path(user), :target => '_blank', :class => "fl ml15 mr15" %>
      • <%= link_to user.show_real_name, user_path(user), :class => "font-16 link-name-dark task-hide fl real-name" %> - <%= user.user_extensions.user_technical_title %> + <%= user.user_extensions.user_technical_title %> <% if user == @syllabus.user %> - + <% end %>
      -

      +

      <% if user == @syllabus.user && (User.current == @syllabus.user || User.current.admin?) %> <% if @members.count == 1 %> - 更换管理员 + 更换管理员 <% else %> - <%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 link-color-grey operation', :remote => true %> + <%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 color-grey operation', :remote => true %> <% end %> <% elsif user != @syllabus.user && @is_syllabus_member %> - 删除 + 删除 <% end %>

      - <% if index == 1 %> - + <% if index > 9 %> + 查看全部 diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb index 62cd1e688..7151e2b5b 100644 --- a/app/views/syllabuses/edit.html.erb +++ b/app/views/syllabuses/edit.html.erb @@ -77,14 +77,14 @@
    • - +
      课程名称不能为空且至少有两个字符 同一个用户不能创建同名课程
    • - +
    • diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index c7624dacf..d3998cba0 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -18,20 +18,27 @@ <%# end %>
      -
        -
      • +
          +
        • <%= @syllabus.title %> - <% if @is_syllabus_admin %> - + <%# if @is_syllabus_admin %> + + <%# end %> + <%= @syllabus.eng_name %>
          • -
        • - <%= @syllabus.user.user_extensions.school.blank? ? '' : @syllabus.user.user_extensions.school.name %> + <% if @is_syllabus_admin %> +
        • + + + +
          • + <% end %> +
        • + <%= @syllabus.user.user_extensions.school.blank? ? '' : @syllabus.user.user_extensions.school.name %> <% if @syllabus.major_level %> - <%= @syllabus.syllabus_major_level %> + <%= @syllabus.syllabus_major_level %> <%= @syllabus.syllabus_discipline_category %> <%= @syllabus.syllabus_first_level_discipline %> <% if @syllabus.major %> @@ -59,14 +66,14 @@
            -
          • +

            授课大纲

            + + + + +
          • --> @@ -99,9 +106,9 @@
          -
          -
          -

          教师团队

          +
          +
          +

          教师团队

          <% if @is_syllabus_admin %> @@ -125,7 +132,7 @@
          -

          课堂列表

          +

          课堂列表

          <% if @is_syllabus_admin %>           @@ -138,9 +145,9 @@ 正在进行<%= @courses.count %> 已结束<%= @end_courses.count %>
          -
            +
              <% if @courses.count == 0 %> -

              暂无

              +

              暂无

              <% else %> <% @courses.each_with_index do |course, index| %>
            • @@ -148,7 +155,7 @@ <%= link_to course.name, course_path(course), :target => '_blank' %>
              • <% if index == 20 %> - + 查看全部 @@ -156,9 +163,9 @@ <% end %> <% end %>
            -
              +
                <% if @end_courses.count == 0 %> -

                暂无

                +

                暂无

                <% else %> <% @end_courses.each_with_index do |course, index| %>
              • @@ -208,8 +215,8 @@