From 61fe4efb894081c481a510dcfb66467f18ac84c0 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 29 Jun 2019 16:52:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E5=BA=93=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80-=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/show.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb index 252dddec..8c55b63a 100644 --- a/app/views/libraries/show.html.erb +++ b/app/views/libraries/show.html.erb @@ -100,8 +100,12 @@ }); $(function(){ var height=document.getElementById("private_reason_ul").offsetHeight; + var one=parseInt($("#private_reason_ul").find("li").eq(0).height())+10; + var two=parseInt($("#private_reason_ul").find("li").eq(1).height()); + var plus=one+two; if(parseInt(height)>166){ $("#actionPanel").html('点击展开'); + $(".private_reason").css({maxHeight:plus+"px"}); } }) \ No newline at end of file From b7bffd2c9935accaf01549e60a045bd68cb9dee1 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 29 Jun 2019 17:11:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E7=BB=84=E5=9B=BE=E7=89=87=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 543431c5..c2338d19 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -706,12 +706,12 @@ li.challenge_box:last-child{ /*实践教学*/ -.second_course_1{min-height: 782px;} +.second_course_1{min-height: 776px;} .second_course_2{min-height: 823px;} .second_course_3{min-height: 690px;} -.second_course_4{min-height: 523px;} +.second_course_4{min-height: 514px;} .second_course_5{min-height: 737px;padding-top: 190px;box-sizing: border-box;position: relative} -.second_course_6{min-height: 1230px;} +.second_course_6{min-height: 1225px;} .course_competition_panel{ margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex; height: 282px;text-align: center; From be28e6f160ab3fad6e9771ff1aa47f5659e217b7 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 29 Jun 2019 17:26:40 +0800 Subject: [PATCH 3/3] modify library text --- app/helpers/application_helper.rb | 4 ++-- app/models/tiding.rb | 4 ++-- app/views/layouts/_logined_header.html.erb | 2 +- app/views/layouts/base_management.html.erb | 2 +- app/views/libraries/edit.html.erb | 2 +- app/views/libraries/index.html.erb | 4 ++-- app/views/libraries/new.html.erb | 2 +- app/views/libraries/show.html.erb | 2 +- app/views/managements/library_applies/index.html.erb | 6 +++--- config/locales/libraries/zh.yml | 2 +- config/routes.rb | 10 +++++----- lib/trustie/sms/sms.rb | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 031c4399..e7390697 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -753,7 +753,7 @@ module ApplicationHelper when 5 then '实训发布' when 6 then '实训课程发布' when 7 then '职业认证' - when 8 then '文库发布' + when 8 then '教学案例发布' else '职业认证' end when 11 @@ -4368,7 +4368,7 @@ module ApplicationHelper elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses course = attachment.container.courses.first candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1) - elsif attachment.container_type == "Library" #文库允许下载 + elsif attachment.container_type == "Library" #教学案例允许下载 candown = true else candown = (attachment.is_public == 1 || attachment.is_public == true) diff --git a/app/models/tiding.rb b/app/models/tiding.rb index 91bcf0b9..c5b2e6a3 100644 --- a/app/models/tiding.rb +++ b/app/models/tiding.rb @@ -361,10 +361,10 @@ class Tiding < ActiveRecord::Base when 'Library' library = Library.find_by_id(container_id) if tiding_type == 'Apply' - "申请发布文库：#{library.try(:title)}" + "申请发布教学案例：#{library.try(:title)}" elsif tiding_type == 'System' text = status == 1 ? "审核已通过" : "审核未通过，
原因：#{extra}" - "你提交的发布文库申请：#{library.try(:title)}，#{text}" + "你提交的发布教学案例申请：#{library.try(:title)}，#{text}" end else logger.error "error type: 1" diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index f33b2110..7f6e08f9 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -18,7 +18,7 @@ <% end %> - +
  • "><%= link_to '教学案例', libraries_path %>
  • "><%= link_to "竞赛", competitions_path %>
  • "><%= link_to "问答", forums_path %>
    • <% if User.current.ec_school.present? %> diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index 891cf808..423d83c6 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -116,7 +116,7 @@
  • <%= link_to '单位审批', unit_managements_path %>
  • <%= link_to '实训发布', shixun_authorization_managements_path %>
  • <%= link_to '实训课程发布', subject_authorization_managements_path %>
    • -
  • <%= link_to '文库发布', library_applies_path(status: :pending) %>
    • +
  • <%= link_to '教学案例发布', library_applies_path(status: :pending) %>
  • 认证+ diff --git a/app/views/libraries/edit.html.erb b/app/views/libraries/edit.html.erb index e258e1c1..cd06d519 100644 --- a/app/views/libraries/edit.html.erb +++ b/app/views/libraries/edit.html.erb @@ -1,6 +1,6 @@

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 编辑

    diff --git a/app/views/libraries/index.html.erb b/app/views/libraries/index.html.erb index 98e80cb0..84a2a9af 100644 --- a/app/views/libraries/index.html.erb +++ b/app/views/libraries/index.html.erb @@ -1,7 +1,7 @@

    - 文库 + 教学案例 <%= link_to '新建', new_library_path, class: 'fr color-blue font-16 mt3' %>

    @@ -15,7 +15,7 @@
    <%= hidden_field_tag(:type, params[:type]) %> - +
    diff --git a/app/views/libraries/new.html.erb b/app/views/libraries/new.html.erb index 987951d3..a9583823 100644 --- a/app/views/libraries/new.html.erb +++ b/app/views/libraries/new.html.erb @@ -1,6 +1,6 @@

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 新建

    diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb index 8c55b63a..5b196712 100644 --- a/app/views/libraries/show.html.erb +++ b/app/views/libraries/show.html.erb @@ -3,7 +3,7 @@ %>

    - <%= link_to '文库', libraries_path, class: 'color-grey-9' %> > + <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> > 详情

    diff --git a/app/views/managements/library_applies/index.html.erb b/app/views/managements/library_applies/index.html.erb index 23d898c4..c83a5321 100644 --- a/app/views/managements/library_applies/index.html.erb +++ b/app/views/managements/library_applies/index.html.erb @@ -1,6 +1,6 @@

    -

    文库发布

    +

    教学案例发布

    @@ -16,7 +16,7 @@
    - +
    @@ -34,7 +34,7 @@ <%= link_to "拒绝", library_applies_path(status: :refused), :class => "edu-filter-cir-grey mr5 fl font-12", :id => "library_reject_authentication", :remote => true %>

    - +
    diff --git a/config/locales/libraries/zh.yml b/config/locales/libraries/zh.yml index 3004ecab..3dae730c 100644 --- a/config/locales/libraries/zh.yml +++ b/config/locales/libraries/zh.yml @@ -1,7 +1,7 @@ 'zh': activerecord: models: - library: '文库' + library: '教学案例' attributes: library: title: '标题' diff --git a/config/routes.rb b/config/routes.rb index af3f2a1f..5936b9b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -52,6 +52,11 @@ RedmineApp::Application.routes.draw do ## oauth相关 end end + # library + resources :libraries do + get :publish_success, on: :collection + end + resources :ec_course_evaluations do member do match 'import_score', :via => [:post] @@ -2660,11 +2665,6 @@ RedmineApp::Application.routes.draw do ## oauth相关 get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' - # library - resources :libraries do - get :publish_success, on: :collection - end - Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir| file = File.join(plugin_dir, "config/routes.rb") if File.exists?(file) diff --git a/lib/trustie/sms/sms.rb b/lib/trustie/sms/sms.rb index 319de17c..7c2dad4c 100644 --- a/lib/trustie/sms/sms.rb +++ b/lib/trustie/sms/sms.rb @@ -58,7 +58,7 @@ module Trustie params['text'] = "【计算机实践教学】亲爱的#{user_name}老师，您已经成功报名参与了11月24日--25日在深圳大学举办的全国软件工程实践教学案例与应用研讨会，请准时参加。（如有任何参会问题，请致电咨询会务联系人汤老师13099740868）" Rails.logger.info "#{params['text']}" elsif send_type == 'publish_library' - params['text'] = "【Edu实训】亲爱的#{name}，有新的文库发布申请，请尽快处理" + params['text'] = "【Edu实训】亲爱的#{name}，有新的教学案例发布申请，请尽快处理" Rails.logger.info "#{params['text']}" end diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index c2338d19..db1a8de5 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3376,7 +3376,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; right: 20px; } -/*文库*/ +/*教学案例*/ .library_nav li{ float: left;cursor: pointer;margin-right: 30px;position: relative;color: #05101A;height: 40px;line-height: 20px; font-size: 16px;