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

app/controllers/libraries_controller.rb

@@ -1,7 +1,7 @@
 class LibrariesController < ApplicationController
   layout 'base_library'
 
-  before_filter :require_login
+  before_filter :require_login, :except => [:index]
 
   def index
     libraries = Library.where(nil)

app/views/layouts/_logined_header.html.erb

@@ -18,7 +18,6 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:controller] == "libraries" ? "active" : "" %>"><%= link_to '教学案例', libraries_path %></li>
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <% if User.current.ec_school.present? %>

app/views/libraries/_form.html.erb

@@ -10,12 +10,9 @@
             <%= 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>
-        </div>
-        <div>
-          <%= render partial: 'attachments/from_libraries', locals: { container: @library } %>
-          <p style="height:22px;line-height:22px;"><span class="color-red none" id="file_notice">请上传附件</span></p>
+          <span class="color-grey-c font-12 fl mt6">简明扼要介绍文档/视频所包含的主要的内容</span>
         </div>
+
       </div>
       <div class="padding30 bor-top-greyE">
         <div class="clearfix df">
@@ -27,6 +24,12 @@
             <p style="height:22px;line-height:22px;"><span class="color-red none" id="des_notice">请输入描述内容</span></p>
           </div>
         </div>
+
+        <div>
+          <%= render partial: 'attachments/from_libraries', locals: { container: @library } %>
+          <p s
+             tyle="height:22px;line-height:22px;"><span class="color-red none" id="file_notice">请上传附件</span></p>
+        </div>
       </div>
       <div class="padding30 bor-top-greyE">
         <li class="lineh-25 color-grey-6 font-18 mb20">审核说明</li>
@@ -37,11 +40,10 @@
       <div class="padding30 bor-top-greyE">
         <li class="lineh-25 color-grey-6 font-18 mb20">温馨提示</li>
         <ul class="font-16">
-          <li>1.请勿上传已设置加密或只读的文档资源</li>
-          <li>2.可以上传教学积累和撰写的文档资料，如教学案例、总结、心得等，上传支持的文件最大容量：100MB</li>
-          <li>3.上传涉及侵权内容的文档将会被移除。</li>
-          <li>4.为营造绿色网络环境，严禁上传违反国家关于互联网相关规定的内容</li>
-          <li>5.Chrome，Firefox，Safari，IE11及以上版本浏览器上传！</li>
+          <li>1.请勿上传已设置加密口令的文档资源；</li>
+          <li>2.可以上传符合教学案例标准的文档资料，如<a class="color-blue" target="_blank" href="https://www.educoder.net/boards/5909/topics/34799">案例入库标准</a>、<a target="_blank" class="color-blue" href="https://www.educoder.net/boards/5909/topics/34798">案例使用说明书</a>以及其他资料等，上传支持的文件最大容量：100MB；</li>
+          <li>3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；</li>
+          <li>4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；</li>
         </ul>
       </div>
     </div>

config/routes.rb

@@ -53,7 +53,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
   end
 
   # library
-  resources :libraries do
+  resources :libraries, :path => "moop_cases" do
     get :publish_success, on: :collection
   end