Merge branch 'dev_zanle' into szzh

app/models/memo.rb

@@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base
 	# 若是主题帖，则内容可以是空
 	#validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? }
 	validates_length_of :subject, maximum: 50
-	validates_length_of :content, maximum: 5000
+	validates_length_of :content, maximum: 30000
 	validate :cannot_reply_to_locked_topic, :on => :create
 
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"

app/views/blog_comments/show.html.erb

@@ -164,7 +164,7 @@
           <div class="talkConIpt ml5 mb10" id="reply<%= @article.id %>">
             <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                 <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'canel_message_replay();', :class => " grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
                 <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %>
             <% end %>
             <div class="cl"></div>

app/views/files/_new_style_attachment_list.html.erb

@@ -1,71 +1,33 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
 <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
-<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
-<% if @course %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => '_file',
-                       :class => ie8? ? '':'file_selector',
-                       :multiple => true,
-                       :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
-                       :style => ie8? ? '': 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :field_is_public => l(:field_is_public),
-                               :are_you_sure => l(:text_are_you_sure),
-                               :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all)
-                       } %>
-<% else %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => '_file',
-                       :class => ie8? ? '':'file_selector',
-                       :multiple => true,
-                       :onchange => 'addInputFiles(this);',
-                       :style => ie8? ? '': 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :field_is_public => l(:field_is_public),
-                               :are_you_sure => l(:text_are_you_sure),
-                               :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all)
-                       } %>
-<% end %>
-
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "_file#{container.id}",
+                     :class => ie8? ? '':'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :style => ie8? ? '': 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all)
+                     } %>
+</span>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
 
-<span id="upload_file_count">
+<span id="upload_file_count<%=container.id %>">
       <%= l(:label_no_file_uploaded)%>
     </span>
 (<%= l(:label_max_size) %>:
 <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 <div class="cl"></div>
 <div>
-        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
-<% if defined?(container) && container && container.saved_attachments %>
-  <% container.attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
-      <%= if attachment.id.nil?
-            #待补充代码
-          else
-            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
-          end
-      %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-
-      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
-  <% end %>
-<% end %>
+     <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
 </span>
 </div>

app/views/files/_upload_course_files.erb

@@ -19,7 +19,7 @@
           </div>
           <div class="cl"></div>
           <div>
-          <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %>
+          <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <div class="cl"></div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>

app/views/forums/show.html.erb

@@ -76,10 +76,10 @@
             $("#error").html("主题 过长（最长为 50 个字符）").show();
             return false;
         }
-//        if(memo_content.html().trim().length > 5000){
-//            $("#error").html("内容 过长（最长为 5000 个字符）").show();
-//            return false;
-//        }
+       if(memo_content.html().length > 30000){
+            $("#error").html("内容 过长（最长为 30000 个字符）").show();
+           return false;
+        }
         return true;
     }
 

app/views/layouts/base_projects.html.erb

@@ -226,7 +226,7 @@
 
       function project_files_upload()
       {
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_show_project',:locals => {:project => @project}) %>');
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>');
           showModal('ajax-modal', '513px');
           $('#ajax-modal').siblings().remove();
           $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");

app/views/projects/_upload_project_files_list.html.erb

@@ -0,0 +1,35 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{container.id}",
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{container.id}');",
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+</span>
+<span id="upload_file_count<%=container.id %>">
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+(<%= l(:label_max_size) %>:
+<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<div class="cl">
+
+  <div>
+        <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+  </div>
+</div>

app/views/projects/_upload_project_files_on_navbar.html.erb

@@ -0,0 +1,30 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(project_files_path(container), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <input type="hidden" name="in_project_toolbar" value="Y">
+          <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>

app/views/users/_resources_list.html.erb

@@ -21,5 +21,7 @@
           <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
+        <ul class="resourcesListDashLine"></ul>
+
     <% end %>
 <% end %>

app/views/users/_user_message_course.html.erb

@@ -66,9 +66,10 @@
                   <li>课程名称：<%= ma.course_message.course.name %>
                     (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
                   <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+                  <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
                   <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
                   <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
                 </ul>
@@ -380,7 +381,7 @@
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.homework_common.user.show_name, user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
           </li>
           <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">

app/views/users/import_resources_to_homework.js.erb

@@ -2,7 +2,7 @@
     <% @attachments.each do |attachment| %>
     $("#attachments_fields").append(
     '<span id="attachments_p<%= attachment.id %>">'+
-    '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "upload_filename link_file", :readonly=>"readonly")%>'+
     '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
         '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
     '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+

config/application.rb

@@ -41,7 +41,7 @@ module RedmineApp
 
     config.active_record.store_full_sti_class = true
     config.active_record.default_timezone = :local
-
+    config.time_zone = 'Beijing'
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'

public/stylesheets/new_user.css

@@ -401,7 +401,8 @@ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align:
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
-.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff;  color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} /*border-bottom:1px dashed #eaeaea;*/
+.resourcesListDashLine {width:710px;border-bottom:1px dashed #eaeaea !important; margin-left:auto; margin-right:auto; padding-bottom: 2px} /*border-bottom:1px dashed #eaeaea;*/
 .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
 .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
 .resourcesSelectSend {float:right;}