Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

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

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>

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;}