From b3c341c3e00ad7d100fe4674abcb90da98da4d35 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 5 Jul 2019 16:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A1=88=E4=BE=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E7=9A=84=E9=80=89=E6=8B=A9=E3=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/_form.html.erb | 17 ++++++++++-- app/views/libraries/_library_list.html.erb | 6 +++- app/views/libraries/show.html.erb | 32 ++++++++++++++-------- public/stylesheets/educoder/edu-all.css | 6 ++++ public/stylesheets/educoder/edu-main.css | 1 + 5 files changed, 47 insertions(+), 15 deletions(-) diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index 4ce076d2..6479eb8d 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -12,7 +12,6 @@ 简明扼要介绍文档/视频所包含的主要的内容 -
@@ -24,7 +23,13 @@

请输入描述内容

- +
+ 标签 + +
<%= render partial: 'attachments/from_libraries', locals: { container: @library } %>

\ No newline at end of file diff --git a/app/views/libraries/_library_list.html.erb b/app/views/libraries/_library_list.html.erb index 63314d65..227293ca 100644 --- a/app/views/libraries/_library_list.html.erb +++ b/app/views/libraries/_library_list.html.erb @@ -4,7 +4,11 @@

  • <%= link_to image_tag(url_to_avatar(library.user), width: 50, height: 50, class: 'radius mr15 mt3'), user_path(library.user) %>
    -

    <%= link_to library.title, library_path(library) %>

    +

    + <%= link_to library.title, library_path(library),:class => "task-hide font-16 library_l_name" %> + 入库案例 + 优秀案例 +

    <%= link_to library.user.show_real_name, user_path(library.user) %> <%= library.visited_count || 0 %> 浏览 diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb index 03ad3f11..aa865413 100644 --- a/app/views/libraries/show.html.erb +++ b/app/views/libraries/show.html.erb @@ -1,3 +1,8 @@ + <% admin_or_self = admin_or_business? || @library.user_id == User.current.id %> @@ -7,7 +12,11 @@ 详情

    - <%= @library.title %> + + <%= @library.title %> + + 入库案例 + 优秀案例 <% if admin_or_self %> <% if @library.pending? %> 草稿 @@ -40,20 +49,19 @@

    <% end %>
    -

    - 详情 - <% if admin_or_business? || @library.user_id == User.current.id && @library.pending? %> - <%= link_to '删除', 'javascript:void(0);', data: { id: @library.id }, - class: 'white-btn edu-blueline-btn fr ml20 delete-btn' %> - <% end %> - <% if admin_or_self %> - <%= link_to '编辑', edit_library_path(id: @library.id), class: 'white-btn edu-blueline-btn fr' %> - <% end %> -

    <%= link_to image_tag(url_to_avatar(@library.user), width: 50, height: 50, class: 'radius mr15 mt3'), user_path(@library.user) %>
    -
  • <%= @library.user.show_real_name %>
    • +
  • + <%= @library.user.show_real_name %> + <% if admin_or_business? || @library.user_id == User.current.id && @library.pending? %> + <%= link_to '删除', 'javascript:void(0);', data: { id: @library.id }, + class: 'white-btn edu-blueline-btn fr ml20 delete-btn' %> + <% end %> + <% if admin_or_self %> + <%= link_to '编辑', edit_library_path(id: @library.id), class: 'white-btn edu-blueline-btn fr' %> + <% end %> +
  • <%= @library.user.school_name %> <%= @library.user.identity %> diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 19ab3793..48e0034f 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3467,6 +3467,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; .library_list_item{ background: #fff;padding:30px;margin-bottom: 15px;display: flex; } +.library_list_item .library_l_name{max-width: 900px;float: left;} .upload_Title{ position: relative;margin-right: 30px;float: left;line-height: 35px;font-size: 16px;width: 32px; } @@ -3477,6 +3478,11 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; width: 100%;background: #F2F9FF;justify-content: center;align-items: center;display: -webkit-flex;text-align: center; height: 120px;border-radius: 4px;border:1px dashed #4cacff; } +.libraries_tab li{ + width: 120px;height: 35px;line-height: 35px;border-radius:18px;border:1px solid #4C98FF;color: #4C98FF;cursor: pointer; + margin-right: 30px;float: left;text-align: center; +} +.libraries_tab li.active{background:#4C98FF;color: #fff; } .private_reason{overflow: hidden;max-height:163px;} .private_reason li{margin-bottom: 10px;} .successPage{ diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 881f7ed9..f9248d58 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -763,6 +763,7 @@ html>body #ajax-indicator { position: fixed; } .edu-activity-grey{background-color:#747A7F;color:#fff!important;cursor: pointer;border: 1px solid #747A7F;}/*匿评作品*/ .edu-activity-green{background-color:#29BD8B;color:#fff!important;cursor: pointer;border: 1px solid #29BD8B;}/*查看作品、查看实战、查看答题*/ .edu-activity-light-grey{background-color:#cbcbcb;color:#fff!important;cursor: pointer;border: 1px solid #cbcbcb;}/*取消关联*/ +.edu-activity-red{background-color:#FC2B6A;color:#fff!important;cursor: pointer;border: 1px solid #FC2B6A;} /*课堂设置页面*/ .course-ul-nav{width: 100%;border-bottom: 1px solid #EBEBEB;} .course-ul-nav a{display: inline-block;padding: 20px;font-size: 18px;text-align: center;width: 94px;position: relative}