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

app/controllers/admin_controller.rb

@@ -241,7 +241,7 @@ class AdminController < ApplicationController
         end
       else
         respond_to do |format|
-          flash.now[:error] = "#{l :label_first_page_create_fail}: #{@first_page.errors.full_messages[0]}\n\t#{@contest_page.errors.full_messages[0]}"
+          flash.now[:error] = "#{l :label_first_page_create_fail}: #{@first_page.errors.full_messages[0]}\n\t#{@contest_page.errors.full_messages[0]}\n\t#{@notification.errors.full_messages[0]}"
           format.html {
             render :action => 'contest_page_made'
           }

app/controllers/messages_controller.rb

@@ -34,6 +34,7 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+    @isReply = true
     page = params[:page]
     # Find the page of the requested reply
     if params[:r] && page.nil?
@@ -103,6 +104,7 @@ class MessagesController < ApplicationController
 
   # Edit a message
   def edit
+    @isReply = false
     if @project
       (render_403; return false) unless @message.editable_by?(User.current)
     else
@@ -123,7 +125,6 @@ class MessagesController < ApplicationController
         }
       end
     end
-
   end
 
   # Delete a messages

app/helpers/user_score_helper.rb

@@ -864,7 +864,7 @@ FROM `users` where id = #{user.id}")
       users = Attachment.find_by_sql("SELECT COUNT(*) as m_count FROM #{Attachment.table_name} WHERE author_id = '#{user.id}' and container_type = 'Project' and container_id = #{project.id}")
       result = 0
       if users.count > 0
-        result = users.first.m_coumt
+        result = users.first.m_count
       end
       result
     end

app/models/contest_notification.rb

@@ -1,3 +1,4 @@
 class ContestNotification < ActiveRecord::Base
   attr_accessible :content, :title
+  validates_length_of :title, maximum: 30
 end

app/views/attachments/_form.html.erb

@@ -1,4 +1,4 @@
-<span id="attachments_fields">
+<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">

app/views/attachments/_form_course.html.erb

@@ -0,0 +1,61 @@
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% if isReply  %>
+  <% container.saved_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 => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+          link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% else %>
+  <% 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 => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% end %>
+<% end %>
+</span>
+<script type='text/javascript'>
+//    function CompatibleSend()
+//    {
+//        var obj=document.getElementById("_file");
+//        var file= $(obj).clone();
+//        file.click();
+//    }
+</script>
+<span class="add_attachment">
+<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+<!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()" %>
+<%= file_field_tag 'attachments[dummy][file]',
+      :id => '_file',
+      :class => 'file_selector',
+      :multiple => true,
+      :onchange => 'addInputFiles(this);',
+      :style => '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)
+      } %>
+<span id="upload_file_count"><%= l(:label_no_file_uploaded)%></span>
+(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'attachments' %>
+<% end %>
+
+

app/views/attachments/file.html.erb

@@ -4,14 +4,16 @@
 <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
    <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp<span class="size">
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
+   <span class="size">
+     <% if @attachment!=nil&&@attachment.container_type == 'Document' %>
           <%=    link = link_to(l(:button_add), {:controller => 'code_review',
                                           :action => 'assign', :action_type => 'attachment',
                                           :id=>@attachment.project,
                                           :change_id => '', :attachment_id => @attachment.id,
                                          }, :class => 'icon icon-add') %>
+        <% end %>
    </span></p>
-
 </div>
 &nbsp;
 <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>

app/views/bids/_homework_form.html.erb

@@ -26,9 +26,9 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
-<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+<!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
-	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
+	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>

app/views/common/_file.html.erb

@@ -4,11 +4,11 @@
 <% line_num = 1 %>
 <% syntax_highlight_lines(filename, Redmine::CodesetUtil.to_utf8_by_setting(content)).each do |line| %>
   <tr>
-    <th class="line-num" id="L<%= line_num %>">
-      <a href="#L<%= line_num %>"><%= line_num %></a>
+    <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+      <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre><%= line.html_safe %></pre>
+      <pre style="width:880px;word-wrap: break-word; word-break: normal; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>

app/views/courses/_homework_form.html.erb

@@ -30,7 +30,7 @@
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>
 </p>

app/views/memos/_form.html.erb

@@ -2,12 +2,12 @@
 <!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
     <!-- % unless @memo.parent_id %>
-      <% if @memo.safe_attribute? 'sticky' %>
-       <%= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
-      <% end %>
-      <% if @memo.safe_attribute? 'locked' %>
-       <%= f.check_box :locked %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
-      <% end %>
-    <% end % -->
+      <%# if @memo.safe_attribute? 'sticky' %>
+       <%#= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
+      <%# end %>
+      <%# if @memo.safe_attribute? 'locked' %>
+       <%#= f.check_box :locked %> <%#= label_tag 'memo_locked', l(:label_board_locked) %>
+      <%# end %>
+    <%# end %> -->
 <p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
 <p><%= hidden_field_tag 'subject', ||=@memo.subject %>

app/views/messages/_course_show.html.erb

@@ -75,14 +75,14 @@
                 l(:button_edit),
                 {:action => 'edit', :id => @topic},
                 :class => 'icon icon-edit'
-        ) if @message.editable_by?(User.current) %>
+        ) if @message.course_editable_by?(User.current) %>
     <%= link_to(
                 l(:button_delete),
                 {:action => 'destroy', :id => @topic},
                 :method => :post,
                 :data => {:confirm => l(:text_are_you_sure)},
                 :class => 'icon icon-del'
-        ) if @message.destroyable_by?(User.current) %>
+        ) if @message.course_destroyable_by?(User.current) %>
   </div>
 
   <div class="lz-left">
@@ -156,8 +156,9 @@
             <tr>
 
               <td class="comments">
-                <div class="wiki">
-                  <%= textilizable message, :content, :attachments => message.attachments %>
+                <div class="wiki" style="width: 100%;word-break: break-all;">
+                  <%= textAreailizable message,:content,:attachments => message.attachments %>
+                  <%#= message.content.html_safe  %>
                 </div>
                 <%= link_to_attachments message, :author => false %> </td>
             </tr>

app/views/messages/_form.html.erb

@@ -42,7 +42,7 @@
 <!--[eoform:message]-->
 
 <p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
+<%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %></p>
 </div>
 
 

app/views/news/_course_show.html.erb

@@ -69,9 +69,9 @@
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
           <%#= submit_tag l(:button_save) %>
-          <%= link_to l(:button_save), "#", :onclick => 'submitNews();' %>
-          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => ''} %> |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
+          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>

app/views/projects/_file_score_index.html.erb

@@ -1,4 +1,4 @@
 <!-- added by bai -->
-<div><%= l(:label_file_number) %> * 4 = <%= document_num(@project)  %> * 4 = <%= format("%.2f" , document_score(@project)).to_i %></div>
-<div><%= l(:label_file_score) %> = <%= format("%.2f" , document_score(@project)).to_i %></div>
+<div><%= l(:label_file_number) %> * 4 = <%= documents_num(@project)  %> * 4 = <%= format("%.2f" , documents_score(@project)).to_i %></div>
+<div><%= l(:label_file_score) %> = <%= format("%.2f" , documents_score(@project)).to_i %></div>
 <!-- end -->

app/views/projects/_project.html.erb

@@ -45,8 +45,8 @@
               </tr>
               <tr>
                 <td style="width: 40%;text-align: right;font-size: 17px;color: rgb(17, 102, 153)">
-                  <% #find_project_repository @project %>
-                  <strong><%= content_tag('span',  "#{@project.repository.nil? || @project.project_status.nil?  ? '0' : @project.project_status.changesets_count }", :class => "info") %></strong>
+                                                          <!-- @project.repository.nil? || @project.project_status.nil?  ? '0' : @project.project_status.changesets_count  -->
+                  <strong><%= content_tag('span',  "#{changesets_num(@project)}", :class => "info") %></strong>
                 </td>
                 <td style="width: 60%;text-align: left">
                   <%= content_tag('span',  l(:label_commit_on)) %>

app/views/welcome/contest.html.erb

@@ -197,7 +197,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
 	<div style="height: 167px; padding-top:6px;">
 		<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
-			<div style="font-size:14px; color: #1166AD; padding-left:52px; "><strong><%= @contestNotification.title %></strong></div>
+			<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
 			<div class="underline-contests_four"></div>
           <div id="up_zzjs">
             <div id="marqueebox">

config/locales/zh.yml

@@ -1641,7 +1641,7 @@ zh:
   label_call_bonus: 奖金
   label_bids_form_new_description: 企业可以在此发布一个软件开发任务或者一个技术方案需求：（1）获得价廉物美的解决方案；（2）发现对此项任务有贡献的大学生，获得可以招聘的人才。
   label_bids_form_contest_new_description: 企业或者高校可以在此发布一个竞赛。
-  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式，在作业类型里面设置。
+  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式。
   label_fork_form_new_description: 该需求将作为某课程的作业被发布，作业提交方式可以使附件或者项目形式，在作业类型里面设置。
   label_bids_new_money: 输入奖励金额，如 500,2.5等
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等