From 3f42a82e9183a4726f0155d2ca09d04793facf8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 29 Jun 2019 17:23:57 +0800
Subject: [PATCH 1/3] b

---
 Gemfile                                   | 4 ++--
 public/react/src/modules/tpm/NewHeader.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d89f9a24..ac45f360 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,8 +64,8 @@ gem 'elasticsearch-rails'
 gem 'oauth2'
 
 # xlsx
-gem 'axlsx', '3.0.0.pre'
-gem 'axlsx_rails', '0.3.0'
+# gem 'axlsx', '3.0.0.pre'
+# gem 'axlsx_rails', '0.3.0'
 
 # state machine
 gem 'aasm'
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 0251d318..79eccf2b 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -294,6 +294,7 @@ class NewHeader extends Component {
                                 </ul>
                             </div>
                         </li>
+						<li><a href="/libraries">教学案例</a></li>
                         <li><a href="/competitions">竞赛</a></li>
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">问答</a></li>
                         <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'认证'}</a></li>

From 7e542c867e30dffa8cf39e1bb32241313cf986f7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 29 Jun 2019 17:36:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/libraries/_form.html.erb       | 6 +++---
 app/views/libraries/new.html.erb         | 2 +-
 public/stylesheets/educoder/edu-main.css | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb
index 5bfd2610..3b0e3d33 100644
--- a/app/views/libraries/_form.html.erb
+++ b/app/views/libraries/_form.html.erb
@@ -1,4 +1,4 @@
-<p class="lineh-25 font-22 mb20">上传文档</p>
+<p class="lineh-25 font-22 mb20">上传教学案例</p>
 <div class="library-form-container">
   <%= form_for(@library) do |f| %>
     <%= hidden_field_tag :apply_publish, false %>
@@ -7,7 +7,7 @@
         <div class="clearfix mb20">
           <span class="upload_Title">标题</span>
           <li class="fl">
-            <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-240-35 mr20 fl' %>
+            <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %>
             <p style="height:20px;line-height:20px;"><span class="color-red none" id="title_notice">请输入标题</span></p>
           </li>
           <span class="color-grey-c font-12 fl mt5">简明扼要介绍文档&视频所包含的主要的内容</span>
@@ -78,7 +78,7 @@
     autoFocus: false,
     // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
     dialogMaskOpacity: 0.6,
-    placeholder: "请输入参考答案",
+    placeholder: "请添加描述",
     imageUpload: true,
     imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
     imageUploadURL: "<%= upload_with_markdown_path(container_id: 0, container_type: 'MarkDown') %>" //url
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 @@
 <div class="educontent mb50">
   <p class="mt10 mb20 clearfix lineh-20">
-    <%= link_to '文库', libraries_path, class: 'color-grey-9' %> &gt;
+    <%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> &gt;
     <span class="color-grey-3">新建</span>
   </p>
 
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index fca9b02b..711a1f96 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -287,6 +287,7 @@ a.color-red-dd:hover{color: #C61616!important;}
 .greyInput:focus{background-color: #fff;}
 
 /*输入框样式---------宽度为固定长度*/
+.winput-300-35{width: 300px;height: 35px;padding: 5px;box-sizing: border-box;}
 .winput-240-45{width: 240px;height: 45px;padding: 5px;box-sizing: border-box;}
 .winput-240-40{width: 240px;height: 40px;padding: 5px;box-sizing: border-box;}
 .winput-240-35{width: 240px;height: 35px;padding: 5px;box-sizing: border-box;}

From bca122d66922fc9f12e89f7dd386e593cb6196b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 29 Jun 2019 17:36:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index ac45f360..d89f9a24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,8 +64,8 @@ gem 'elasticsearch-rails'
 gem 'oauth2'
 
 # xlsx
-# gem 'axlsx', '3.0.0.pre'
-# gem 'axlsx_rails', '0.3.0'
+gem 'axlsx', '3.0.0.pre'
+gem 'axlsx_rails', '0.3.0'
 
 # state machine
 gem 'aasm'