From fde06a2327529901961e2742280b18da43ed754f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_show_attachment_history.html.erb         | 12 ++---
 app/views/files/_org_subfield_list.html.erb   |  7 +--
 app/views/files/_project_file_list.html.erb   |  7 +--
 app/views/files/_project_list.html.erb        | 11 ++---
 app/views/files/_resource_detail.html.erb     |  7 +--
 public/assets/kindeditor/pasteimg.js          | 44 +++++++++----------
 public/stylesheets/courses.css                |  6 +++
 public/stylesheets/new_user.css               |  6 +++
 public/stylesheets/project.css                |  6 +++
 9 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index 6e2994a8d..ee607cec4 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -39,19 +39,19 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
+      <div class="W300 uploadResourceIntr fontGrey2">
+        <span id="upload_file_count" class="mr15">(未选择文件)</span>
+        <span>您可以上传小于<span class="c_red">50MB</span>的文件</span>
+      </div>
       <div class="cl"></div>
       <div class="mb5 mt5">
-        <label class="fl c_dark f14" style="line-height:30px;">描述：</label>
+        <p class="c_dark f14" style="line-height:30px;">描述：</p>
         <div class="fl">
-          <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
+          <textarea style="resize:none"  type="text" name="description" class="InputBox fl H60 W420" value="<%= @attachment.description %>"></textarea>
         </div>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
-      <div class="uploadResourceIntr">
-        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
-        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
-      </div>
       </div>
       <div class="cl"></div>
       <div style="margin-top: 10px" >
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index fcf0e9982..1bbdc0e93 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -43,15 +43,12 @@
                   <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
-                  <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                             onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">
-                  <% unless file.description.blank? %>
-                      <div class="cl"></div>
-                      <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                  <% end %>
+                    资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
                 </div>
             <% end %>
 
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index b8b38f7b9..4d3645a33 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -48,15 +48,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                 <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
         <% else %>
             <div class="fontGrey2 mb4">
-              <% unless file.description.blank? %>
-                  <div class="cl"></div>
-                  <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-              <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
         <% end %>
         <div class="tag_h">
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 48fb4c86f..36dc80a18 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -40,16 +40,13 @@
                     <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                       <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                     </div>
-                    <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                    <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                               onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                   </div>
               <% else %>
-                  <div class="fontGrey2 mb4">
-                    <% unless file.description.blank? %>
-                        <div class="cl"></div>
-                        <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                    <% end %>
-                  </div>
+                    <div class="fontGrey2 mb4">
+                        资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+                    </div>
               <% end %>
               <div class="tag_h">
                 <!-- container_type = 1 代表是课程里的资源 -->
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 8aedc3c03..0edf22e58 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -42,15 +42,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
           <% else %>
             <div class="fontGrey2 mb4">
-                <% unless file.description.blank? %>
-                    <div class="cl"></div>
-                    <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
           <% end %>
       <%# end %>
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index d7ffead5b..479b1101a 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -327,28 +327,28 @@ function enablePasteImg(_editor) {
     };
 
     $(nodeBody).on('pasteImage', function(ev, data) {
-        console.log('pasteImage');
-        console.log("dataURL: " + data.dataURL);
-        console.log("width: " + data.width);
-        console.log("height: " + data.height);
-        var blob = dataURItoBlob(data.dataURL);
-        if (data.blob !== null) {
-            var data = new FormData();
-            data.append("imgFile",blob, "imageFilename.png");
-            console.log(data);
-            $.ajax({
-                url: '/kindeditor/upload?dir=image',
-                contentType: false,
-                type: 'POST',
-                data: data,
-                processData: false,
-                success: function(data) {
-                    console.log(data);
-                    editor.exec('insertimage', JSON.parse(data).url);
-                }
-            });
-        }
-
+        //粘贴图片时走这里会出现两张图片走df()即可
+//        console.log('pasteImage');
+//        console.log("dataURL: " + data.dataURL);
+//        console.log("width: " + data.width);
+//        console.log("height: " + data.height);
+//        var blob = dataURItoBlob(data.dataURL);
+//        if (data.blob !== null) {
+//            var data = new FormData();
+//            data.append("imgFile",blob, "imageFilename.png");
+//            console.log(data);
+//            $.ajax({
+//                url: '/kindeditor/upload?dir=image',
+//                contentType: false,
+//                type: 'POST',
+//                data: data,
+//                processData: false,
+//                success: function(data) {
+//                    console.log(data);
+//                    editor.exec('insertimage', JSON.parse(data).url);
+//                }
+//            });
+//        }
     });
     return;
 };
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 393903177..ed99217b8 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1421,3 +1421,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5fc6110fd..ee3ddf6df 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1796,3 +1796,9 @@ input.new_loggin_input{
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index ac65d34c2..d8b8cc74a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1249,3 +1249,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file