Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -79,9 +79,7 @@ class AttachmentsController < ApplicationController
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
       if stale?(:etag => @attachment.digest)
-        if params[:force] == 'true'
-          direct_download
-        else
+        if params[:preview] == 'true'
           convered_file = @attachment.diskfile
           #如果本身不是pdf文件，则先寻找是不是已转换化，如果没有则转化
           unless pdf?(convered_file)
@@ -96,6 +94,8 @@ class AttachmentsController < ApplicationController
           else
             direct_download
           end
+        else
+          direct_download
         end
       end
     else

app/controllers/test_controller.rb

@@ -24,7 +24,7 @@ class TestController < ApplicationController
     end
     @paths = homeworks_attach_path
     zipfile = ziping homeworks_attach_path
-    send_file zipfile, :filename => bid.name,
+    send_file zipfile, :filename => filename_for_content_disposition(bid.name),
                         :type => detect_content_type(zipfile)
     rescue Errno::ENOENT => e
       logger.error "[Errno::ENOENT] ===> #{e}"

app/controllers/zipdown_controller.rb

@@ -11,7 +11,7 @@ class ZipdownController < ApplicationController
   def download
     if User.current.logged?
       begin
-        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
+        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
       rescue => e
         render file: 'public/no_file_found.html'
       end
@@ -59,9 +59,10 @@ class ZipdownController < ApplicationController
       if homework != nil
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
-          send_file zipfile.file_path, :filename =>  ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
+          filename = ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
             "_" + homework.user.show_name +
-              "_" + homework.name + ".zip", :type => detect_content_type(zipfile.file_path) if(zipfile)
+            "_" + homework.name + ".zip"
+          send_file zipfile.file_path, :filename => filename_for_content_disposition(filename), :type => detect_content_type(zipfile.file_path) if(zipfile)
         else
           render file: 'public/no_file_found.html'
         end

app/views/courses/_courses_jours.html.erb

@@ -12,7 +12,7 @@
   div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<div class="msg_box" id='leave-message' nhname="new_message">
+<div class="msg_box fl" id='leave-message' nhname="new_message">
   <%# reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_leave_message) %></h4>
 
@@ -30,15 +30,20 @@
                  :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
       <textarea cols="40" nhname="new_message_textarea" maxlength="250" name="new_form[course_message]" placeholder="请在此留下你的意见和建议！" rows="20" style="display: none;"></textarea>
       <p nhname="contentmsg"></p>
+    <% end %>
+      <div class="cl"></div>
+      <div>
         <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
         <a href="javascript:void(0)" class="grey_btn fr ml10 mt10" nhname="cancel_btn">取&nbsp;&nbsp;消</a>
         <a href="javascript:void(0)"  onclick='$("#leave_message_form").submit();' class="blue_btn fr mt10">
           <%= l(:button_leave_meassge)%>
         </a>
-    <% end %>
+      </div>
   <% end %>
 </div>
 
+<div class="cl"></div>
+
 <div id="history">
   <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
 </div>
@@ -49,6 +54,7 @@
 
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -155,7 +161,7 @@
         params.div_form = $(">.respond-form",params.container);
         params.form = $("form",params.div_form);
         params.textarea = $("textarea[name='user_notes']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
         if(params.textarea.data('init') == undefined){
@@ -166,6 +172,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -187,7 +194,7 @@
           return;
         }
         params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);

app/views/courses/_history.html.erb

@@ -29,8 +29,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                 {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>"reply_btn"} %>
                     <% end %>
                 </div>
                   <div class="cl"></div>

app/views/files/_course_list.html.erb

@@ -25,7 +25,7 @@
       <% if file.is_public? || User.current.member_of_course?(course) %>
           <div class="re_con_box" id="container_files_<%= file.id %>">
             <div class="">
-              <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
+              <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
               <% if User.current.logged? %>
                   <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                       <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
@@ -40,7 +40,7 @@
                   <% else %>
                       <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
                   <% end %>
-                  <%= link_to '下载',download_named_attachment_path(file.id, file.filename, force: true),class: 'f_l re_open'  %>
+                  <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
               <% else %>
               <% end %>
             </div>

app/views/files/_project_file_list.html.erb

@@ -18,7 +18,7 @@
   <% project_attachments.each do |file| %>
       <div class="re_con_box">
         <div class="">
-          <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
+          <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
           <% if User.current.logged? %>
               <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
@@ -30,7 +30,7 @@
               <% else %>
                   <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
               <% end %>
-              <%= link_to '下载',download_named_attachment_path(file.id, file.filename, force: true),class: 'f_l re_open'  %>
+              <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
           <% end %>
         </div>
         <div class="cl"></div>

app/views/homework_common/_homework_common_form.html.erb

@@ -11,12 +11,14 @@
   <li >
     <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
     <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
+    <div style="width: 83%;float: left;">
       <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
       <% else %>
           <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
       <% end %>
+    </div>
   </li>
   <div class="cl"></div>
   <li class="mt10">

app/views/news/_course_form.html.erb

@@ -8,11 +8,15 @@
     <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor' %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor' %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% else %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% end %>
 

app/views/news/_course_show.html.erb

@@ -25,7 +25,7 @@
 </div>
 
   <% if @news.commentable? %>
-      <div class="msg_box">
+      <div class="msg_box fl">
         <h4><%= l(:label_comment_add) %></h4>
         <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
           <div class="box"  id="news_comment">
@@ -43,7 +43,7 @@
       <% end %>
       </div>
   <% end %>
-
+<div class="cl"></div>
   <% comments = @comments.reverse %>
   <% comments.each do |comment| %>
       <% next if comment.new_record? %>

app/views/projects/_history.html.erb

@@ -9,7 +9,8 @@
                   <span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %>
                   </span><span class="c_grey fr"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
@@ -20,8 +21,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                     {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
 
                     <% end %>
                 </span>

app/views/projects/_project_jours.html.erb

@@ -43,6 +43,7 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -149,7 +150,7 @@
         params.div_form = $(">.respond-form",params.container);
         params.form = $("form",params.div_form);
         params.textarea = $("textarea[name='user_notes']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
         if(params.textarea.data('init') == undefined){
@@ -160,6 +161,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -181,7 +183,7 @@
           return;
         }
         params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);

app/views/stores/index.html.erb

@@ -35,7 +35,7 @@
 					<%= c1.downloads %>
 				</div>
 				<div class="table_cell1 downicon1 filename download_icon" >
-					<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+					<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>c
 				</div>
 			</div>
 		<% end -%>

app/views/student_work/add_score.js.erb

@@ -2,7 +2,7 @@ $("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :parti
 $('#score_<%= @work.id%>').peSlider({range: 'min'});
 
 <% if @is_new%>
-    $("#score_list_<%= @work.id%>").prepend("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %></div>");
 <% else %>
     $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
 <% end%>

app/views/users/_history.html.erb

@@ -11,7 +11,8 @@
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%></p>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
@@ -23,8 +24,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                     {:focus => 'project_respond',:nhname=>'reply_btn', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>'reply_btn'} %>
 
                     <% end %>
                 </span>

app/views/users/_user_jours.html.erb

@@ -67,6 +67,7 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -177,7 +178,7 @@
         params.div_form = $(">.respond-form",params.container);
         params.form = $("form",params.div_form);
         params.textarea = $("textarea[name='user_notes']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
         if(params.textarea.data('init') == undefined){
@@ -188,6 +189,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -209,11 +211,15 @@
           return;
         }
         params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn");
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
+          params.cancel_btn.click(function(){
+            nh_reset_form(params);
+          });
 //          $("a[nhname='cancel_btn']",params.div_form).click(function(){
 //            nh_reset_form(params);
 //          });

app/views/words/_journal_reply_items.html.erb

@@ -22,7 +22,7 @@
         <% end %>
 
         <p>
-          <%= reply.notes %>
+          <%= reply.notes.html_safe %>
         </p>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
@@ -33,8 +33,9 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:button_reply),'',
+                         <%#= link_to l(:button_reply),'',
                                      {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
+                         <%= link_to l(:button_reply),'javascript:;',{:nhname=>"reply_btn"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </div>
         <div class="cl"></div>

app/views/words/_new.html.erb

@@ -57,6 +57,7 @@
       <p nhname="contentmsg"></p>
       <div style="padding-top:5px;float:left;" nhname="toolbar_container"></div>
       <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right;  margin-top: 5px;"%>
+      <a href="javascript:;" id="new_message_cancel_btn" style="display:none;"></a>
     <%else %>
       <div style="font-size: 14px;margin:10px;">
 	    <%= l(:label_user_login_tips) %>

app/views/words/create.js.erb

@@ -3,4 +3,7 @@ $('#history').html('<%= escape_javascript(render(:partial => 'users/history',:lo
 $('#jour_count').html('<%= @obj_count%>')
 $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
 $('#new_form_user_message').val("");
+if($('#new_message_cancel_btn') != undefined && $('#new_message_cancel_btn').length!=0){
+  $('#new_message_cancel_btn').click();
+}
 $('#new_form_reference_user_id').val("");

lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css

@@ -421,6 +421,7 @@
 	overflow: hidden;
 	margin: 0;
 	padding: 0;
+    max-width: 100%;
 }
 /* toolbar */
 .ke-toolbar {

public/assets/kindeditor/themes/default/default.css

@@ -432,6 +432,7 @@
 }
 /* container */
 .ke-container {
+    max-width: 100%;
 	display: block;
 	border: 1px solid #CCCCCC;
 	background-color: #FFF;

public/stylesheets/courses.css

@@ -170,7 +170,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .wzan a{ display: block;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
 a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px; height:225px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px;  border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 

public/stylesheets/public.css

@@ -440,3 +440,4 @@ img{max-width: 100%;}
 .attachments {clear: both;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
+.ke-container-default{max-width: 100%;}