From beb55ac95d962dafc5a3e1e8c7c71c9779e6057f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 17 Jul 2019 14:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                  |  4 +-
 app/views/libraries/_form.html.erb       | 75 ++++++++++++++++++++----
 public/stylesheets/educoder/edu-main.css | 25 ++++++++
 3 files changed, 92 insertions(+), 12 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/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb
index e1e6aa0b..5b9506b5 100644
--- a/app/views/libraries/_form.html.erb
+++ b/app/views/libraries/_form.html.erb
@@ -6,6 +6,8 @@
       <%= hidden_field_tag :tag_ids, tag_ids.join(',') %>
       <div class="edu-back-white">
         <div class="padding30">
+
+
           <div class="clearfix">
             <span class="upload_Title">标题</span>
             <li class="fl">
@@ -14,8 +16,28 @@
             </li>
             <span class="color-grey-c font-12 fl mt6">简明扼要介绍文档/视频所包含的主要的内容</span>
           </div>
-        </div>
-        <div class="padding30 bor-top-greyE">
+
+          <div class="clearfix mt20">
+            <span class="upload_Title">作者</span>
+            <li class="fl">
+              <input class="greyInput winput-300-35 mr20 fl winput150" id="library_title" name="library[title]" placeholder="请输入姓名" size="30" type="text" width="163">
+              <p style="height:20px;line-height:20px;"><span class="color-red none" id="title_notice">请输入姓名</span></p>
+            </li>
+            <li class="fl">
+              <input class="greyInput winput-300-35 mr20 fl" id="library_title" name="library[title]" placeholder="请输入作者单位名称" size="30" type="text">
+              <p style="height:20px;line-height:20px;"><span class="color-red none" id="title_notice">请输入作者单位名称</span></p>
+            </li>
+          </div>
+
+          <div class="clearfix mt20 mb20">
+            <span class="upload_Title">标签</span>
+            <ul class="fl libraries_tab">
+              <% LibraryTag.where(nil).each do |tag| %>
+                <li class="<%= tag_ids.include?(tag.id) ? 'active' : '' %>" data-id="<%= tag.id %>"><%= tag.name %></li>
+              <% end %>
+            </ul>
+          </div>
+
           <div class="clearfix">
             <span class="upload_Title">描述</span>
             <div class="fl" style="width: 1078px">
@@ -25,18 +47,51 @@
               <p style="height:22px;line-height:22px;"><span class="color-red none" id="des_notice">请输入描述内容</span></p>
             </div>
           </div>
-          <div class="clearfix mb20">
-            <span class="upload_Title">标签</span>
-            <ul class="fl libraries_tab">
-              <% LibraryTag.where(nil).each do |tag| %>
-                  <li class="<%= tag_ids.include?(tag.id) ? 'active' : '' %>" data-id="<%= tag.id %>"><%= tag.name %></li>
-              <% end %>
-            </ul>
-          </div>
+
+<!--          <div class="clearfix mb20">-->
+<!--            <span class="upload_Title">标签</span>-->
+<!--            <ul class="fl libraries_tab">-->
+              <%# LibraryTag.where(nil).each do |tag| %>
+<!--                  <li class="<%#= tag_ids.include?(tag.id) ? 'active' : '' %>" data-id="<%#= tag.id %>"><%#= tag.name %></li>-->
+              <%# end %>
+<!--            </ul>-->
+<!--          </div>-->
           <div style="padding-left: 62px">
             <%= 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>
           </div>
+
+
+          <div class="clearfix lineheight35">
+            <span class="upload_Titles">封面图</span> <span class="color-grey-c">（上传尺寸：120*90 px）</span>
+            <% if File.exist?(disk_filename("Career", career.id)) %>
+              <%= image_tag(url_to_avatar(career), :class => "w120 h90 ml5 shixun_image_show", :id => "shixun_image_show_#{career.id}") %>
+            <% else %>
+              <img src="" class="w80 h80 ml5 shixun_image_show none" id="shixun_image_show_<%= career.id %>"/>
+            <% end %>
+            <%= file_field_tag 'avatar[image]',
+                               :id => "upload_img_#{career.id}",
+                               :style => 'display:none;',
+                               :size => "1",
+                               :multiple => false,
+                               :onchange => 'addInputAvatar(this);',
+                               :data => {
+                                   :max_file_size => Setting.authentication_img_max_size.to_i.kilobytes,
+                                   :max_file_size_message => l(:error_user_auth_too_big, :max_size => number_to_human_size(Setting.authentication_img_max_size.to_i.kilobytes)),
+                                   :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                                   :file_type => Redmine::Configuration['pic_types'].to_s,
+                                   :type_support_message => l(:error_pic_type),
+                                   :upload_path => upload_avatar_path(:format => 'js'),
+                                   :description_placeholder => nil ,# l(:label_optional_description)
+                                   :source_type => "Career",
+                                   :source_id => career.id,
+                                   :is_direct => 1
+                               } %>
+            <a href="javascript:void(0);" id="object_upload_img_<%= career.id %>" class="mr10" onclick="$('#upload_img_<%= career.id %>').click();">
+              <%= File.exist?(disk_filename("Career", career.id)) ? "重新上传" : "上传图片" %>
+            </a>
+
+          </div>
         </div>
         <div class="padding30 bor-top-greyE">
           <li class="lineh-25 color-grey-6 font-18 mb20">审核说明</li>
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 7059dea9..0e21cf82 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -1179,4 +1179,29 @@ html>body #ajax-indicator { position: fixed; }
     right: 0;
     bottom: 30px;
     z-index: 10;
+}
+
+.winput150{
+    width:150px;
+}
+
+
+.upload_Titles{
+    position: relative;
+    margin-right: 30px;
+    float: left;
+    line-height: 35px;
+    font-size: 16px;
+    width: 50px;
+}
+
+.lineheight34{
+    line-height: 35px;
+}
+
+.w120{
+    width:120px;
+}
+.h90{
+    width:90px;
 }
\ No newline at end of file